fix bug #292665, by allowing external faad library via faad USE flag. This is so we support additional AAC profiles that libavcodec does not support. Add a desktop entry for MythFrontend and MythTV Setup.

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

5 files changed, 355 insertions, 6 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 89a64cc35397..fb25fa89e75c 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # 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.301 2009/11/14 23:48:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.302 2009/11/15 04:53:14 cardoe Exp $
+
+*mythtv-0.22_p22824-r1 (15 Nov 2009)
+
+  15 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.22_p22824-r1.ebuild, +files/mythtv.png, metadata.xml:
+  fix bug #292665, by allowing external faad library via faad USE flag. This
+  is so we support additional AAC profiles that libavcodec does not support.
+  Add a desktop entry for MythFrontend and MythTV Setup.
 
 *mythtv-0.22_p22824 (14 Nov 2009)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index ffc262827d4b..aa303fad4769 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -10,6 +10,7 @@ AUX mythtv-0.21-dvb-headers.patch 725 RMD160 dfcf2a2b8dfe7af4f2a6776525c591bd078
 AUX mythtv-0.21-ldconfig-sanxbox-fix.patch 448 RMD160 4a5f9f7824c2c31f2a875f2fe25bcbd5b8f87e25 SHA1 2fe5f624ca80ecf097c45e12a3a9cd8038e92377 SHA256 aecead5240507fd0ccadad337160c79a9d7125d47e085f2bf167d9fecd2a804e
 AUX mythtv-0.21-mythflix-naming-collision.patch 475 RMD160 5473a9ffc8fbe1eebfe87a01abd22ea1c666f75f SHA1 008a9e762c59f8d49a69c5d82161a6a3df025a3b SHA256 969e31cc7310870041b6cae07f1a84b57a387f2ad5e96e24094fe0e146c68611
 AUX mythtv.logrotate.d 434 RMD160 c76842df30c1e9cc772f57dd3a3532c017d4176d SHA1 f5e772659b2616a55ca7326f65d8917352029b51 SHA256 a9032f190b28c3778340799be668779638ee09cf85e8febc669443f3aaf3578c
+AUX mythtv.png 2652 RMD160 557469c29583b3935558b9d4153579943bc041f5 SHA1 0f002c1541ac787be262a027b77c1ffd8141ce9d SHA256 3bb70a05dae6777bb61aea26b8852966bd3923714752e928f99eab8a9e6fcaa7
 AUX runmythfe 186 RMD160 e4b5bfeaecbf541e6cc45b6a9c0e5c048e3fccd0 SHA1 f5ec9dfd4781b28c0af8745c282ce242141590d8 SHA256 bebc665f37b21193be2f259cb8daf6863dfd4336e4e1424a7a989d6b679964fe
 AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5bd668d91acdd61aa80d5cc8af5cac SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94
 DIST mythtv-0.21_p19961.zip 17957135 RMD160 f6464fa25b945554bb95646329e0e7716014f074 SHA1 957fab45214dfab071836017d407b612e2bd3db4 SHA256 effd70a7e12cf4628683d702b28f7e79194de0021fb986eae25829cf9375aa13
@@ -22,14 +23,15 @@ EBUILD mythtv-0.21_p19961-r2.ebuild 8813 RMD160 74d39518eded6dbe685e7bf4729570b4
 EBUILD mythtv-0.21_p20877.ebuild 8842 RMD160 2e2f2ee25599cfeaa61d35202eef70c5b004d82b SHA1 ea0e64fe0a78ca851b937a76c1be8dba931a2f2f SHA256 722a6fdd1076163b96d57f2e209c267d53d7e7d383334e7d1ef55d7e13ee9794
 EBUILD mythtv-0.22_p22778.ebuild 9429 RMD160 51c142b5a617c27dbc06662634f27f807464e3eb SHA1 8fdc13b21bb47f75f81176b5d69ed5fdf1c0d350 SHA256 21180bf4a1d76dbee5b69ee0642b0998318b00751de18df6446ce8f725e1c3c8
 EBUILD mythtv-0.22_p22811.ebuild 9429 RMD160 e651158cf03718d8b3d0d9040997af4bb75a19b6 SHA1 c4542270b718bcd413c31df3097fb306586e7ae1 SHA256 91733e44f0272d56d4266e0b1e9d0d8d6d8fd7a0802728bbf8a45df9dbb2d620
+EBUILD mythtv-0.22_p22824-r1.ebuild 10114 RMD160 89f1ca25edac1544826f3e8de4057c7a4b0e83bd SHA1 a46000f9346f9eadc82525e4674b404bea3de957 SHA256 68d12516f82f3d5d9e0abec9a67280201df75c34e848957c8ada5f9862fa4ea7
 EBUILD mythtv-0.22_p22824.ebuild 9639 RMD160 6df6e079713725e7ec227b95b8b64a940fe850a5 SHA1 27262a5d71c36610bbcc20d9d153bad958ee1cb7 SHA256 e4ac18b3f2832bc7beb8177b77b409b612d3b7db08cb56793cb832dceaa8e820
 EBUILD mythtv-0.23_alpha22834.ebuild 9433 RMD160 3cee364a54b3cdf86014ee961206e9c3dfd39de5 SHA1 f92177c81cad181c5951ed25534cd88c1c172e19 SHA256 b5225ee05c76d545c567fc87821ceb06e02546c0234331ae3310a2b9a1cba858
-MISC ChangeLog 59629 RMD160 05fdf0df73ad0affc89e7dba1daa0fb4aab7235f SHA1 b45c1876f6486f639cf4812b6ea0a7e56bbf8191 SHA256 4376679ae3c2402852936f17c278a68d0f9c1a7a926b8b5084644abff6442738
-MISC metadata.xml 3143 RMD160 47d2f8051b6bb74cd23339f2420e780b0a8cb576 SHA1 bcfaa512f647812838ceb91a769a0c4889346526 SHA256 74eab4ea852e3a4d5b7e3500ae78e6284d4ed967c7fa8c8c1512771b64383a75
+MISC ChangeLog 59995 RMD160 20d8b7d8301d607d777411fb218442c4d2fb60e5 SHA1 887fcca373effc877e809fa6af22dfc0aeca3952 SHA256 7d5c4a5ac8a41883daf381123fc4f893766bb8f8f0dcbd05602a1aa2f7fff214
+MISC metadata.xml 3362 RMD160 12bfa4adb36ac6d0ec65d8d95aebdd520fd5c9f7 SHA1 dd71f5dd5d9dd906e4967ac83aa139a3394b485e SHA256 4a53294315b44781a2db630f4882f8664cc0dbca3082bba70995d53cc90b68c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr/QgEACgkQoeSe8B0zEfwFugCeJSzlFsAIaqs5WGogUrd1QE5V
-HxAAn38d7ukkhzY8PiVT1391vEJxyC7H
-=ch+i
+iEYEARECAAYFAkr/iUQACgkQoeSe8B0zEfwebACfU9XZ4Gv+osse+Ju072zrpo8U
+gSkAmwU5as8GXr4rETp4jmRMjGaJi7YE
+=XP6P
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/mythtv.png b/media-tv/mythtv/files/mythtv.png
new file mode 100644
index 000000000000..e3c1a5f31832
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv.png
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index 295756b24419..9bd21fb1d664 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -28,6 +28,10 @@
 	<flag name="dvb">Enables support for Linux DVB cards. These include all
 		cards that work with digital signals such as ATSC, DVB-T, DVB-C, and
 		DVB-S, QAM-64, and QAM-256.</flag>
+	<flag name='faad'>Uses external faad library for AAC decoding instead of
+		internal libavcodec for decoding AAC. The faad library supports
+		additional AAC types like AAC-LATM that libavcodec does not
+		support</flag>
 	<flag name="ieee1394">Allows MythTV to communicate and use Firewire enabled
 		Cable boxes. These are typically found in the United States, where such
 		support is required by law. This will also install Firewire test
diff --git a/media-tv/mythtv/mythtv-0.22_p22824-r1.ebuild b/media-tv/mythtv/mythtv-0.22_p22824-r1.ebuild
new file mode 100644
index 000000000000..cf5154776cac
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.22_p22824-r1.ebuild
@@ -0,0 +1,335 @@
+# 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_p22824-r1.ebuild,v 1.1 2009/11/15 04:53:14 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 video_cards_via"
+IUSE="alsa altivec autostart +css debug directv dvb faad \
+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 )
+	css? ( media-libs/libdvdcss )
+	directv? ( virtual/perl-Time-HiRes )
+	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	faad? ( media-libs/faad2 )
+	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 faad && myconf="${myconf} --enable-libfaad"
+	use fftw && myconf="${myconf} --enable-libfftw3"
+	use jack || myconf="${myconf} --disable-audio-jack"
+	use vdpau && myconf="${myconf} --enable-vdpau"
+
+	#from bug #220857 and fixed for bug #292481
+	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw"
+	if use video_cards_via && use xvmc; then
+		myconf="${myconf} --enable-xvmc-vld";
+	else
+		myconf="${myconf} --disable-xvmc-vld";
+	fi
+
+	# 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
+	unset CFLAGS
+	unset 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
+	fowners -R mythtv "${D}"/etc/mythtv
+	keepdir /var/log/mythtv
+	fowners -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
+
+	# add icon from MythTV's website (scaled to 32x32)
+	# for desktop entry
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/mythtv.png
+
+	# create desktop entry for mythfrontend
+	make_desktop_entry /usr/bin/mythfrontend "MythFrontend" mythtv.png \
+		"AudioVideo;TV;;" "/etc/mythtv/"
+	make_desktop_entry /usr/bin/mythtv-setup "MythTV Setup" mythtv.png \
+		"AudioVideo;TV;;" "/etc/mythtv/"
+
+	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
+
+	# correct permissions so the scripts are actually usable
+	fperms 755 /usr/share/mythtv/contrib/*/*.pl
+	fperms 755 /usr/share/mythtv/mythconverg_backup.pl
+	fperms 755 /usr/share/mythtv/mythconverg_restore.pl
+
+}
+
+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
+}