Qt's tiff support is only required to be present if we expect MythTV to render tiff images for MythGallery. Adding USE flag at the request of a user. stuartm/gbee provided details.

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

5 files changed, 333 insertions, 10 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index c3539a0e3952..21b701133b82 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # 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.255 2008/10/02 14:49:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.256 2008/10/02 22:02:35 cardoe Exp $
+
+*mythtv-0.22_alpha18535 (02 Oct 2008)
+
+  02 Oct 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml,
+  mythtv-0.22_alpha18528.ebuild, +mythtv-0.22_alpha18535.ebuild:
+  Qt's tiff support is only required to be present if we expect MythTV to
+  render tiff images for MythGallery. Adding USE flag at the request of a
+  user. stuartm/gbee provided details.
 
   02 Oct 2008; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.20.2_p15634.ebuild, mythtv-0.21_p17637.ebuild,
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index dee406596320..867fd33d5f7f 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash_profile 63 RMD160 71ed6a00c824f8d2704b65371e54adb85ca6d861 SHA1 cd4bc03298d30fadb759d1a2463e930441c5a5e7 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9
 AUX mythbackend-0.18.2.conf 1430 RMD160 f966c40618592cae62a2e4345bb4cd5847ec0de6 SHA1 2a3cb59593c4fd1ba431b4ebe70b91782a418a02 SHA256 0b6d0514d410bdcbeaebded48488926fc2941edaeee518794d9884693a4eb9db
 AUX mythbackend-0.18.2.rc 1128 RMD160 0297452b3d9fe09479c737d136a73171a35eb643 SHA1 df4fe1ca7750c3ed27c9f5bbeb28dcebb36f9b1d SHA256 be994a8b6690e830820e82316f4ccce5b7f84ce68213de75e3740818227f6f3c
@@ -16,13 +19,21 @@ EBUILD mythtv-0.21_p18116.ebuild 9070 RMD160 a7187be987d9b4063bbc382eaed2a54b2d9
 EBUILD mythtv-0.21_p18314.ebuild 9092 RMD160 5f738eef80a5c738665ba2e652c4e0b9d43a1434 SHA1 7a107bf3342799e2b1c2c06e9adb1c31067d6809 SHA256 5f6f1ad9f096748f934989a7cbd778886d30d049b1220997e27c9ba21eea92ec
 EBUILD mythtv-0.21_p18501.ebuild 9038 RMD160 9e04cdb90afc9da78a2da1858ceee0674e7f953c SHA1 fa5aab633dc664d1e348b3f60bc32870ac809b24 SHA256 b56f93a03bc0d8447e02d5481bdbc671941dd6aa4dfc8de342b0f51eeac7866e
 EBUILD mythtv-0.22_alpha17733.ebuild 8699 RMD160 b3e09a84d1f52310ca3a1a75254dc505db45846f SHA1 369a47fbe4e1f08e7f7067dd5cba79f183561902 SHA256 eb5dec08b1b94a6300b13442956a4d0f05f71816d72bc5571eff2b22707dfa83
-EBUILD mythtv-0.22_alpha18528.ebuild 8635 RMD160 8f0242c359c4aa381dc52d78e821afa11b626aa5 SHA1 2cc8971721510943e3f74fa41f39a1b681f823f8 SHA256 6e7db21957ed0fd5a9ee3bd864e72f50901d4715c061192eed459b364129505f
-MISC ChangeLog 50180 RMD160 8c2a16c7af0606fb0a3bea88fc84d475fbada9c5 SHA1 bb47f7604ba454a1ccd1b54c6ead49c66df7f809 SHA256 3bac5a3660a09e97ee893f5fe0628d20ff1c92fe9d6f251c5020f1b4bff39905
-MISC metadata.xml 4714 RMD160 c65d058e83e36342d6a49b63a6e9609e11242b66 SHA1 0de80f93ca1adfede5783d30a45953ec4cd27c9b SHA256 7501a841c218dd17bee56aeefcfc60194241b3a5468898850c5bedf5dafd28e5
+EBUILD mythtv-0.22_alpha18528.ebuild 8692 RMD160 4c126fe8d388f7e49bc581c553e4161da2bf3f54 SHA1 88b94f6a9e07ae1bfdf2d27680fb37c9e9144d90 SHA256 7578901445066bd6d78a0d239db658a29a9e2f237845d3542d5c68414239cf84
+EBUILD mythtv-0.22_alpha18535.ebuild 8669 RMD160 392830004f9bdfeca6d385a4d32d7258bfafea0f SHA1 73dd8d8ed9a4ec53c5d73a40ca661d4e50b3b8ff SHA256 ae8432682defa7253b9eb0af7adc2d1d0b9436df7e49bca035ab60fab5910705
+MISC ChangeLog 50536 RMD160 f7641a8c8406f26deae4702bf0300b8d7dffce2c SHA1 598d3ca9b8a0666af06f7bd37ca17fe1134f9a07 SHA256 48bfa50da8e3f533897ed37e95fbceb502f76bfa4b48693954c383e3b6c155a6
+MISC metadata.xml 4844 RMD160 0b620c4698e23467c7811be942b0bd9d24ee2208 SHA1 684ac9148eee29189fbb9a94f81802ad2cbd22dc SHA256 89dd2fa121bab4de5c58b62103fcbafc2468539f29c27fa93f81e2f411f96fa3
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjlRQkACgkQoeSe8B0zEfyI4QCfQSsO0fiaXjsvCHs7AF58maik
+0DkAoIsDNq7ioacHbjCZoCD9Zn7hD5oP
+=yiHN
+- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjk33MACgkQoeSe8B0zEfyM8QCeLz/L9CqCGcooJNLNsH8E9Uh8
-mD8AoIfj5VxwicKj4BlJOapSYWxHOg8V
-=Liez
+iEYEARECAAYFAkjlRUcACgkQoeSe8B0zEfykeACeO1SDrXdykA7XAtsBSLY6ZNL3
+M0AAn2FZIWKWbTRJ4BOryF6/X5x3oiVD
+=p/ok
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index 269a304bfc4b..002782cadbf6 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -77,6 +77,8 @@
 	<flag name="perl">Builds the perl bindings for MythTV. Allows you to write
 		scripts in Perl to control your MythTV setup or communicate with
 		it.</flag>
+	<flag name='tiff'>Add support for tiff loading and rendering which is only
+		used by <pkg>media-plugins/mythgallery</pkg></flag>
 	<flag name="xvmc">Instructs MythTV to use XvMC for it's video output. By
 		default, this will use the generic XvMC wrapper unless a specific video
 		card driver is enabled via their VIDEO_CARDS USE flags.</flag>
diff --git a/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild b/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild
index aa4a72e81286..a8f894a00e46 100644
--- a/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild
@@ -1,6 +1,6 @@
 # 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.22_alpha18528.ebuild,v 1.2 2008/10/02 14:49:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild,v 1.3 2008/10/02 22:02:35 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia"
 IUSE="alsa altivec autostart debug directv dvb dvd \
 fftw ieee1394 jack lcd lirc mmx opengl perl python \
-xvmc ${IUSE_VIDEO_CARDS}"
+tiff xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -23,7 +23,8 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
 	x11-libs/qt-core:4[qt3support]
-	x11-libs/qt-gui:4[qt3support,tiff]
+	tiff? ( x11-libs/qt-gui:4[qt3support,tiff] )
+	!tiff? ( x11-libs/qt-gui:4[qt3support] )
 	x11-libs/qt-sql:4[qt3support,mysql]
 	x11-libs/qt-opengl:4[qt3support]
 	x11-libs/qt-webkit:4
diff --git a/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild b/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild
new file mode 100644
index 000000000000..c366178c0f48
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild
@@ -0,0 +1,301 @@
+# 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.22_alpha18535.ebuild,v 1.1 2008/10/02 22:02:35 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 opengl perl python \
+tiff 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[qt3support]
+	tiff? ( x11-libs/qt-gui:4[qt3support,tiff] )
+	!tiff? ( x11-libs/qt-gui:4[qt3support] )
+	x11-libs/qt-sql:4[qt3support,mysql]
+	x11-libs/qt-opengl:4[qt3support]
+	x11-libs/qt-webkit: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 )
+	python? ( dev-python/mysql-python )
+	xvmc? ( x11-libs/libXvMC
+		app-admin/eselect-xvmc )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	x11-apps/xinit"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	die "Don't use me yet"
+
+	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 & & series cards."
+	fi
+
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	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 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"
+
+	#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}"
+	./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() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/MythTV
+
+	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
+}