EAPI=2 USE depends. fix mythshutdown wakeup date issue. Improvements to h264 decoder. Fix for previously-shown with xmltv. UTF8 fix for UPnP. French DVB-T freq added. Fix for EITScan stopping. Fix potential segfault in mythbackend. Fix for index out of range issue.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 321 insertions, 5 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 00e50d017310..638c54766352 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.253 2008/10/01 14:47:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.254 2008/10/01 22:03:21 cardoe Exp $
+
+*mythtv-0.21_p18501 (01 Oct 2008)
+
+  01 Oct 2008; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.21_p18501.ebuild:
+  EAPI=2 USE depends. fix mythshutdown wakeup date issue. Improvements to
+  h264 decoder. Fix for previously-shown with xmltv. UTF8 fix for UPnP.
+  French DVB-T freq added. Fix for EITScan stopping. Fix potential segfault
+  in mythbackend. Fix for index out of range issue.
 
 *mythtv-0.22_alpha18528 (01 Oct 2008)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index d0b9ff69c587..348f8e6cf84a 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -14,14 +14,15 @@ EBUILD mythtv-0.21_p17637.ebuild 9110 RMD160 1b29b3a3daebce60442915511e821c9b51b
 EBUILD mythtv-0.21_p17722.ebuild 9110 RMD160 72c429c627978caaa913205808be2ae8e0663de7 SHA1 1893115799a48d23b3588d819a3c045e1aff50b5 SHA256 dbd31ee332d20de9c4aed587a9d8b562b02a544e8aac7a1e1dc1780ede546e7f
 EBUILD mythtv-0.21_p18116.ebuild 9110 RMD160 60fa91849fe9dd69515519e9e47d7447f659a357 SHA1 642363205b18ef8032100080e0d5c325113f0fd3 SHA256 d5da9576f1e1e4201dc2506ab5fd0cd470ea4cd1a733fa0742d296ed8f759150
 EBUILD mythtv-0.21_p18314.ebuild 9135 RMD160 abc10ae3aa74159a6e9996b65a37dfad08f8689e SHA1 32cd235babbc2d600bc6a11270b217f0f3140971 SHA256 609fde1613572b36d04dabe19e20e1ad48757e5108dd0397ad590c60a5a1291f
+EBUILD mythtv-0.21_p18501.ebuild 9078 RMD160 ad87aa1b630c496332435b4bfd7088629f13ab9c SHA1 89f682426665f2a5fd3f03424da07f29dc68ea17 SHA256 e81abd3cb6f6b224b3efd0243082738bac6118334e0776ecd7cbeb2409d44162
 EBUILD mythtv-0.22_alpha17733.ebuild 8739 RMD160 f6d22341422457e3b0d7792149492cc1614687e6 SHA1 a5f01e29624ccd030b0be44f76ad03f09d92ca4e SHA256 0cc8f71772e58a7dfeaf1b86d2a24ff74d3bd5e067f45c9d4831586102772cd5
 EBUILD mythtv-0.22_alpha18528.ebuild 8675 RMD160 12e5ec2a2054f247c79f3e86a189271aecc3301b SHA1 7d0ad82796c0a8cd5f7f147376594565a87638cc SHA256 f1687afb259515fe6dd83ce52a530a6e8e379e4ff62d3001a28be7213eccbc74
-MISC ChangeLog 49478 RMD160 dc611d677a1d3921df211b13b7a3307e7170a43a SHA1 d5ede1bfae291815d637d11861ad2ff2716afcf3 SHA256 d239e03e8885456952bb5f4d715fefb0866d7b9cb49b6ef2c848199fa3e707b9
+MISC ChangeLog 49868 RMD160 c41b164295967c77390ef3dd371fb1bab4301742 SHA1 a34d6d7ea9bc220385cb2034482ba9b074b693dc SHA256 4466b50e1ae029b668828b6ef7e1b2f42f8d769a3cc5ee05bd44a1949258a3ac
 MISC metadata.xml 4714 RMD160 c65d058e83e36342d6a49b63a6e9609e11242b66 SHA1 0de80f93ca1adfede5783d30a45953ec4cd27c9b SHA256 7501a841c218dd17bee56aeefcfc60194241b3a5468898850c5bedf5dafd28e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjjjccACgkQoeSe8B0zEfyragCfTdeg0ssvE2BNoJ5dYMpZeCEh
-OCsAnRjNH3MBkmo8nwuwA3/gKRl/9DJ9
-=3PeQ
+iEYEARECAAYFAkjj87MACgkQoeSe8B0zEfzsaACdFKBLV7wx6H01++/MfShdmUfn
+AxEAnA5qinrvR5H/WDpdYtpWo+itz8zf
+=trwF
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.21_p18501.ebuild b/media-tv/mythtv/mythtv-0.21_p18501.ebuild
new file mode 100644
index 000000000000..b214a4d7a951
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.21_p18501.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p18501.ebuild,v 1.1 2008/10/01 22:03:21 cardoe Exp $
+
+EAPI=2
+inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_nvidia"
+IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
+lirc mmx opengl perl python 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
+	>=x11-libs/qt-3.3:3[mysql,opengl]
+	virtual/mysql
+	virtual/opengl
+	virtual/glu
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 )
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	autostart? ( net-dialup/mingetty
+				x11-wm/evilwm
+				x11-apps/xset )
+	directv? ( virtual/perl-Time-HiRes )
+	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	dvd? ( media-libs/libdvdcss )
+	fftw? ( sci-libs/fftw:3.0 )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			>=sys-libs/libavc1394-0.5.3
+			>=media-libs/libiec61883-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	perl? ( dev-perl/DBD-mysql )
+	python? ( dev-python/mysql-python )
+	xvmc? ( x11-libs/libXvMC
+		app-admin/eselect-xvmc )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	x11-apps/xinit"
+
+PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	elog "This ebuild now uses a heavily stripped down version of your CFLAGS"
+
+	if use xvmc && use video_cards_nvidia; then
+		elog
+		elog "For NVIDIA based cards, the XvMC renderer only works on"
+		elog "the NVIDIA 4, 5, 6 & 7 series cards."
+	fi
+
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} \
+		|| die "Problem adding mythtv user"
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	# upstream wants the revision number in their version.cpp
+	# since the subversion.eclass strips out the .svn directory
+	# svnversion in MythTV's build doesn't work
+	sed -e "s:\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
+		-i "${S}"/version.pro || die "svnversion sed failed"
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/perl.pro
+}
+
+src_configure() {
+	local myconf="--prefix=/usr
+		--mandir=/usr/share/man
+		--libdir-name=$(get_libdir)"
+	use aac && myconf="${myconf} --enable-libfaad"
+	use alsa || myconf="${myconf} --disable-audio-alsa"
+	use altivec || myconf="${myconf} --disable-altivec"
+	use fftw && myconf="${myconf} --enable-libfftw3"
+	use jack || myconf="${myconf} --disable-audio-jack"
+	# let's give this a whirl from bug #220857
+	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
+		--disable-xvmc-vld"
+	#use xvmc && ! use video_cards_via && \
+	#	myconf="${myconf} --enable-xvmc"
+	#use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
+	#	--enable-xvmc-pro --disable-xvmcw"
+	# nvidia-drivers-71 don't support GLX 1.4
+	#use video_cards_nvidia && has_version =x11-drivers/nvidia-drivers-71* \
+	#	&& myconf="${myconf} --enable-glx-procaddrarb"
+	# according to the Ubuntu guys, this works better always on
+	myconf="${myconf} --enable-glx-procaddrarb"
+
+	myconf="${myconf}
+		$(use_enable dvb)
+		$(use_enable ieee1394 firewire)
+		$(use_enable lirc)
+		--disable-audio-arts
+		--disable-directfb
+		--dvb-path=/usr/include
+		--enable-opengl-vsync
+		--enable-xrandr
+		--enable-xv
+		--enable-x11"
+# per discussions with j-rod and janng in #mythtv, these are disabled
+#		--enable-libmp3lame
+#	use x264 && myconf="${myconf} --enable-libx264"
+#	use xvid && myconf="${myconf} --enable-libxvid"
+#	use aac && myconf="${myconf} --enable-libfaac"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=profile"
+	fi
+
+	## CFLAG cleaning so it compiles
+	MARCH=$(get-flag "march")
+	MTUNE=$(get-flag "mtune")
+	strip-flags
+	filter-flags "-march=*" "-mtune=*" "-mcpu=*"
+	filter-flags "-O" "-O?"
+
+	if [[ -n "${MARCH}" ]]; then
+		myconf="${myconf} --cpu=${MARCH}"
+	fi
+	if [[ -n "${MTUNE}" ]]; then
+		myconf="${myconf} --tune=${MTUNE}"
+	fi
+
+#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	einfo "Running ./configure ${myconf}"
+	./configure ${myconf} || die "configure died"
+}
+
+src_compile() {
+	eqmake3 mythtv.pro -o "Makefile" || die "eqmake3 failed"
+	emake || die "emake failed"
+
+	# firewire support should build the tester
+	if use ieee1394; then
+		cd contrib
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester firewire_tester.c \
+			${LDFLAGS} -liec61883 -lraw1394 || \
+			die "failed to compile firewire_tester"
+
+		cd channel_changers
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -std=gnu99 -o ../../6200ch 6200ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile 6200ch"
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch sa3250ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile sa3250ch"
+	fi
+
+	cd "${S}"/contrib/channel_changers
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye.c ${LDFLAGS} || \
+		die "failed to compile red_eye"
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	dodoc AUTHORS FAQ UPGRADING  README
+
+	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
+
+	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 /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins -r contrib/*
+
+	dobin "${FILESDIR}"/runmythfe
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${D}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc .xinitrc
+	fi
+
+	if use ieee1394; then
+		dobin firewire_tester || die "failed to install firewire_tester"
+		dodoc contrib/firewire_tester-README
+
+		dobin 6200ch || die "failed to install 6200ch"
+		dodoc contrib/channel_changers/6200ch-README
+
+		dobin sa3250ch || die "failed to install sa3250ch"
+		dodoc contrib/channel_changers/sa3250ch-README
+	fi
+
+	dobin red_eye || die "failed to install red_eye"
+	dodoc contrib/channel_changers/red_eye-README
+
+	if use directv; then
+		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
+		dodoc contrib/channel_changers/d10control-README
+	fi
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/MythTV
+
+	echo
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+
+	elog
+	elog "To always have MythBackend running and available run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	ewarn "Your recordings folder must be owned by the user 'mythtv' now"
+	ewarn "chown -R mythtv /path/to/store"
+
+	if use xvmc && [[ ! -s "${ROOT}/etc/X11/XvMCConfig" ]]; then
+		ewarn
+		ewarn "No XvMC implementation has been selected yet"
+		ewarn "Use 'eselect xvmc list' for a list of available choices"
+		ewarn "Then use 'eselect xvmc set <choice>' to choose"
+		ewarn "'eselect xvmc set nvidia' for example"
+	fi
+
+	if use autostart; then
+		elog
+		elog "Please add the following to your /etc/inittab file at the end of"
+		elog "the TERMINALS section"
+		elog "c8:2345:respawn:/sbin/mingetty --autologin mythtv tty8"
+	fi
+
+}
+
+pkg_postrm()
+{
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/MythTV
+}
+
+pkg_info() {
+	"${ROOT}"/usr/bin/mythfrontend --version
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${ROOT}"/usr/bin/mysql -u root -p < "${ROOT}"/usr/share/mythtv/database/mc.sql
+}