import clean BK tree at cset 1.3670

7 files changed, 119 insertions, 0 deletions

diff --git a/packages/libxvmc/.mtn2git_empty b/packages/libxvmc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxvmc/.mtn2git_empty
diff --git a/packages/libxvmc/files/.mtn2git_empty b/packages/libxvmc/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxvmc/files/.mtn2git_empty
diff --git a/packages/libxvmc/files/drm.patch b/packages/libxvmc/files/drm.patch
index e69de29bb2..d48cdb3d0b 100644
--- a/packages/libxvmc/files/drm.patch
+++ b/packages/libxvmc/files/drm.patch
@@ -0,0 +1,9 @@
+--- XvMC/hw/via/Makefile.am.old	2005-03-06 11:25:11.000000000 +0000
++++ XvMC/hw/via/Makefile.am	2005-03-06 11:25:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(XVMC_CFLAGS)
+-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
+ 
+ lib_LTLIBRARIES = libviaXvMC.la
+ 
diff --git a/packages/libxvmc/files/true.patch b/packages/libxvmc/files/true.patch
index e69de29bb2..7059295007 100644
--- a/packages/libxvmc/files/true.patch
+++ b/packages/libxvmc/files/true.patch
@@ -0,0 +1,11 @@
+--- XvMC/hw/via/viaXvMC.c.old	2004-10-18 20:54:49.000000000 +0100
++++ XvMC/hw/via/viaXvMC.c	2004-10-18 20:55:03.000000000 +0100
+@@ -43,6 +43,8 @@
+ #include <xf86drm.h>
+ #include <pthread.h>
+ #include "vldXvMC.h"
++
++#define TRUE 1
+     
+ #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
+ 		       (((CARD8 *)(ctx)->sAreaAddress) +	\
diff --git a/packages/libxvmc/files/via.patch b/packages/libxvmc/files/via.patch
index e69de29bb2..21cdfbdd6b 100644
--- a/packages/libxvmc/files/via.patch
+++ b/packages/libxvmc/files/via.patch
@@ -0,0 +1,23 @@
+--- XvMC/configure.ac.old	2004-09-18 13:16:31.000000000 +0100
++++ XvMC/configure.ac	2004-09-18 13:16:32.000000000 +0100
+@@ -14,4 +14,5 @@
+ AC_OUTPUT([Makefile
+            hw/Makefile
+ 	   hw/i810/Makefile
++	   hw/via/Makefile
+            xvmc.pc])
+--- /dev/null	2004-06-13 02:32:19.000000000 +0100
++++ XvMC/hw/via/Makefile.am	2004-09-18 13:16:01.000000000 +0100
+@@ -0,0 +1,7 @@
++AM_CFLAGS = $(XVMC_CFLAGS)
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++
++lib_LTLIBRARIES = libviaXvMC.la
++
++libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
++		viaXvMCPriv.h
+--- XvMC/hw/Makefile.am.old	2004-10-17 22:34:27.000000000 +0100
++++ XvMC/hw/Makefile.am	2004-10-17 22:34:31.000000000 +0100
+@@ -1 +1 @@
+-SUBDIRS = i810
++SUBDIRS = i810 via
diff --git a/packages/libxvmc/libxvmc_20040919.bb b/packages/libxvmc/libxvmc_20040919.bb
index e69de29bb2..e06759182b 100644
--- a/packages/libxvmc/libxvmc_20040919.bb
+++ b/packages/libxvmc/libxvmc_20040919.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "x11 xext libxv drm xserver-xorg"
+PR = "r2"
+
+SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xlibs;module=XvMC;date=${PV};method=pserver \
+	cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \
+	file://via.patch;patch=1 \
+	file://true.patch"
+S = "${WORKDIR}/XvMC"
+
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg"
+
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+inherit autotools pkgconfig 
+
+do_configure_prepend() {
+	install -d ${S}/hw/via
+	cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/
+	( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch )
+}
+
+do_compile() {
+	oe_runmake
+	oe_runmake -C hw/via
+}
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DATADIR}/man
+	oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+	install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}
diff --git a/packages/libxvmc/libxvmc_20050612.bb b/packages/libxvmc/libxvmc_20050612.bb
index e69de29bb2..20d77d2d55 100644
--- a/packages/libxvmc/libxvmc_20050612.bb
+++ b/packages/libxvmc/libxvmc_20050612.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "x11 xext libxv drm xserver-xorg"
+PR = "r0"
+
+SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xlibs;module=XvMC;date=${PV};method=pserver \
+	cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
+	file://true.patch;patch=1 file://drm.patch;patch=1"
+S = "${WORKDIR}/XvMC"
+
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
+
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+inherit autotools pkgconfig 
+
+do_compile() {
+	oe_runmake
+	oe_runmake -C hw/via
+}
+
+do_install() {
+	oe_runmake DESTDIR='${D}' install
+	oe_runmake -C hw/via DESTDIR='${D}' install
+}
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DATADIR}/man
+	oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+	install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}