snapshot of the 0-18-fixes branch including some additional patches from bug reports

(Portage version: 2.1_pre1)

6 files changed, 283 insertions, 21 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index ee4e0bccdf19..6f2ded984b69 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,20 @@
 # 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.77 2005/09/06 15:02:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.78 2005/12/26 09:15:30 cardoe Exp $
+
+*mythtv-0.18.2_pre7882 (26 Dec 2005)
+
+  26 Dec 2005; Doug Goldstein <cardoe@gentoo.org>
+  +files/mythbackend-0.18.2.conf, +files/mythbackend-0.18.2.rc,
+  +mythtv-0.18.2_pre7882.ebuild:
+  latest available snapshot of 0-18-fixes branch. mythtv is Rev 7882.
+  Includes additional patches to fix: 
+  bug #101009
+  bug #101308
+  bug #105521
+  bug #110100
+  bug #113419
+  bug #115760
 
   06 Sep 2005; Doug Goldstein <cardoe@gentoo.org> mythtv-0.18.1-r1.ebuild,
   mythtv-0.18.1-r2.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 03d123766123..3055359a17b5 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,24 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 cf781182fca11ba7a658c527b8b0968e ChangeLog 14165
-MD5 62b1d73674117c29843e35e593f1e130 mythtv-0.18.1-r2.ebuild 5464
-MD5 8336f31d54a9088d763d792ecaa636b2 mythtv-0.18.1-r1.ebuild 5085
-MD5 0d20a49cff965a0f3ab35cb0600b65b4 files/runmythfe 104
+MD5 6919828d0111a8f01f7d86685fe4362a ChangeLog 14544
+MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
+MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
+MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
+MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67
+MD5 c8fa0250a9ef05fee9c04fbd2aa6752f files/digest-mythtv-0.18.2_pre7882 76
+MD5 9e8f941d0aaf94e074e3501e6bfc0010 files/mythbackend-0.18.2.conf 429
+MD5 227c719cd34fab44a20373cc03b3686a files/mythbackend-0.18.2.rc 952
+MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
 MD5 a0dc63e4be8c214490e4ed4f13ed9544 files/mythtv-0.18.1-cc-on-mute.patch 679
 MD5 58ad62106705e1d4641f95ea96a37748 files/mythtv-0.18.1-cputypes-configure.patch 994
-MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
-MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
-MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
-MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 MD5 340e376a796fcc134e37222f01d705b3 files/mythtv-0.18.1-opengl-fix.patch 304
-MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67
 MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHa+IBtvusYtCZMsRAuRGAKCP3sX3TpZxfB5/Er7RLHlAMdvDgACbBSe7
-UkZRfpzQyZhp6I+I2KunMkI=
-=hIIW
------END PGP SIGNATURE-----
+MD5 0d20a49cff965a0f3ab35cb0600b65b4 files/runmythfe 104
+MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
+MD5 8336f31d54a9088d763d792ecaa636b2 mythtv-0.18.1-r1.ebuild 5085
+MD5 62b1d73674117c29843e35e593f1e130 mythtv-0.18.1-r2.ebuild 5464
+MD5 7327777138e93ad563460c6d2b61fd3b mythtv-0.18.2_pre7882.ebuild 5659
diff --git a/media-tv/mythtv/files/digest-mythtv-0.18.2_pre7882 b/media-tv/mythtv/files/digest-mythtv-0.18.2_pre7882
new file mode 100644
index 000000000000..1a6260ca46d3
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.18.2_pre7882
@@ -0,0 +1 @@
+MD5 eb570ff72128f475df2ed62747d6640b mythtv-0.18.2_pre7882.tar.bz2 17170015
diff --git a/media-tv/mythtv/files/mythbackend-0.18.2.conf b/media-tv/mythtv/files/mythbackend-0.18.2.conf
new file mode 100644
index 000000000000..df35a7784ee8
--- /dev/null
+++ b/media-tv/mythtv/files/mythbackend-0.18.2.conf
@@ -0,0 +1,9 @@
+# Copyright 1999-2004 Gentoo Foundation 
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/mythbackend-0.18.2.conf,v 1.1 2005/12/26 09:15:30 cardoe Exp $
+
+# Specify debug-level in log.
+# Accepts any combination (separated by comma) of:
+# all,none,quiet,record,playback,channel,osd,file,
+# schedule,network,commflag,audio,libav,jobqueue
+#MYTH_VERBOSE="none"
diff --git a/media-tv/mythtv/files/mythbackend-0.18.2.rc b/media-tv/mythtv/files/mythbackend-0.18.2.rc
new file mode 100644
index 000000000000..9861f04299d2
--- /dev/null
+++ b/media-tv/mythtv/files/mythbackend-0.18.2.rc
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/mythbackend-0.18.2.rc,v 1.1 2005/12/26 09:15:30 cardoe Exp $
+
+depend() {
+	need net
+	use mysql
+}
+
+start() {
+	[[ -z "${MYTH_VERBOSE}" ]] && MYTH_VERBOSE="none"
+
+	QTDIR=/usr/qt/3
+		
+	#fixes for bug #101308
+	unset DISPLAY
+	unset SESSION_MANAGER
+
+	# Work around any strange permissions that may be on these files.
+	chown -R mythtv /var/log/mythtv/
+	chown -R mythtv /etc/mythtv/
+
+	ebegin "Starting MythTV Backend"
+	start-stop-daemon --start --quiet --chuid mythtv \
+		--exec /usr/bin/mythbackend \
+		--make-pidfile --pidfile /var/run/mythbackend.pid \
+		--background -- --verbose ${MYTH_VERBOSE} \
+		--logfile /var/log/mythtv/mythbackend.log
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping MythTV Backend"
+	start-stop-daemon --stop --quiet --pidfile=/var/run/mythbackend.pid
+	eend $?
+}
diff --git a/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild b/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild
new file mode 100644
index 000000000000..88e6cbae9409
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild
@@ -0,0 +1,207 @@
+# 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.18.2_pre7882.ebuild,v 1.1 2005/12/26 09:15:30 cardoe Exp $
+
+inherit eutils qt3 flag-o-matic debug
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa altivec arts debug dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia vorbis opengl oss unichrome"
+
+DEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	|| ( (  x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXv
+		x11-libs/libXrandr )
+	virtual/x11 )
+	$(qt_min_version 3.3)
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	arts? ( kde-base/arts )
+	dvb? ( media-libs/libdvb )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx )
+	vorbis? ( media-libs/libvorbis )
+	opengl? ( virtual/opengl )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			sys-libs/libavc1394
+			>=media-libs/libiec61883-1.0.0 )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
+	!x11-base/xfree
+	!<x11-base/xorg-x11-6.8"
+
+S=${WORKDIR}/${PN}
+
+MYTHTV_GROUPS="video,audio"
+
+pkg_setup() {
+
+	if ! built_with_use x11-libs/qt mysql ; 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
+
+	if ! best_version x11-libs/libXv && ! built_with_use x11-base/xorg-x11 xv; then
+		eerror "xorg-x11 is missing XV support. Please add"
+		eerror "'xv' to your USE flags, and re-emerge xorg-x11."
+		die "xorg-x11 needs XV support"
+	fi
+
+	if use nvidia; then
+		echo
+		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	einfo
+	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
+	einfo "Don't complain because your -momfg-fast-speed CFLAG is being stripped"
+	einfo "Only additional CFLAG issues that will be addressed are for binary"
+	einfo "package building."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
+			-e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \
+			${S}/{filters,libs}/*/*.pro || die
+		sed -i -e "s:/lib/mythtv/:/$(get_libdir)/mythtv/:" \
+			${S}/libs/libmyth/mythcontext.cpp || die
+	fi
+}
+
+src_compile() {
+	use unichrome && use nvidia && die "You can not have USE="unichrome" and USE="nvidia" at the same time. Must disable one or the other."
+	local myconf="$(use_enable altivec)
+		$(use_enable oss audio-oss)
+		$(use_enable alsa audio-alsa)
+		$(use_enable arts audio-arts)
+		$(use_enable jack audio-jack)
+		$(use_enable lirc)
+		$(use_enable joystick joystick-menu)
+		$(use_enable unichrome xvmc-vld)
+		$(use_enable dvb)
+		$(use_enable dvb dvb-eit)
+		--dvb-path=/usr/include
+		$(use_enable opengl opengl-vsync)
+		$(use_enable vorbis vorbis)
+		$(use_enable nvidia xvmc)
+		$(use_enable ieee1394 firewire)
+		--enable-xv
+		--enable-xrandr
+		--disable-directfb
+		--enable-x11
+		--enable-proc-opt"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+	fi
+
+	## CFLAG cleaning so it compiles
+	MARCH=$(get-flag "march")
+	MTUNE=$(get-flag "mtune")
+	MCPU=$(get-flag "mcpu")
+	strip-flags
+	filter-flags "-march=*" "-mtune=*" "-mcpu=*"
+	filter-flags "-O" "-O?" "-Os"
+
+	if [[ -n "${MARCH}" ]]; then
+		myconf="${myconf} --arch=${MARCH}"
+	fi
+	if [[ -n "${MTUNE}" ]]; then
+		myconf="${myconf} --tune=${MTUNE}"
+	fi
+	if [[ -n "${MCPU}" ]]; then
+		myconf="${myconf} --cpu=${MCPU}"
+	fi
+
+	myconf="${myconf} --extra-cflags=${CFLAGS}"
+
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	if use frontendonly; then
+		##Backend Removal
+		cd ${S}
+		sed -e "s:CCONFIG linux backend:CCONFIG linux:" \
+			-i 'configure' || die "Removal of mythbackend failed"
+	fi
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	econf ${myconf} || die "configure died"
+
+	${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	dodoc AUTHORS COPYING FAQ UPGRADING README
+
+	if ! use frontendonly; then
+		insinto /usr/share/mythtv/database
+		doins database/*
+
+		exeinto /usr/share/mythtv
+		doexe "${FILESDIR}"/mythfilldatabase.cron
+
+		newinitd "${FILESDIR}"/mythbackend-0.18.2.rc mythbackend
+		newconfd "${FILESDIR}"/mythbackend-0.18.2.conf mythbackend
+	fi
+
+	dobin "${FILESDIR}"/runmythfe
+
+	ewarn "Want MythFrontend to always run? Add the following to your"
+	ewarn "myth user. i.e. My user is mythtv"
+	echo "crontab -e -u mythtv"
+	echo "* * * * * /usr/bin/runmythfe &"
+	ewarn "And you're all set."
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /var/log/mythtv
+	chown -R mythtv "${D}"/var/log/mythtv
+}
+
+pkg_preinst() {
+	enewuser mythtv -1 "-1" -1 ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	usermod -G ${MYTHTV_GROUPS} mythtv
+}
+
+pkg_postinst() {
+	einfo "Want MythFrontend to alway run? Run the following:"
+	echo "crontab -e -u mythtv"
+	einfo "And add the following:"
+	echo "* * * * * /usr/bin/runmythfe &"
+	echo
+	echo
+	einfo "To always have MythBackend running and available run the following:"
+	echo "rc-update add mythbackend default"
+}