svn snapshot bump for v4l2 fixes for ivtv-0.8. Additional fixes.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 289 insertions, 5 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 64274a6b0ef8..e8b19100fad6 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.118 2006/09/22 15:00:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.119 2006/09/25 19:56:47 cardoe Exp $
+
+*mythtv-0.20_p11281 (25 Sep 2006)
+
+  25 Sep 2006; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.20_p11281.ebuild:
+  svn snapshot bump for v4l2 fixes for ivtv-0.8. Additional fixes.
 
   22 Sep 2006; Steve Dibb <beandog@gentoo.org> mythtv-0.20_p11244.ebuild:
   Remove ivtv USE flag
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 3b21be916099..f44d264b4522 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mythbackend-0.18.2.conf 431 RMD160 1879e25aadacf4c45c3857ec329546fd5950af36 SHA1 6e4f5ffd0d7e1122adb0ab29c43339f9f1359785 SHA256 89fa9de3a25937c47062adc3ba449067ef50564729117c4f171fe69459588810
 MD5 ce6902dd0c8832390052b427a14acc42 files/mythbackend-0.18.2.conf 431
 RMD160 1879e25aadacf4c45c3857ec329546fd5950af36 files/mythbackend-0.18.2.conf 431
@@ -30,6 +33,7 @@ DIST mythtv-0.19-rev10505.patch.bz2 36022 RMD160 2440ca9f1ac53d8ad5b0025c22dce1c
 DIST mythtv-0.19.tar.bz2 10162049 RMD160 cd90bb3629df55f9e803d867cf59e378e9cace07 SHA1 465e71ad498f5109ba626df69d719f8c10683a8d SHA256 ca73641116d3bbc7d353a99348f9f8c9a156bcc756c90a6ed06f1498d9d9cd8f
 DIST mythtv-0.20.tar.bz2 12380677 RMD160 d9ef5221a1d821f2f210e7ebb0c32a88625fb522 SHA1 be6d2666a689340d40ca608f6a8a3af10f752a55 SHA256 777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3
 DIST mythtv-0.20_svn11244.patch.bz2 2357 RMD160 aa8d95353a4e49ef339ec03eee7634186a8ef03a SHA1 2b40edc2948876de15ff210f23053f92c2365c88 SHA256 2861d79015607add1b135c3c5c16f86cbdda39ceb6bd9766e80e8a738f8f1b8a
+DIST mythtv-0.20_svn11281.patch.bz2 3209 RMD160 9fb4bbaab2d9f286eb01b6f9c5f5bd02593adbc6 SHA1 e7d8b7adc56091ff48f72c3efcdde40f7c5883bf SHA256 d039d85166dd4a023370b0c2115bed9c093dc1b9f3e18fb37486ed3cff4b44b5
 EBUILD mythtv-0.19_p10505.ebuild 7783 RMD160 944d986b17af8847f5d63a09dbbb7f58186b1443 SHA1 b0f951a70b448ae593dd81c260cc94b9aada2eb5 SHA256 25f4424e5537a48b35a45540d88e910b783b723b38507552bb013611ec06be65
 MD5 01819f3b19e7ad9c0d8f80c421e10b75 mythtv-0.19_p10505.ebuild 7783
 RMD160 944d986b17af8847f5d63a09dbbb7f58186b1443 mythtv-0.19_p10505.ebuild 7783
@@ -38,10 +42,14 @@ EBUILD mythtv-0.20_p11244.ebuild 7326 RMD160 b231d53eea0d49c0be49afd61dc99f50943
 MD5 1fbf80e9e6aadc3273efc9c4f6e81440 mythtv-0.20_p11244.ebuild 7326
 RMD160 b231d53eea0d49c0be49afd61dc99f5094302054 mythtv-0.20_p11244.ebuild 7326
 SHA256 0bcc8f95c7217bc9f9cf61d9667b2a6699e0577cd7e2813330b91abf4144fb68 mythtv-0.20_p11244.ebuild 7326
-MISC ChangeLog 21212 RMD160 34c6684ccfe9d3110447333b52cadb462ab67a63 SHA1 de54120cbb20287aacfe65bf21adb4c2da8d288a SHA256 e224b1aca2f04c19106874b477d8ba0bc5d1977346a5d07de157910cb7f2ea2d
-MD5 5416bac64a1d881a8e663849b496741f ChangeLog 21212
-RMD160 34c6684ccfe9d3110447333b52cadb462ab67a63 ChangeLog 21212
-SHA256 e224b1aca2f04c19106874b477d8ba0bc5d1977346a5d07de157910cb7f2ea2d ChangeLog 21212
+EBUILD mythtv-0.20_p11281.ebuild 7402 RMD160 019b9334120151b27c92225fd20f9f88bf33ab7c SHA1 b31f5c695b8926f4cfaf9a09d108a8ef35a9248f SHA256 380df37983df7330b65b0e9692ee7448e88db155e66be916678ef5bb74994b81
+MD5 9c1c1516a102b83890e315ad20149102 mythtv-0.20_p11281.ebuild 7402
+RMD160 019b9334120151b27c92225fd20f9f88bf33ab7c mythtv-0.20_p11281.ebuild 7402
+SHA256 380df37983df7330b65b0e9692ee7448e88db155e66be916678ef5bb74994b81 mythtv-0.20_p11281.ebuild 7402
+MISC ChangeLog 21394 RMD160 90f8f749ef375a7acfb1f46e22da1c043b910b4a SHA1 9a3335137008cf9afd651d25cf6d0ad7260e67fe SHA256 bc8cfe67f43615a629d8da17347fb211ba3541e3242e9ae252cf05974ecec526
+MD5 46de285f526e0e7c6cb007108eb11cbf ChangeLog 21394
+RMD160 90f8f749ef375a7acfb1f46e22da1c043b910b4a ChangeLog 21394
+SHA256 bc8cfe67f43615a629d8da17347fb211ba3541e3242e9ae252cf05974ecec526 ChangeLog 21394
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -52,3 +60,13 @@ SHA256 a5c041b6bd6f461921ac40b2477464a0fce347c09c0955f7ae0bf5770c0f6fdd files/di
 MD5 38231bd1e76b7b16a41db7e20f9fb093 files/digest-mythtv-0.20_p11244 509
 RMD160 33e7a2025c76dfec52aee495460e7736c63dfbd9 files/digest-mythtv-0.20_p11244 509
 SHA256 c244a3436f678f2a17373b043c32bbd9407c4564a2065e75a17bfdf287ea548b files/digest-mythtv-0.20_p11244 509
+MD5 4776689ba4e0f1e7dc904fe538239f10 files/digest-mythtv-0.20_p11281 509
+RMD160 f6e87b9845704cad8437494213859265f63196a2 files/digest-mythtv-0.20_p11281 509
+SHA256 f2737bcfdba3bd7443906339354270bc858a5dbabed235889f8840ab07b0aba3 files/digest-mythtv-0.20_p11281 509
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFGDRjoeSe8B0zEfwRAlxyAJ9ATE8gakvuBmg8m5uIP4fg4B4KXwCdGAjw
+GyOjVryaBxqOztlJ4ZNAUC0=
+=ZVK0
+-----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20_p11281 b/media-tv/mythtv/files/digest-mythtv-0.20_p11281
new file mode 100644
index 000000000000..3a82169e79dc
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.20_p11281
@@ -0,0 +1,6 @@
+MD5 52bec1e0fadf7d24d6dcac3f773ddf74 mythtv-0.20.tar.bz2 12380677
+RMD160 d9ef5221a1d821f2f210e7ebb0c32a88625fb522 mythtv-0.20.tar.bz2 12380677
+SHA256 777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3 mythtv-0.20.tar.bz2 12380677
+MD5 bdc93d58a1c456268599ac4fa329267d mythtv-0.20_svn11281.patch.bz2 3209
+RMD160 9fb4bbaab2d9f286eb01b6f9c5f5bd02593adbc6 mythtv-0.20_svn11281.patch.bz2 3209
+SHA256 d039d85166dd4a023370b0c2115bed9c093dc1b9f3e18fb37486ed3cff4b44b5 mythtv-0.20_svn11281.patch.bz2 3209
diff --git a/media-tv/mythtv/mythtv-0.20_p11281.ebuild b/media-tv/mythtv/mythtv-0.20_p11281.ebuild
new file mode 100644
index 000000000000..4e43a2b408a5
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.20_p11281.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20_p11281.ebuild,v 1.1 2006/09/25 19:56:47 cardoe Exp $
+
+inherit mythtv flag-o-matic multilib eutils debug qt3
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
+
+IUSE="alsa altivec backendonly crciprec debug dbox2 dts dvb dvd freebox frontendonly hdhomerun ieee1394 ivtv jack joystick lcd lirc mmx vorbis opengl perl xvmc ${IUSE_VIDEO_CARDS}"
+
+RDEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	xvmc? (
+		x11-libs/libXvMC
+		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
+								 x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_via? ( x11-drivers/xf86-video-via )
+		video_cards_i810? ( x11-drivers/xf86-video-i810 )
+	)
+	$(qt_min_version 3.3)
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	dts? ( media-libs/libdts )
+	dvd? ( 	media-libs/libdvdnav
+		media-libs/libdts )
+	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	ivtv? ( media-tv/ivtv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	vorbis? ( media-libs/libvorbis )
+	opengl? ( virtual/opengl )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			>=sys-libs/libavc1394-0.5.0
+			>=media-libs/libiec61883-1.0.0 )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )"
+
+DEPEND="${RDEPEND}
+	x11-apps/xinit"
+
+PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+MYTHTV_GROUPS="video,audio,tty"
+
+pkg_setup() {
+
+	local rip=0
+	if ! built_with_use -a =x11-libs/qt-3* mysql opengl ; then
+		echo
+		eerror "MythTV requires Qt to be built with mysql and opengl use flags enabled."
+		eerror "Please re-emerge =x11-libs/qt-3*, after having the use flags set."
+		echo
+		rip=1
+	fi
+
+	if use xvmc && use video_cards_nvidia; then
+		echo
+		ewarn "You enabled the 'xvmc' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	if use xvmc && ! ( use video_cards_i810 || use video_cards_nvidia || use video_cards_via ); then
+		echo
+		eerror "You enabled the XvMC USE flag but did not configure VIDEO_CARDS with either"
+		eerror "an nVidia, Intel i810, or VIA video card."
+		echo
+		rip=1
+	fi
+
+	[[ $rip == 1 ]] && die "Please fix the above issues, before continuing."
+
+	echo
+	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."
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#Fixes of the bugs found in the release
+	mythtv-fixes_patch
+
+	# As needed fix since they don't know how to write qmake let alone a real
+	# make system
+	epatch "${FILESDIR}"/${PN}-${MY_PV}-as-needed.patch
+
+	# Seriously... testing.. or maybe seeing if the OpenGL spec says these are
+	# public... or checking mesa before assuming they're there
+	epatch "${FILESDIR}"/${PN}-${MY_PV}-vsync.patch
+}
+
+src_compile() {
+	local myconf="--prefix=/usr
+		--mandir=/usr/share/man
+		--libdir-name=$(get_libdir)"
+	use alsa || myconf="${myconf} --disable-audio-alsa"
+	use jack || myconf="${myconf} --disable-audio-jack"
+	use dts || myconf="${myconf} --disable-dts"
+	use ivtv || myconf="${myconf} --disable-ivtv"
+	use freebox || myconf="${myconf} --disable-freebox"
+	use dbox2 || myconf="${myconf} --disable-dbox2"
+	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
+	use crciprec || myconf="${myconf} --disable-crciprec"
+	use altivec || myconf="${myconf} --disable-altivec"
+	use xvmc && myconf="${myconf} --enable-xvmc"
+	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc-pro"
+	use perl && myconf="${myconf} --with-bindings=perl"
+	myconf="${myconf}
+		--disable-audio-arts
+		$(use_enable lirc)
+		$(use_enable joystick joystick-menu)
+		$(use_enable dvb)
+		--dvb-path=/usr/include
+		$(use_enable opengl opengl-vsync)
+		$(use_enable ieee1394 firewire)
+		--enable-xrandr
+		--enable-xv
+		--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?"
+
+	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-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	if use frontendonly; then
+		##Backend Removal
+		ewarn
+		ewarn "You are using the experimental feature for only installing the frontend."
+		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
+		ewarn "If this breaks, you own both pieces."
+		ewarn
+		myconf="${myconf} --disable-backend"
+	fi
+
+	if use backendonly; then
+		##Frontend Removal
+		ewarn
+		ewarn "You are using the experimental feature for only installing the backend."
+		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
+		ewarn "If this breaks, you own both pieces."
+		ewarn
+		myconf="${myconf} --disable-frontend"
+	fi
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	einfo "Running ./configure ${myconf}"
+	./configure ${myconf} || die "configure died"
+
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	for doc in AUTHORS FAQ UPGRADING ChangeLog README; do
+		test -e "${doc}" && dodoc ${doc}
+	done
+
+	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
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${D}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${D}"/var/log/mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins contrib/*
+}
+
+pkg_preinst() {
+	enewuser mythtv -1 "-1" -1 ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+pkg_postinst() {
+	if ! use backendonly; then
+		echo
+		einfo "Want mythfrontend to start automatically? Run the following:"
+		echo "crontab -e -u mythtv"
+		einfo "Add add the following:"
+		echo "* * * * * /usr/bin/runmythfe &"
+	fi
+	echo
+	einfo "To always have MythBackend running and available run the following:"
+	echo "rc-update add mythbackend default"
+	echo
+	ewarn "Your recordings folder must be owned by the user 'mythtv' now"
+	echo "chown -R mythtv /path/to/store"
+}
+