fix crash when metallugy theme is used and you go to the program guide

Package-Manager: portage-2.1.7.4/cvs/Linux x86_64

3 files changed, 325 insertions, 5 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 77a8fb86fd8b..4bc9873977e0 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.288 2009/11/09 19:38:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.289 2009/11/10 14:56:26 cardoe Exp $
+
+*mythtv-0.22_p22778 (10 Nov 2009)
+
+  10 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.22_p22778.ebuild:
+  fix crash when metallugy theme is used and you go to the program guide
 
   09 Nov 2009; Doug Goldstein <cardoe@gentoo.org> mythtv-0.22_p22764.ebuild,
   mythtv-0.22_p22772.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 67470237b0e8..cf19bd4c57eb 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -16,16 +16,18 @@ DIST mythtv-0.21_p19961.zip 17957135 RMD160 f6464fa25b945554bb95646329e0e7716014
 DIST mythtv-0.21_p20877.zip 17988425 RMD160 1f5d95f78480ac505c6324c8a008563789c83057 SHA1 ddaf21bbb7075ffe79d920a0e69a53d1233df088 SHA256 7e5b2347fc7d128f30565d1f6cac4631fe8e161b45122dfa4b53e10f24400318
 DIST mythtv-0.22_p22764.zip 26490830 RMD160 5e45453478ffb9c9a4be15529e9f555629ffa601 SHA1 df8987ea0ab0e6cd526a95734f581d6e125b3ed0 SHA256 5850cbfa11532c07f9f0c52c4ad830b6b9233fcad563eb838ba133e934569213
 DIST mythtv-0.22_p22772.zip 26490429 RMD160 373e187d86241adfbaf15e1bc63ad5da84eb4318 SHA1 745cff39b6dcec4629bccd50030efc9f236be7bb SHA256 2bdb64543678afee45e129cd20a1c666ff8138393773ad8b887451406418978d
+DIST mythtv-0.22_p22778.zip 26490383 RMD160 03e582a51ca244dbfdab6ae3c927240fc6210458 SHA1 eb7e8bdc4b841315c1b6d18de0410e317cfaecb5 SHA256 0f647e0c18f74d059822e897a3a3004f79870f3c93ca783c5804c566f606b2aa
 EBUILD mythtv-0.21_p19961-r2.ebuild 8812 RMD160 1107bdc3d12b051feec2aff580fbcf65583a6784 SHA1 e018ed02b9e1d25e1296704df0821870fff80c30 SHA256 b8c2585072aa022d181736c2bcc33a7a61c4697712504fd304974dc2d1996ee0
 EBUILD mythtv-0.21_p20877.ebuild 8844 RMD160 07e9079645f385d3abf0ed1e2182abc5b0bf0bdf SHA1 975df4ed94356d88fa74cabb0183af47230b5ccb SHA256 bef2828b900dec0310e76dc9d0e9ba6dac91ae76662948f815bdac9248ee8487
 EBUILD mythtv-0.22_p22764.ebuild 9267 RMD160 78af4f397bdb6bb3372b21ca0f368483ee768bb0 SHA1 a85e55cb57210987ee4a2dfef8715d4ea70d3739 SHA256 5064bce236b59095a0dee574495e6d6c5a45eec55a0b7605883b4a877bdd90e1
 EBUILD mythtv-0.22_p22772.ebuild 9267 RMD160 c0487f6e31902467c2535b422f34b1735b19ef74 SHA1 6cf7206485f0608e01f78caead58a4a3f73eb874 SHA256 3a72bfbcfe3a47b557f5bf7605e1458a6f02dcd476a7700e6494ca02d2a1bc1c
-MISC ChangeLog 57390 RMD160 829bbde0869fa99f53cd98bb9cbb664e55085940 SHA1 9a6e63a841970aa62fa31a4b9816367ff64326f9 SHA256 8ed02f01ca2aa225c36542d21dedcec094856dfa75fe2acf0d88be704f01031a
+EBUILD mythtv-0.22_p22778.ebuild 9267 RMD160 2f26e7993252b6d796ea9539df36d1e581bb63ba SHA1 623c7581478687d04b2dc60bd4f70c540f419710 SHA256 1494638851ebac6f51bb2829dbb40c9ec4d773854990ab91da2465d55935a248
+MISC ChangeLog 57579 RMD160 1109f72e070e055a9d7a6887ca467144bc6a84ed SHA1 aa3b4606a2a9592bd3cf61815dfbf7aeb519d072 SHA256 dbd42bfd39651c88bcbed64ecae9eac2dfa47e26ffea3e9e2ef50610e69764a8
 MISC metadata.xml 3336 RMD160 e84d87ad5c775f55030e52da2621553cd18c0e3b SHA1 a5307073956deb376491eec55b6914443189e2d9 SHA256 e008e5e04ca42ee1bb171aac900376cf93ba277f8987db4a42cc23a5910c891f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr4b8AACgkQoeSe8B0zEfwtygCfWRtWQ8XHIED1tPlwI4aaiHI+
-LhAAmwQ2AwY7xvZZ8t0glsSdhrh5IujJ
-=BA/y
+iEYEARECAAYFAkr5fyAACgkQoeSe8B0zEfxDdQCfSkU4jaGjALrsytwn5QDb4462
+8gwAnRYfZFr2jJVuFWlBCqDeo8Jtt2pY
+=XfeB
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.22_p22778.ebuild b/media-tv/mythtv/mythtv-0.22_p22778.ebuild
new file mode 100644
index 000000000000..7742c493258f
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.22_p22778.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_p22778.ebuild,v 1.1 2009/11/10 14:56:26 cardoe Exp $
+
+EAPI=2
+inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_nvidia"
+IUSE="alsa altivec autostart debug directv dvb dvd \
+fftw ieee1394 jack lcd lirc mmx perl pulseaudio python \
+tiff vdpau 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-core-4.4:4[qt3support]
+	>=x11-libs/qt-gui-4.4:4[qt3support,tiff?]
+	>=x11-libs/qt-sql-4.4:4[qt3support,mysql]
+	>=x11-libs/qt-opengl-4.4:4[qt3support]
+	>=x11-libs/qt-webkit-4.4:4
+	virtual/mysql
+	virtual/opengl
+	virtual/glu
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 )
+	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 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.7 )
+	python? ( dev-python/mysql-python )
+	vdpau? ( x11-libs/libvdpau )
+	xvmc? ( x11-libs/libXvMC )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	x11-apps/xinit
+	!<media-plugins/mythcontrols-0.22
+	!<x11-themes/mythtv-themes-0.22
+	!<x11-themes/mythtv-themes-extra-0.22"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	einfo "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
+
+	# puts the SVN branch name into an environment variable that the build
+	# system reads and embeds into the binaries for version info
+	export URL=${MYTHTV_REPO}
+
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	# puts the SVN revision into a special file that the build system
+	# reads and embeds into the binaries for version info
+	echo "SOURCE_VERSION=${MYTHTV_REV}" > "${S}/VERSION"
+
+	# 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
+
+	epatch "${FILESDIR}/${PN}-0.21-ldconfig-sanxbox-fix.patch"
+}
+
+src_configure() {
+	local myconf="--prefix=/usr
+		--mandir=/usr/share/man
+		--libdir-name=$(get_libdir)"
+	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"
+	use vdpau && myconf="${myconf} --enable-vdpau"
+
+	#from bug #220857
+	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
+		--disable-xvmc-vld"
+
+	# according to the Ubuntu guys, this works better being 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"
+
+	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}"
+	sh ./configure ${myconf} || die "configure died"
+}
+
+src_compile() {
+	eqmake4 mythtv.pro -o "Makefile" || die "eqmake4 failed"
+	emake || die "emake failed"
+
+	# firewire support should build the tester
+	if use ieee1394; then
+		cd contrib
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester \
+			development/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/6200ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile 6200ch"
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch \
+			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/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"
+		newdoc contrib/development/firewire_tester/README README.firewire_tester
+
+		dobin 6200ch || die "failed to install 6200ch"
+		newdoc contrib/channel_changers/6200ch/README README.6200ch
+
+		dobin sa3250ch || die "failed to install sa3250ch"
+		newdoc contrib/channel_changers/sa3250ch/README README.sa3250ch
+	fi
+
+	dobin red_eye || die "failed to install red_eye"
+	newdoc contrib/channel_changers/red_eye/README README.red_eye
+
+	if use directv; then
+		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
+		newdoc contrib/channel_changers/d10control/README README.d10control
+	fi
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize $(python_get_sitedir)/MythTV
+
+	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
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+
+	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
+
+	elog
+	ewarn "Beware when you change ANY packages on your system that it may"
+	ewarn "break some or all of the MythTV components. MythTV's build system"
+	ewarn "is very fragile and only supports automagic dependencies."
+	ewarn "i.e. It depends on libraries and components it finds at build time"
+	ewarn "We try to mitigate this with RDEPENDs but be prepared to run"
+	ewarn "revdep-rebuild as necessary."
+
+}
+
+pkg_postrm()
+{
+	use python && python_mod_cleanup $(python_get_sitedir)/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
+}