From eca43a59ec95646836f9704714823249a15747fa Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 12 Sep 2003 01:51:16 +0000
Subject: [PATCH] Clean up mach64 for autofoo

---
 hw/kdrive/mach64/Imakefile   |  20 ------
 hw/kdrive/mach64/Makefile.am |  48 +++++++++++++
 hw/kdrive/mach64/fourcc.h    | 134 +++++++++++++++++++++++++++++++++++
 3 files changed, 182 insertions(+), 20 deletions(-)
 delete mode 100644 hw/kdrive/mach64/Imakefile
 create mode 100644 hw/kdrive/mach64/Makefile.am
 create mode 100644 hw/kdrive/mach64/fourcc.h

diff --git a/hw/kdrive/mach64/Imakefile b/hw/kdrive/mach64/Imakefile
deleted file mode 100644
index 70f0cdf82..000000000
--- a/hw/kdrive/mach64/Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/mach64/Imakefile,v 1.1 2001/06/03 18:48:19 keithp Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-#if BuildXvExt
-XVSRCS=mach64video.c
-XVOBJS=mach64video.o
-#endif
-
-SRCS = 	mach64.c mach64draw.c mach64stub.c $(XVSRCS)
-
-OBJS = 	mach64.o mach64draw.o mach64stub.o $(XVOBJS)
-
-DEFINES = XvExtensionDefines -DVESA /* -DUSE_PCI*/
-
-INCLUDES = -I. $(KDINCS) -I$(KDRIVE)/vesa
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(mach64,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
new file mode 100644
index 000000000..07362d3fe
--- /dev/null
+++ b/hw/kdrive/mach64/Makefile.am
@@ -0,0 +1,48 @@
+INCLUDES = 					\
+	-I$(top_srcdir)/fb			\
+	-I$(top_srcdir)/hw/kdrive/src		\
+	-I$(top_srcdir)/hw/kdrive/vesa		\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/mi			\
+	-I$(top_srcdir)/miext/layer		\
+	-I$(top_srcdir)/miext/shadow		\
+	-I$(top_srcdir)/randr			\
+	-I$(top_srcdir)/render
+
+
+bin_PROGRAMS = Xmach64
+
+noinst_LTLIBRARIES = libmach64.la
+
+libmach64_la_SOURCES = 	\
+	mach64.c	\
+	mach64draw.c	\
+	mach64video.c	\
+	fourcc.h	\
+	mach64.h	\
+	mach64draw.h
+
+	
+Xmach64_SOURCES = \
+	mach64stub.c
+
+Xmach64_LDADD = \
+	$(top_builddir)/hw/kdrive/mach64/libmach64.la \
+	$(top_builddir)/hw/kdrive/vesa/libvesa.la \
+	$(top_builddir)/dix/libdix.la		\
+	$(top_builddir)/os/libos.la		\
+	$(top_builddir)/miext/layer/liblayer.la	\
+	$(top_builddir)/hw/kdrive/src/libkdrive.la  \
+	$(top_builddir)/hw/kdrive/linux/liblinux.la  \
+	$(top_builddir)/miext/shadow/libshadow.la \
+	$(top_builddir)/randr/librandr.la	\
+	$(top_builddir)/render/librender.la	\
+	$(top_builddir)/fb/libfb.la		\
+	$(top_builddir)/mi/libmi.la		\
+	$(top_builddir)/Xext/libXext.la		\
+	$(top_builddir)/randr/librandr.la	\
+	$(top_builddir)/render/librender.la	\
+	$(top_builddir)/xtrans/libxtrans.la	\
+	$(X_LIBS) -lXfont -lXau -lXdmcp 	\
+	$(top_builddir)/dix/libxpstubs.la	\
+	-lfreetype -lm -lz
diff --git a/hw/kdrive/mach64/fourcc.h b/hw/kdrive/mach64/fourcc.h
new file mode 100644
index 000000000..b19f5decc
--- /dev/null
+++ b/hw/kdrive/mach64/fourcc.h
@@ -0,0 +1,134 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/fourcc.h,v 1.4 2003/04/23 21:51:24 tsi Exp $ */
+
+/*
+   This header file contains listings of STANDARD guids for video formats.
+   Please do not place non-registered, or incomplete entries in this file.
+   A list of some popular fourcc's are at: http://www.webartz.com/fourcc/
+   For an explanation of fourcc <-> guid mappings see RFC2361.
+*/
+
+#ifndef _XF86_FOURCC_H_
+#define _XF86_FOURCC_H_ 1
+
+#define FOURCC_YUY2 0x32595559
+#define XVIMAGE_YUY2 \
+   { \
+	FOURCC_YUY2, \
+        XvYUV, \
+	LSBFirst, \
+	{'Y','U','Y','2', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	16, \
+	XvPacked, \
+	1, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 1, 1, \
+	{'Y','U','Y','V', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
+
+#define FOURCC_YV12 0x32315659
+#define XVIMAGE_YV12 \
+   { \
+	FOURCC_YV12, \
+        XvYUV, \
+	LSBFirst, \
+	{'Y','V','1','2', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	12, \
+	XvPlanar, \
+	3, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 2, 2, \
+	{'Y','V','U', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
+
+#define FOURCC_I420 0x30323449
+#define XVIMAGE_I420 \
+   { \
+	FOURCC_I420, \
+        XvYUV, \
+	LSBFirst, \
+	{'I','4','2','0', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	12, \
+	XvPlanar, \
+	3, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 2, 2, \
+	{'Y','U','V', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
+
+
+#define FOURCC_UYVY 0x59565955
+#define XVIMAGE_UYVY \
+   { \
+	FOURCC_UYVY, \
+        XvYUV, \
+	LSBFirst, \
+	{'U','Y','V','Y', \
+	  0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+	16, \
+	XvPacked, \
+	1, \
+	0, 0, 0, 0, \
+	8, 8, 8, \
+	1, 2, 2, \
+	1, 1, 1, \
+	{'U','Y','V','Y', \
+	  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+	XvTopToBottom \
+   }
+
+#define FOURCC_IA44 0x34344149
+#define XVIMAGE_IA44 \
+   { \
+        FOURCC_IA44, \
+        XvYUV, \
+        LSBFirst, \
+        {'I','A','4','4', \
+          0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+        8, \
+        XvPacked, \
+        1, \
+        0, 0, 0, 0, \
+        8, 8, 8, \
+        1, 1, 1, \
+        1, 1, 1, \
+        {'A','I', \
+          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+        XvTopToBottom \
+   }
+
+#define FOURCC_AI44 0x34344941
+#define XVIMAGE_AI44 \
+   { \
+        FOURCC_AI44, \
+        XvYUV, \
+        LSBFirst, \
+        {'A','I','4','4', \
+          0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
+        8, \
+        XvPacked, \
+        1, \
+        0, 0, 0, 0, \
+        8, 8, 8, \
+        1, 1, 1, \
+        1, 1, 1, \
+        {'I','A', \
+          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
+        XvTopToBottom \
+   }
+
+#endif /* _XF86_FOURCC_H_ */