oss is required, fixed bug #81372

(Portage version: 2.0.51.16)

4 files changed, 219 insertions, 17 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index b8b2fcb889df..3a730446a22d 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.40 2005/01/18 20:11:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.41 2005/02/10 07:24:51 cardoe Exp $
+
+*mythtv-0.16.20050115-r1 (10 Feb 2005)
+
+  10 Feb 2005; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.16.20050115-r1.ebuild, mythtv-0.16.20050115.ebuild:
+  oss is required so make it manditory.
+  fixed bug #81372 as per suggestions from Mike Trowbridge
 
 *mythtv-0.16.20050115 (18 Jan 2005)
 
diff --git a/media-tv/mythtv/files/digest-mythtv-0.16.20050115-r1 b/media-tv/mythtv/files/digest-mythtv-0.16.20050115-r1
new file mode 100644
index 000000000000..d939052a9c06
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.16.20050115-r1
@@ -0,0 +1 @@
+MD5 a16fa44a42ceb780ccf1bd7cb133fee8 mythtv-0.16.20050115.tar.bz2 14946055
diff --git a/media-tv/mythtv/mythtv-0.16.20050115-r1.ebuild b/media-tv/mythtv/mythtv-0.16.20050115-r1.ebuild
new file mode 100644
index 000000000000..c2ad5a4cb536
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.16.20050115-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.20050115-r1.ebuild,v 1.1 2005/02/10 07:24:51 cardoe Exp $
+
+inherit myth flag-o-matic eutils
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~cardoe/mythtv-0.16.20050115.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa arts dvb directfb lcd lirc nvidia cle266 opengl X xv mmx"
+
+S=${WORKDIR}/mythtv
+
+DEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	X? ( >=x11-libs/qt-3.1 )
+	directfb? ( dev-libs/DirectFB >=x11-libs/qt-embedded-3.1 )
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	>=sys-apps/sed-4
+	arts? ( kde-base/arts )
+	dvb? ( media-libs/libdvb )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )"
+
+RDEPEND="${DEPEND}
+	!media-tv/mythfrontend"
+
+pkg_setup() {
+	if use X; then
+		QTP=x11-libs/qt
+	elif use directfb; then
+		QTP=x11-libs/qt-embedded
+	else
+		eerror "You must have either X or directfb in USE"
+		die "No QT library selected"
+	fi
+
+	local qt_use="$(</var/db/pkg/`best_version ${QTP}`/USE)"
+	if ! has mysql ${qt_use} ; then
+		eerror "Qt is missing MySQL support. Please add"
+		eerror "'mysql' to your USE flags, and re-emerge Qt."
+		die "Qt needs MySQL support"
+	fi
+
+	return 0
+}
+
+setup_pro() {
+	sed -e 's:EXTRA_LIBS += -L/usr/X11R6/lib -lXinerama -lXv -lX11 -lXext -lXxf86vm:EXTRA_LIBS += -lXinerama -lXv -lX11 -lXext -lXxf86vm:' \
+		-i 'settings.pro' || die "failed to remove extra library path"
+
+	sed -e 's:LIBVERSION = 0.16:LIBVERSION = 0.16.20050115:' \
+		-i 'settings.pro' || die "failed to correct library version"
+
+
+	if [ "${ARCH}" == "amd64" ] || ! use mmx; then
+		sed -i settings.pro \
+			-e "s:DEFINES += MMX:DEFINES -= MMX:"
+	fi
+
+	if ! use X ; then
+		sed -e 's:CONFIG += using_x11:#CONFIG += using_x11:' \
+			-i 'settings.pro' || die "disable x11 failed"
+	fi
+
+	if ! use xv ; then
+		sed -e 's:CONFIG += using_xv:#CONFIG += using_xv:' \
+			-e 's:EXTRA_LIBS += -L/usr/X11R6/lib:#EXTRA_LIBS += -L/usr/X11R6/lib:' \
+			-i 'settings.pro' || die "disable xv failed"
+	fi
+
+	if use lcd ; then
+		sed -e 's:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:' \
+			-i 'settings.pro' || die "enable lcd sed failed"
+	fi
+
+	if use alsa ; then
+		sed -e 's:#CONFIG += using_alsa:CONFIG += using_alsa:' \
+			-e 's:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:' \
+			-i 'settings.pro' || die "enable alsa sed failed"
+	fi
+
+	if use arts ; then
+		sed -e 's:artsc/artsc.h:artsc.h:' \
+			-i "libs/libmyth/audiooutputarts.h" || die "sed failed"
+		sed -e 's:#CONFIG += using_arts:CONFIG += using_arts:' \
+			-e 's:#ARTS_LIBS = .*:ARTS_LIBS = `artsc-config --libs`:' \
+			-e 's:#EXTRA_LIBS += -L/opt/.*:EXTRA_LIBS += `artsc-config --libs`:' \
+			-e 's:#INCLUDEPATH += /opt/.*:QMAKE_CXXFLAGS += `artsc-config --cflags`:' \
+			-i 'settings.pro' || die "enable arts sed failed"
+	fi
+
+	if use dvb ; then
+		sed -e 's:#CONFIG += using_dvb:CONFIG += using_dvb:' \
+			-e 's:#DEFINES += USING_DVB:DEFINES += USING_DVB:' \
+			-e 's:#INCLUDEPATH += /usr/src/.*:INCLUDEPATH += /usr/include/linux/dvb:' \
+			-i 'settings.pro' || die "enable dvb sed failed"
+	fi
+
+	if use lirc ; then
+		sed -e 's:#CONFIG += using_lirc:CONFIG += using_lirc:' \
+			-e 's:#LIRC_LIBS = -llirc_client:LIRC_LIBS = -llirc_client:' \
+			-i 'settings.pro' || die "enable lirc sed failed"
+	fi
+
+	if use nvidia ; then
+		sed -e 's:#CONFIG += using_xvmc:CONFIG += using_xvmc:' \
+			-e 's:#DEFINES += USING_XVMC:DEFINES += USING_XVMC:' \
+			-e 's:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:' \
+			-i 'settings.pro' || die "enable nvidia xvmc sed failed"
+	fi
+
+	if use cle266 ; then
+		sed -e 's:#CONFIG += using_xvmc using_xvmc_vld:CONFIG += using_xvmc using_xvmc_vld:' \
+			-e 's:#DEFINES += USING_XVMC USING_XVMC_VLD:DEFINES += USING_XVMC USING_XVMC_VLD:' \
+			-e 's:#EXTRA_LIBS += -lviaXvMC -lXvMC:EXTRA_LIBS += -lviaXvMC -lXvMC:' \
+			-i 'settings.pro' || die "enable cle266 sed failed"
+	fi
+
+	if ! use cle266 ; then # needed because nvidia and cle266 are not compatible
+		sed -e 's:EXTRA_LIBS += -lviaXvMC -lXvMC:#EXTRA_LIBS += -lviaXvMC -lXvMC:' \
+			-i 'settings.pro' || die "disable VLD XvMC sed failed"
+	fi
+
+	if use directfb ; then
+		sed -e 's:#CONFIG += using_directfb:CONFIG += using_directfb:' \
+			-e 's:#EXTRA_LIBS += `directfb:EXTRA_LIBS += `directfb:' \
+			-e 's:#QMAKE_CXXFLAGS += `directfb:QMAKE_CXXFLAGS += `directfb:' \
+			-i 'settings.pro' || die "enable directfb sed failed"
+	fi
+	if use opengl ; then
+		sed -e 's:#DEFINES += USING_OPENGL_VSYNC:DEFINES += USING_OPENGL_VSYNC:' \
+			-e 's:#EXTRA_LIBS += -lGL:EXTRA_LIBS += -lGL:' \
+			-e 's:#CONFIG += using_opengl:CONFIG += using_opengl:' \
+			-i 'settings.pro' || die "enable opengl sed failed"
+	fi
+
+	#Gentoo X ebuilds always have XrandrX
+	sed -e 's:#CONFIG += using_xrandr:CONFIG += using_xrandr:' \
+		-e 's:#DEFINES += USING_XRANDR:DEFINES += USING_XRANDR:' \
+		-i 'settings.pro' || die "enable xrandr sed failed"
+}
+
+src_unpack() {
+	# Fix bugs 40964 and 42943.
+	filter-flags -fforce-addr -fPIC
+
+	# fix bug 67832, fix can be removed for 0.17 when its released
+	is-flag "-march=pentium4" && replace-flags "-O3" "-O2"
+
+	myth_src_unpack
+}
+
+src_compile() {
+	export QMAKESPEC="linux-g++"
+
+	econf || die
+	sed -i -e "s:OPTFLAGS=.*:OPTFLAGS=${CFLAGS}:g" config.mak
+
+	qmake -o "Makefile" "${PN}.pro"
+	make qmake || die
+	emake -C libs/libavcodec || die
+	emake -C libs/libavformat || die
+	emake -C libs/libmythsamplerate || die
+	emake -C libs/libmythsoundtouch || die
+	emake -C libs/libmyth || die
+	emake -C libs/libmythtv || die
+	emake -C libs
+	emake || die
+}
+
+src_install() {
+	myth_src_install
+	newbin "setup/setup" "mythsetup"
+
+	dodir /etc/mythtv
+	mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv"
+	dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	exeinto /usr/share/mythtv
+	doexe "${FILESDIR}/mythfilldatabase.cron"
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/mythbackend.rc6" mythbackend
+	insinto /etc/conf.d
+	newins "${FILESDIR}/mythbackend.conf" mythbackend
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /var/{log,run}/mythtv
+}
diff --git a/media-tv/mythtv/mythtv-0.16.20050115.ebuild b/media-tv/mythtv/mythtv-0.16.20050115.ebuild
index cb76bf056509..85c716064f9e 100644
--- a/media-tv/mythtv/mythtv-0.16.20050115.ebuild
+++ b/media-tv/mythtv/mythtv-0.16.20050115.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.20050115.ebuild,v 1.2 2005/02/06 23:58:41 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.20050115.ebuild,v 1.3 2005/02/10 07:24:51 cardoe Exp $
 
 inherit myth flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="alsa arts dvb directfb lcd lirc nvidia cle266 opengl X xv oss mmx"
+IUSE="alsa arts dvb directfb lcd lirc nvidia cle266 opengl X xv mmx"
 
 S=${WORKDIR}/mythtv
 
@@ -50,10 +50,6 @@ pkg_setup() {
 		die "Qt needs MySQL support"
 	fi
 
-	if ! use oss && ! use alsa && ! use arts ; then
-		eerror "You must have one of oss alsa or arts enabled"
-		die "No audio selected"
-	fi
 	return 0
 }
 
@@ -86,12 +82,6 @@ setup_pro() {
 			-i 'settings.pro' || die "enable lcd sed failed"
 	fi
 
-	if ! use oss ; then
-		sed -e 's:CONFIG += using_oss:#CONFIG += using_oss:' \
-			-e 's:DEFINES += USING_OSS:#DEFINES += USING_OSS:' \
-			-i 'settings.pro' || die "disable oss failed"
-	fi
-
 	if use alsa ; then
 		sed -e 's:#CONFIG += using_alsa:CONFIG += using_alsa:' \
 			-e 's:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:' \
@@ -129,13 +119,14 @@ setup_pro() {
 	fi
 
 	if use cle266 ; then
-		sed -e 's:#EXTRA_LIBS += -lviaXvMC -lXvMC:EXTRA_LIBS += -lviaXvMC -lXvMC:' \
+		sed -e 's:#CONFIG += using_xvmc using_xvmc_vld:CONFIG += using_xvmc using_xvmc_vld:' \
+			-e 's:#DEFINES += USING_XVMC USING_XVMC_VLD:DEFINES += USING_XVMC USING_XVMC_VLD:' \
+			-e 's:#EXTRA_LIBS += -lviaXvMC -lXvMC:EXTRA_LIBS += -lviaXvMC -lXvMC:' \
 			-i 'settings.pro' || die "enable cle266 sed failed"
 	fi
 
-	if ! use cle266 ; then
-		sed -e 's:CONFIG += using_xvmc using_xvmc_vld:#CONFIG += using_xvmc using_xvmc_vld:' \
-			-e 's:DEFINES += USING_XVMC USING_XVMC_VLD:#DEFINES += USING_XVMC USING_XVMC_VLD:' \
+	if ! use cle266 ; then # needed because nvidia and cle266 are not compatible
+		sed -e 's:EXTRA_LIBS += -lviaXvMC -lXvMC:#EXTRA_LIBS += -lviaXvMC -lXvMC:' \
 			-i 'settings.pro' || die "disable VLD XvMC sed failed"
 	fi