add COMPATIBLE_HOST guard for libxvmc and mythtv

BKrev: 41744494SrlR_6KtLYp2jwZ3GZ20IA

3 files changed, 88 insertions, 2 deletions

diff --git a/mythtv/mythtv_0.16+cvs20040918.oe b/mythtv/mythtv_0.16+cvs20040918.oe
index 6f2214614d..26e8c2732f 100644
--- a/mythtv/mythtv_0.16+cvs20040918.oe
+++ b/mythtv/mythtv_0.16+cvs20040918.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "A full featured personal video recorder system."
 MAINTAINER = "Michael 'Mickey' Lauer"
 SECTION = "x11/multimedia"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "cvs://mythtv:mythtv@cvs.mythtv.org/var/lib/mythcvs;module=mythtv;date=20040918;method=pserver \
 	file://xvmc-via.patch;patch=1;pnum=0 \
@@ -16,6 +16,11 @@ inherit qmake qt3x11
 
 QMAKE_PROFILES = "mythtv.pro"
 
+#
+# Disable everything non-x86 for now, since there are some -march=i586 hardcoded in there.
+#
+COMPATIBLE_HOST = 'i.86.*-linux'
+
 def mythtv_arch(d):
         import oe, re
         arch = oe.data.getVar('TARGET_ARCH', d, 1)
diff --git a/mythtv/mythtv_0.16.oe b/mythtv/mythtv_0.16.oe
index fd0c16e075..1df2fcfa69 100644
--- a/mythtv/mythtv_0.16.oe
+++ b/mythtv/mythtv_0.16.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "A full featured personal video recorder system."
 MAINTAINER = "Michael 'Mickey' Lauer"
 SECTION = "x11/multimedia"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
 
@@ -9,6 +9,9 @@ DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm"
 
 inherit qmake qt3x11
 
+# there is a -march=586 somewhere in the source tree
+COMPATIBLE_HOST = 'i.86.*-linux'
+
 QMAKE_PROFILES = "mythtv.pro"
 
 def mythtv_arch(d):
diff --git a/mythtv/mythtv_cvs.oe b/mythtv/mythtv_cvs.oe
index e69de29bb2..cad19b0011 100644
--- a/mythtv/mythtv_cvs.oe
+++ b/mythtv/mythtv_cvs.oe
@@ -0,0 +1,78 @@
+DESCRIPTION = "A full featured personal video recorder system."
+MAINTAINER = "Michael 'Mickey' Lauer"
+SECTION = "x11/multimedia"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "cvs://mythtv:mythtv@cvs.mythtv.org/var/lib/mythcvs;module=mythtv;method=pserver \
+	file://settings.pro \
+	file://prefix-etc.patch;patch=1"
+S = "${WORKDIR}/mythtv"
+
+DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc"
+RDEPENDS = "qt-x11-plugins"
+
+inherit qmake qt3x11
+
+QMAKE_PROFILES = "mythtv.pro"
+
+# there is a -march=586 somewhere in the source tree
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+def mythtv_arch(d):
+        import oe, re
+        arch = oe.data.getVar('TARGET_ARCH', d, 1)
+        if re.match("^i.86$", arch):
+                arch = "x86"
+        elif arch == "x86_64":
+                arch = "x86"
+        elif arch == "arm":
+                arch = "armv4l"
+        return arch
+
+MYTHTV_ARCH := "${@mythtv_arch(d)}"
+
+do_configure_prepend() {
+# it's not autotools anyway, so we call ./configure directly
+	find . -name "Makefile"|xargs rm -f
+	./configure	--prefix=/usr		\
+			--mandir=/usr/man 	\
+			--disable-mp3lame	\
+			--enable-vorbis 	\
+			--disable-faad		\
+			--disable-faadbin 	\
+			--disable-faac		\
+			--disable-mingw32	\
+			--enable-a52		\
+			--disable-a52bin	\
+			--enable-pp		\
+			--enable-shared-pp	\
+			--enable-shared		\
+			--disable-amr_nb	\
+			--disable-amr_nb-fixed	\
+			--disable-sunmlib	\
+						\
+			--cpu=${MYTHTV_ARCH}	\
+			--enable-mmx		\
+			--disable-altivec	\
+			--enable-v4l		\
+			--enable-audio-oss	\
+			--disable-audio-beos	\
+			--enable-dv1394		\
+			--enable-network	\
+			--enable-zlib		\
+			--enable-simple_idct	\
+			--disable-vhook		\
+			--disable-mpegaudio-hp	\
+			--enable-ffserver	\
+			--enable-ffplay		\
+			--enable-risky
+
+	install -m 0644 ${WORKDIR}/settings.pro ${S}/
+}
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
+