import clean BK tree at cset 1.3670

12 files changed, 598 insertions, 0 deletions

diff --git a/packages/mythtv/.mtn2git_empty b/packages/mythtv/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/.mtn2git_empty
diff --git a/packages/mythtv/files/.mtn2git_empty b/packages/mythtv/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/files/.mtn2git_empty
diff --git a/packages/mythtv/files/prefix-etc.patch b/packages/mythtv/files/prefix-etc.patch
index e69de29bb2..fd6aaf9179 100644
--- a/packages/mythtv/files/prefix-etc.patch
+++ b/packages/mythtv/files/prefix-etc.patch
@@ -0,0 +1,11 @@
+--- mythtv/libs/libmyth/oldsettings.cpp.old	2004-09-24 22:09:11.000000000 +0100
++++ mythtv/libs/libmyth/oldsettings.cpp	2004-09-24 22:09:38.000000000 +0100
+@@ -116,7 +116,7 @@
+     if (ReadSettings(setname))
+          result = true;
+ 
+-    setname = prefix + "/etc/mythtv/" + filename;
++    setname = "/etc/mythtv/" + filename;
+     if (ReadSettings(setname))
+          result = true;
+ 
diff --git a/packages/mythtv/files/settings.pro b/packages/mythtv/files/settings.pro
index e69de29bb2..816fd06887 100644
--- a/packages/mythtv/files/settings.pro
+++ b/packages/mythtv/files/settings.pro
@@ -0,0 +1,119 @@
+#CONFIG += debug
+CONFIG += release
+
+PREFIX = /usr
+
+LIBVERSION = 0.16
+
+INCLUDEPATH += $${PREFIX}/include
+INCLUDEPATH *= /usr/local/include
+
+DEFINES += _GNU_SOURCE
+DEFINES += _FILE_OFFSET_BITS=64
+DEFINES += PREFIX=\"$${PREFIX}\"
+
+release {
+        DEFINES += MMX
+        QMAKE_CXXFLAGS_RELEASE = -O3 -march=i586 -fomit-frame-pointer
+    macx {
+        DEFINES -= MMX
+        # Don't use -O3, it causes some Qt moc methods to go missing
+        QMAKE_CXXFLAGS_RELEASE = -O2
+    }
+        QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
+}
+
+EXTRA_LIBS = -lfreetype -lmp3lame
+
+unix:linux*: {
+    CONFIG  += linux backend
+    DEFINES += CONFIG_VIDEO4LINUX
+}
+unix:freebsd*: {
+    CONFIG  += freebsd backend
+    DEFINES += CONFIG_VIDEO4LINUX
+}
+
+# X11 support
+CONFIG += using_x11
+
+# Default Xv support
+CONFIG += using_xv
+EXTRA_LIBS += -lXinerama -lXv -lX11 -lXext -lXxf86vm
+
+# IVTV (PVR-x50) support.  Disable if building on Windows.
+CONFIG += using_ivtv
+DEFINES += USING_IVTV
+
+# LCDProc support
+#DEFINES += LCD_DEVICE
+
+# Default audio output, OSS
+CONFIG += using_oss
+DEFINES += USING_OSS
+
+# Native ALSA support
+#CONFIG += using_alsa
+#ALSA_LIBS = -lasound
+
+# Native ARTS support
+#CONFIG += using_arts
+#ARTS_LIBS = -L/opt/kde3/lib -ldl -lartsc -lpthread
+#EXTRA_LIBS += -L/opt/kde3/lib -ldl -lartsc -lpthread
+#INCLUDEPATH += /opt/kde3/include
+# For Mandrake, use the following:
+#ARTS_LIBS = -ldl -lartsc -lpthread
+#EXTRA_LIBS += -ldl -lartsc -lpthread
+#INCLUDEPATH += /usr/include/artsc
+
+# DVB support
+CONFIG += using_dvb
+DEFINES += USING_DVB
+# Note: INCLUDEPATH should point to the directory with
+#   'linux/dvb/frontend.h', not the directory with frontend.h
+#INCLUDEPATH += /usr/src/linuxtv-dvb-1.0.1/include
+
+# Native lirc support
+CONFIG += using_lirc
+LIRC_LIBS = -llirc_client
+
+# XvMC support, modify as necessary.
+#CONFIG += using_xvmc
+#DEFINES += USING_XVMC
+#EXTRA_LIBS += -lXvMCNVIDIA -lXvMC
+
+# XvMC_VLD support, modify as necessary. Incompatible with normal XvMC support.
+CONFIG += using_xvmc using_xvmc_vld
+DEFINES += USING_XVMC USING_XVMC_VLD
+EXTRA_LIBS += -lviaXvMC -lXvMC
+
+# DirectFB support
+#CONFIG += using_directfb
+#EXTRA_LIBS += `directfb-config --libs`
+#QMAKE_CXXFLAGS += `directfb-config --cflags`
+
+# Windows support
+#CONFIG += win32
+#DEFINES += _WIN32
+
+# Mac OS X support
+macx {
+    # For source that uses Qt, Q_OS_MACX is defined.
+    # For source that uses config.h, CONFIG_DARWIN is defined.
+    # For other source (e.g. libmythtv), we define this
+    DEFINES += CONFIG_DARWIN
+}
+
+# DirectX support
+#CONFIG += using_directx
+#DEFINES += USING_DIRECTX
+
+# OpenGL support for vertical retrace sync
+#DEFINES += USING_OPENGL_VSYNC
+#EXTRA_LIBS += -lGL -lGLU
+#CONFIG += using_opengl
+
+# Allow use of XrandR to change display resolutions
+#CONFIG += using_xrandr
+#DEFINES += USING_XRANDR
+
diff --git a/packages/mythtv/mythtv-0.16+cvs20040918/.mtn2git_empty b/packages/mythtv/mythtv-0.16+cvs20040918/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/mythtv-0.16+cvs20040918/.mtn2git_empty
diff --git a/packages/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch b/packages/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch
index e69de29bb2..d920cade2e 100644
--- a/packages/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch
+++ b/packages/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch
@@ -0,0 +1,63 @@
+Index: libs/libavcodec/xvmc_render.h
+===================================================================
+RCS file: /var/lib/mythcvs/mythtv/libs/libavcodec/xvmc_render.h,v
+retrieving revision 1.5
+diff -u -r1.5 xvmc_render.h
+--- libs/libavcodec/xvmc_render.h	13 Sep 2004 06:09:22 -0000	1.5
++++ libs/libavcodec/xvmc_render.h	18 Sep 2004 19:37:35 -0000
+@@ -10,7 +10,7 @@
+ 
+ #ifdef USING_XVMC_VLD
+ #include <stdint.h>
+-#include <X11/extensions/viaXvMC.h>
++#include <X11/extensions/vldXvMC.h>
+ #endif
+ 
+ //the surface should be shown, video driver manipulate this
+Index: libs/libmythtv/XvMCSurfaceTypes.h
+===================================================================
+RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/XvMCSurfaceTypes.h,v
+retrieving revision 1.3
+diff -u -r1.3 XvMCSurfaceTypes.h
+--- libs/libmythtv/XvMCSurfaceTypes.h	13 Sep 2004 06:09:23 -0000	1.3
++++ libs/libmythtv/XvMCSurfaceTypes.h	18 Sep 2004 19:37:36 -0000
+@@ -7,7 +7,7 @@
+ 
+ extern "C" {
+ #ifdef USING_XVMC_VLD
+-#include <X11/extensions/viaXvMC.h>
++#include <X11/extensions/vldXvMC.h>
+ #endif
+ #include "../libavcodec/xvmc_render.h"
+ }
+Index: libs/libmythtv/dvbdiseqc.cpp
+===================================================================
+RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/dvbdiseqc.cpp,v
+retrieving revision 1.7
+diff -u -r1.7 dvbdiseqc.cpp
+--- libs/libmythtv/dvbdiseqc.cpp	6 Aug 2004 17:34:55 -0000	1.7
++++ libs/libmythtv/dvbdiseqc.cpp	18 Sep 2004 19:37:36 -0000
+@@ -29,6 +29,7 @@
+  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <math.h>
+ #include <iostream>
+ #include "pthread.h"
+ #include "qsqldatabase.h"
+Index: libs/libmythtv/videoout_xvmc.cpp
+===================================================================
+RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/videoout_xvmc.cpp,v
+retrieving revision 1.36
+diff -u -r1.36 videoout_xvmc.cpp
+--- libs/libmythtv/videoout_xvmc.cpp	13 Sep 2004 06:09:24 -0000	1.36
++++ libs/libmythtv/videoout_xvmc.cpp	18 Sep 2004 19:37:39 -0000
+@@ -32,7 +32,7 @@
+ 
+ extern "C" {
+ #ifdef USING_XVMC_VLD
+-#include <X11/extensions/viaXvMC.h>
++#include <X11/extensions/vldXvMC.h>
+ #endif
+ #include "../libavcodec/avcodec.h"
+ #include "../libavcodec/xvmc_render.h"
diff --git a/packages/mythtv/mythtv-0.18.1/.mtn2git_empty b/packages/mythtv/mythtv-0.18.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/mythtv-0.18.1/.mtn2git_empty
diff --git a/packages/mythtv/mythtv-0.18.1/msmpeg-underscore-pic.patch b/packages/mythtv/mythtv-0.18.1/msmpeg-underscore-pic.patch
index e69de29bb2..a73ca9950e 100644
--- a/packages/mythtv/mythtv-0.18.1/msmpeg-underscore-pic.patch
+++ b/packages/mythtv/mythtv-0.18.1/msmpeg-underscore-pic.patch
@@ -0,0 +1,85 @@
+--- mythtv-0.18.1/libs/libavcodec/msmpeg4.c.old	2005-06-03 21:31:43.000000000 +0100
++++ mythtv-0.18.1/libs/libavcodec/msmpeg4.c	2005-06-03 21:31:51.000000000 +0100
+@@ -723,7 +723,7 @@
+        necessitate to modify mpegvideo.c. The problem comes from the
+        fact they decided to store the quantized DC (which would lead
+        to problems if Q could vary !) */
+-#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC
++#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined __PIC__
+     asm volatile(
+         "movl %3, %%eax		\n\t"
+ 	"shrl $1, %%eax		\n\t"
+--- mythtv-0.18.1/libs/libavcodec/i386/dsputil_mmx_avg.h.old	2005-06-03 21:38:57.000000000 +0100
++++ mythtv-0.18.1/libs/libavcodec/i386/dsputil_mmx_avg.h	2005-06-03 21:39:02.000000000 +0100
+@@ -90,7 +90,7 @@
+ 	"add	$16, %2			\n\t"
+ 	"subl	$4, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -137,7 +137,7 @@
+ 	"add	$32, %2			\n\t"
+ 	"subl	$4, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -207,7 +207,7 @@
+ 	"add	$32, %2			\n\t"
+ 	"subl	$4, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -262,7 +262,7 @@
+ 	"add	$16, %2			\n\t"
+ 	"subl	$4, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -314,7 +314,7 @@
+ 	"add	$32, %2			\n\t"
+ 	"subl	$4, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -402,7 +402,7 @@
+ 	"add	$32, %2			\n\t"
+ 	"subl	$2, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -456,7 +456,7 @@
+ 	"add	$32, %2			\n\t"
+ 	"subl	$2, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -529,7 +529,7 @@
+ 	"add	$32, %2			\n\t"
+ 	"subl	$2, %0			\n\t"
+ 	"jnz	1b			\n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
diff --git a/packages/mythtv/mythtv_0.16+cvs20040918.bb b/packages/mythtv/mythtv_0.16+cvs20040918.bb
index e69de29bb2..2fe9395bab 100644
--- a/packages/mythtv/mythtv_0.16+cvs20040918.bb
+++ b/packages/mythtv/mythtv_0.16+cvs20040918.bb
@@ -0,0 +1,79 @@
+DESCRIPTION = "A full featured personal video recorder system."
+MAINTAINER = "Michael 'Mickey' Lauer"
+SECTION = "x11/multimedia"
+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 \
+	file://settings.pro \
+	file://prefix-etc.patch;patch=1"
+S = "${WORKDIR}/mythtv"
+
+DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc lirc"
+RDEPENDS = "qt-x11-plugins"
+
+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 bb, re
+        arch = bb.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
+}
+
diff --git a/packages/mythtv/mythtv_0.17.bb b/packages/mythtv/mythtv_0.17.bb
index e69de29bb2..54af1f47d4 100644
--- a/packages/mythtv/mythtv_0.17.bb
+++ b/packages/mythtv/mythtv_0.17.bb
@@ -0,0 +1,76 @@
+DESCRIPTION = "A full featured personal video recorder system."
+MAINTAINER = "Michael 'Mickey' Lauer"
+SECTION = "x11/multimedia"
+PR = "r0"
+
+SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \
+	file://settings.pro"
+
+DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc lirc"
+RDEPENDS = "qt-x11-plugins"
+
+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):
+        import bb, re
+        arch = bb.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}/
+	sed 's!PREFIX =.*!PREFIX = ${prefix}!' < settings.pro > settings.pro.new
+	mv settings.pro.new settings.pro
+}
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
+
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index e69de29bb2..6bd5cc81f3 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -0,0 +1,77 @@
+DESCRIPTION = "A full featured personal video recorder system."
+MAINTAINER = "Michael 'Mickey' Lauer"
+SECTION = "x11/multimedia"
+PR = "r0"
+
+SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \
+	file://msmpeg-underscore-pic.patch;patch=1 \
+	file://settings.pro"
+
+DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc lirc"
+RDEPENDS = "qt-x11-plugins"
+
+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):
+        import bb, re
+        arch = bb.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}/
+	sed 's!PREFIX =.*!PREFIX = ${prefix}!' < settings.pro > settings.pro.new
+	mv settings.pro.new settings.pro
+}
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
+
diff --git a/packages/mythtv/mythtv_cvs.bb b/packages/mythtv/mythtv_cvs.bb
index e69de29bb2..197e67c023 100644
--- a/packages/mythtv/mythtv_cvs.bb
+++ b/packages/mythtv/mythtv_cvs.bb
@@ -0,0 +1,88 @@
+DESCRIPTION = "A full featured personal video recorder system."
+MAINTAINER = "Michael 'Mickey' Lauer"
+SECTION = "x11/multimedia"
+PR = "r4"
+PV = "0.16+cvs${CVSDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "cvs://mythtv:mythtv@cvs.mythtv.org/var/lib/mythcvs;module=mythtv;method=pserver \
+	http://www.ivor.it/mythtv/epiaosd.tar.gz \
+	file://settings.pro \
+	file://prefix-etc.patch;patch=1"
+S = "${WORKDIR}/mythtv"
+
+DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc lirc"
+RDEPENDS = "qt-x11-plugins"
+
+PACKAGES =+ "libmythavcodec libmythavformat libmythtv mythtv-backend"
+FILES_libmythavcodec = "${libdir}/libmythavcodec-*.so.*"
+FILES_libmythavformat = "${libdir}/libmythavformat-*.so.*"
+FILES_libmythtv = "${libdir}/libmythtv-*.so.*"
+FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythtranscode ${bindir}/mythfilldatabase ${bindir}/mythcommflag"
+
+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 bb, re
+        arch = bb.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}/
+
+	cp -a ${WORKDIR}/themes/epiaosd ${S}/themes/
+}
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
+