mythtv: remove explicit qt-x11-free dependency and some obsolete versions

7 files changed, 5 insertions, 383 deletions

diff --git a/packages/mythtv/mythtv-0.16+cvs20040918/.mtn2git_empty b/packages/mythtv/mythtv-0.16+cvs20040918/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mythtv/mythtv-0.16+cvs20040918/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch b/packages/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch
deleted file mode 100644
index d920cade2e..0000000000
--- a/packages/mythtv/mythtv-0.16+cvs20040918/xvmc-via.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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.16+cvs20040918.bb b/packages/mythtv/mythtv_0.16+cvs20040918.bb
deleted file mode 100644
index 2fe9395bab..0000000000
--- a/packages/mythtv/mythtv_0.16+cvs20040918.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-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.16.bb b/packages/mythtv/mythtv_0.16.bb
deleted file mode 100644
index 0dd6e22120..0000000000
--- a/packages/mythtv/mythtv_0.16.bb
+++ /dev/null
@@ -1,74 +0,0 @@
-DESCRIPTION = "A full featured personal video recorder system."
-MAINTAINER = "Michael 'Mickey' Lauer"
-SECTION = "x11/multimedia"
-PR = "r2"
-
-SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
-
-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
-
-	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.17.bb b/packages/mythtv/mythtv_0.17.bb
deleted file mode 100644
index 54af1f47d4..0000000000
--- a/packages/mythtv/mythtv_0.17.bb
+++ /dev/null
@@ -1,76 +0,0 @@
-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 6bd5cc81f3..09aa63062f 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -1,13 +1,15 @@
 DESCRIPTION = "A full featured personal video recorder system."
-MAINTAINER = "Michael 'Mickey' Lauer"
+HOMEPAGE = "http://www.mythtv.org"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "x11/multimedia"
-PR = "r0"
+PR = "r1"
 
 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"
+DEPENDS = "xinerama lame libxv libxxf86vm libxvmc lirc"
 RDEPENDS = "qt-x11-plugins"
 
 inherit qmake qt3x11
diff --git a/packages/mythtv/mythtv_cvs.bb b/packages/mythtv/mythtv_cvs.bb
deleted file mode 100644
index 197e67c023..0000000000
--- a/packages/mythtv/mythtv_cvs.bb
+++ /dev/null
@@ -1,88 +0,0 @@
-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
-}
-