From 32dca2ffb8f3538a60b1081ee66733fb8336f86f Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Mon, 18 Dec 2006 18:41:36 +0000 Subject: [PATCH] Convinced upstream to backport some more UPnP fixes Package-Manager: portage-2.1.2_rc3-r5 --- media-tv/mythtv/ChangeLog | 8 +- media-tv/mythtv/Manifest | 22 +- .../mythtv/files/digest-mythtv-0.20_p12288 | 6 + media-tv/mythtv/mythtv-0.20_p12288.ebuild | 262 ++++++++++++++++++ 4 files changed, 290 insertions(+), 8 deletions(-) create mode 100644 media-tv/mythtv/files/digest-mythtv-0.20_p12288 create mode 100644 media-tv/mythtv/mythtv-0.20_p12288.ebuild diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog index 417b8b9de74a..1126d4b6c49c 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.126 2006/12/18 03:05:33 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.127 2006/12/18 18:41:36 cardoe Exp $ + +*mythtv-0.20_p12288 (18 Dec 2006) + + 18 Dec 2006; Doug Goldstein + +mythtv-0.20_p12288.ebuild: + Convinced upstream to backport some more UPnP fixes *mythtv-0.20_p12172 (18 Dec 2006) diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index e3fae648b250..48ae4cc4ecc3 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -45,6 +45,7 @@ DIST mythtv-0.20_svn11281.patch.bz2 3209 RMD160 9fb4bbaab2d9f286eb01b6f9c5f5bd02 DIST mythtv-0.20_svn11444.patch.bz2 13532 RMD160 026000436cc842bc3d1c0e525926d403e3f2bcdf SHA1 90cdf24e31cb8159509a8fd0176fafb8e4dd2919 SHA256 794fcb3103603b38b9388450666f8942b32d6898b4ded5e095ed9fea41419dec DIST mythtv-0.20_svn11626.patch.bz2 17676 RMD160 f45126237079a88ebf6b94f4e9f3c5717b5ee5f1 SHA1 2ed7e6df75f1198238efa48548cbe2939b2fb0ee SHA256 9430fd112b16903c99d00ea29c165f854a83a2dd1c0af70fd4eb95d89b0b316c DIST mythtv-0.20_svn12172.patch.bz2 18386 RMD160 4a18d65364e473ba80c4e1907b6d5802e96eff40 SHA1 4f07d13ceeabc59c5b8ff18686d16aa926a61683 SHA256 797014ffb62ce74f4176cb41113235c136665206127c589d6179695e580eed30 +DIST mythtv-0.20_svn12288.patch.bz2 19089 RMD160 63e69f89024edc2141ecb01dd6a4bcd1b06d90f0 SHA1 c0f86c7a9e9f08a9dbe063bc48ee7eb44ed2f1a2 SHA256 ef5b9410e1770d043c2f47c71d10ea3272ca66723f70b93bbb5631a1236d0734 EBUILD mythtv-0.19_p10505.ebuild 7757 RMD160 aab3b55551c3fa3fab58aa5ae8dcabd5df083fd2 SHA1 de21c09b68a30fc69524e910391a7fcf66ba7e4c SHA256 e22ca5918787ff31c582c1714489680d9e2f9b438682a74cf7d629b7de04c35d MD5 3e9256211a63a2834ac024bb9d66d67a mythtv-0.19_p10505.ebuild 7757 RMD160 aab3b55551c3fa3fab58aa5ae8dcabd5df083fd2 mythtv-0.19_p10505.ebuild 7757 @@ -69,10 +70,14 @@ EBUILD mythtv-0.20_p12172.ebuild 7451 RMD160 b4d9407a2e37c97caf3af41ea6efe129148 MD5 d4552a778b5d0d796a14b4c9d9cc5db9 mythtv-0.20_p12172.ebuild 7451 RMD160 b4d9407a2e37c97caf3af41ea6efe1291480f2e4 mythtv-0.20_p12172.ebuild 7451 SHA256 f859426641a93b0a0e1dc123164763a37ad8b40ba455b31549a3c9c378e5bbab mythtv-0.20_p12172.ebuild 7451 -MISC ChangeLog 22822 RMD160 50f3256c749abba49f1986c309a4e8cf356a31c9 SHA1 65cb3d38839d3ad7fed239b48cb489265fc90f3f SHA256 b4ce510ec7995badaa797bcb03340a9b2df94a5667d019ab412fc32fd842ccf9 -MD5 027db3034d20a317fff4fd34adf166f7 ChangeLog 22822 -RMD160 50f3256c749abba49f1986c309a4e8cf356a31c9 ChangeLog 22822 -SHA256 b4ce510ec7995badaa797bcb03340a9b2df94a5667d019ab412fc32fd842ccf9 ChangeLog 22822 +EBUILD mythtv-0.20_p12288.ebuild 7451 RMD160 2eccab0ae1038c1672b4e8ac67abb6ecdd1f6da7 SHA1 f7b8d31fa2ece52b7054f1d2d3d5f3c6f101c728 SHA256 a4dcdd60106a1dbb372dcf0a6717080be2bf7eb59a69cb239bb5ac8a9efc52a2 +MD5 ab04e5238baa574d6e2c5a27662a4d19 mythtv-0.20_p12288.ebuild 7451 +RMD160 2eccab0ae1038c1672b4e8ac67abb6ecdd1f6da7 mythtv-0.20_p12288.ebuild 7451 +SHA256 a4dcdd60106a1dbb372dcf0a6717080be2bf7eb59a69cb239bb5ac8a9efc52a2 mythtv-0.20_p12288.ebuild 7451 +MISC ChangeLog 22992 RMD160 2ebdddd2707dfee032fe42d02746b7a869d4cf13 SHA1 8f8aefd39519f1b09291e9d348f557ae633591bf SHA256 aa12b1dcd80fc7a700739a7719a869e4dc214e88eecad3fd0977121d0c56341f +MD5 b0fad5c74556fe059808bd913595fbd1 ChangeLog 22992 +RMD160 2ebdddd2707dfee032fe42d02746b7a869d4cf13 ChangeLog 22992 +SHA256 aa12b1dcd80fc7a700739a7719a869e4dc214e88eecad3fd0977121d0c56341f ChangeLog 22992 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222 @@ -95,10 +100,13 @@ SHA256 8c15d297364cbd651b2d1fe4f29acd85c757edad99d865f4523ccace7ec35d9d files/di MD5 1042e0c3c58018e8e9d7a9f7fbb7f523 files/digest-mythtv-0.20_p12172 512 RMD160 ed82ea4ae3e7b4740c9665d5716dfddf37f7fcef files/digest-mythtv-0.20_p12172 512 SHA256 40220c8c1b5fb4be6dbc3c2be8128675d1cb022b74cdf3543bb16e9a47a93f1b files/digest-mythtv-0.20_p12172 512 +MD5 3e7c038811b219d746eeb14bb86d6df4 files/digest-mythtv-0.20_p12288 512 +RMD160 e7fe4ab478b99cd8e8e21b602b84f5763cc5ff39 files/digest-mythtv-0.20_p12288 512 +SHA256 5090a69bb70871132511c61a19f4b76cc0e3f62fe21a26f0d5c884fe4e82516e files/digest-mythtv-0.20_p12288 512 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFhgW0oeSe8B0zEfwRAjK9AJ45kmO7utQVpDKA6d5LRYyqodg2KQCeMmSF -L5ezLD0bivnpX0SpdKKHUrU= -=3EgG +iD8DBQFFhuD5oeSe8B0zEfwRAtBqAJ9y4dkRidCsxSku0VzaKoJBjn2S7ACdFnoO +0qhZRxbpx62Y9qifGI27rjk= +=mTaI -----END PGP SIGNATURE----- diff --git a/media-tv/mythtv/files/digest-mythtv-0.20_p12288 b/media-tv/mythtv/files/digest-mythtv-0.20_p12288 new file mode 100644 index 000000000000..064fdfefe221 --- /dev/null +++ b/media-tv/mythtv/files/digest-mythtv-0.20_p12288 @@ -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 51c43390b6b2acecc4b8f9d40163f2d5 mythtv-0.20_svn12288.patch.bz2 19089 +RMD160 63e69f89024edc2141ecb01dd6a4bcd1b06d90f0 mythtv-0.20_svn12288.patch.bz2 19089 +SHA256 ef5b9410e1770d043c2f47c71d10ea3272ca66723f70b93bbb5631a1236d0734 mythtv-0.20_svn12288.patch.bz2 19089 diff --git a/media-tv/mythtv/mythtv-0.20_p12288.ebuild b/media-tv/mythtv/mythtv-0.20_p12288.ebuild new file mode 100644 index 000000000000..5d5d81d9bede --- /dev/null +++ b/media-tv/mythtv/mythtv-0.20_p12288.ebuild @@ -0,0 +1,262 @@ +# 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_p12288.ebuild,v 1.1 2006/12/18 18:41:36 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) + virtual/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 +} + +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 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/* + + insinto /usr/share/mythtv/configfiles + doins configfiles/* + + if ! use backendonly; then + dobin "${FILESDIR}"/runmythfe + + 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 +} + +pkg_preinst() { + enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user" + usermod -a -G ${MYTHTV_GROUPS} mythtv +} + +pkg_postinst() { + if ! use backendonly; then + echo + elog "Want mythfrontend to start automatically?" + elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html" + fi + echo + elog "To always have MythBackend running and available run the following:" + elog "rc-update add mythbackend default" + echo + ewarn "Your recordings folder must be owned by the user 'mythtv' now" + ewarn "chown -R mythtv /path/to/store" +} + -- 2.26.2