make mythtv inherit qt3x11 per the new qt staging changes

BKrev: 415b4e4aHGqT7JseE7wMiJ5-icAPtA

2 files changed, 71 insertions, 6 deletions

diff --git a/mythtv/mythtv_0.16+cvs20040918.oe b/mythtv/mythtv_0.16+cvs20040918.oe
index 4a79ee800b..4c008abab6 100644
--- a/mythtv/mythtv_0.16+cvs20040918.oe
+++ b/mythtv/mythtv_0.16+cvs20040918.oe
@@ -12,10 +12,7 @@ S = "${WORKDIR}/mythtv"
 DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc"
 RDEPENDS = "qt-x11-plugins"
 
-inherit qmake
-
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3"
+inherit qmake qt3x11
 
 QMAKE_PROFILES = "mythtv.pro"
 
@@ -32,8 +29,6 @@ def mythtv_arch(d):
 
 MYTHTV_ARCH := "${@mythtv_arch(d)}"
 
-EXTRA_QMAKEVARS_POST += "QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt"
-
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
 	find . -name "Makefile"|xargs rm -f
diff --git a/mythtv/mythtv_0.16.oe b/mythtv/mythtv_0.16.oe
index e69de29bb2..9186cc9948 100644
--- a/mythtv/mythtv_0.16.oe
+++ b/mythtv/mythtv_0.16.oe
@@ -0,0 +1,70 @@
+DESCRIPTION = "A full featured personal video recorder system."
+MAINTAINER = "Michael 'Mickey' Lauer"
+SECTION = "multimedia"
+PR = "r0"
+
+SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
+
+DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm"
+
+inherit qmake qt3x11
+
+QMAKE_PROFILES = "mythtv.pro"
+
+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}	\
+			--enablee-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
+
+	sed 's!PREFIX =.*!PREFIX = ${prefix}!' < settings.pro > settings.pro.new
+	mv settings.pro.new settings.pro
+}
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
+