From: Doug Goldstein Date: Tue, 26 Dec 2006 20:52:25 +0000 (+0000) Subject: Fixes for UPnP from upstream X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6e9709166cdf218e4c438b24cd7ca68c3402255;p=gentoo.git Fixes for UPnP from upstream Package-Manager: portage-2.1.2_rc4 --- diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog index 33e5f03ed541..323abc10b73c 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.131 2006/12/24 08:19:52 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.132 2006/12/26 20:52:25 cardoe Exp $ + +*mythtv-0.20_p12325 (26 Dec 2006) + + 26 Dec 2006; Doug Goldstein + +mythtv-0.20_p12325.ebuild: + Fixes for UPnP from upstream 24 Dec 2006; Doug Goldstein -files/mythtv-0.20-vsync.patch, -mythtv-0.20_p11244.ebuild, diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index 6e7c009060fe..646acc3f0fea 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -39,6 +39,7 @@ DIST mythtv-0.20.tar.bz2 12380677 RMD160 d9ef5221a1d821f2f210e7ebb0c32a88625fb52 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 +DIST mythtv-0.20_svn12325.patch.bz2 19111 RMD160 c1aa15abc2ac248948c6bcf61f23444912119fe0 SHA1 a9e16338078310826aa23c279c04d6fd1f6c8f37 SHA256 5c556ab127a80071935a27b25a255f943340f95dbf1c92584e952f132f775072 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 @@ -59,10 +60,14 @@ EBUILD mythtv-0.20_p12288.ebuild 7516 RMD160 7be9eb9944346bcc0e80ef851101e96a13d MD5 1deb9bd82a530763a9ce6a38558393b6 mythtv-0.20_p12288.ebuild 7516 RMD160 7be9eb9944346bcc0e80ef851101e96a13d3ea36 mythtv-0.20_p12288.ebuild 7516 SHA256 e5874ca0f307e80e3e1e07893d1203789f2fd445101c01ee3296ec127a82ca47 mythtv-0.20_p12288.ebuild 7516 -MISC ChangeLog 23751 RMD160 a42bd7828f79a232204b4b5d7e0023cb16e6d150 SHA1 b88d3bbe068f212fae46e83a637749af91554e27 SHA256 24a2b0858e76b0e69f64e8de4edc56350d5ebbff22866616ffca752cfcd1f3c3 -MD5 c508afbe49fdced6129c66c386dc8318 ChangeLog 23751 -RMD160 a42bd7828f79a232204b4b5d7e0023cb16e6d150 ChangeLog 23751 -SHA256 24a2b0858e76b0e69f64e8de4edc56350d5ebbff22866616ffca752cfcd1f3c3 ChangeLog 23751 +EBUILD mythtv-0.20_p12325.ebuild 8110 RMD160 492e6991ce6bb82a874a5ea05a74cae037a0ee94 SHA1 073051b7b77c154fb5a6c19c393eb575ad6784a7 SHA256 afa2aa07f9a14d09ed188630c23eb8402768210115d8f7bc47f2a5e3c83536e6 +MD5 bb294c6f510bb2e4a8742a58e64f8ea0 mythtv-0.20_p12325.ebuild 8110 +RMD160 492e6991ce6bb82a874a5ea05a74cae037a0ee94 mythtv-0.20_p12325.ebuild 8110 +SHA256 afa2aa07f9a14d09ed188630c23eb8402768210115d8f7bc47f2a5e3c83536e6 mythtv-0.20_p12325.ebuild 8110 +MISC ChangeLog 23898 RMD160 87c431b6b23d0276811b44c39b5b4c706270ca37 SHA1 e7db8f34b32d299402908fb75ade9681a3c08756 SHA256 6509bbce79b49481e9fdbad7995d12c4b346a6dbfd1029c84caadf43cda0eb45 +MD5 c958ed58444eef785ea31109bb691ea2 ChangeLog 23898 +RMD160 87c431b6b23d0276811b44c39b5b4c706270ca37 ChangeLog 23898 +SHA256 6509bbce79b49481e9fdbad7995d12c4b346a6dbfd1029c84caadf43cda0eb45 ChangeLog 23898 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222 @@ -82,10 +87,13 @@ SHA256 5090a69bb70871132511c61a19f4b76cc0e3f62fe21a26f0d5c884fe4e82516e files/di MD5 3e7c038811b219d746eeb14bb86d6df4 files/digest-mythtv-0.20_p12288-r1 512 RMD160 e7fe4ab478b99cd8e8e21b602b84f5763cc5ff39 files/digest-mythtv-0.20_p12288-r1 512 SHA256 5090a69bb70871132511c61a19f4b76cc0e3f62fe21a26f0d5c884fe4e82516e files/digest-mythtv-0.20_p12288-r1 512 +MD5 0688f909f96d4fdff09c709e5cfca9c7 files/digest-mythtv-0.20_p12325 512 +RMD160 88dc620d00e39ba586cee8ed566fcccdca11555d files/digest-mythtv-0.20_p12325 512 +SHA256 c1544832f423ac8d1c565bc25abdc51722c1031fe8f76f6085150cfa0cd21ddb files/digest-mythtv-0.20_p12325 512 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFjjgmoeSe8B0zEfwRAtYmAKCH2WgRv7PsR6QM7CgdGMkfUB+DegCdEv/6 -SIkqgSsF8G4tGvbUi9ZOvPk= -=IY/U +iD8DBQFFkYuKoeSe8B0zEfwRAtnCAJ9MLbkvlUNv4RW5DxhwhVyWoE22lQCfSmj5 +fBZSkKw8SCWPlhta+JzjOao= +=UkQ5 -----END PGP SIGNATURE----- diff --git a/media-tv/mythtv/files/digest-mythtv-0.20_p12325 b/media-tv/mythtv/files/digest-mythtv-0.20_p12325 new file mode 100644 index 000000000000..3c6e89a790ab --- /dev/null +++ b/media-tv/mythtv/files/digest-mythtv-0.20_p12325 @@ -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 9ca9f306b75a4cdacd4d01702641aa64 mythtv-0.20_svn12325.patch.bz2 19111 +RMD160 c1aa15abc2ac248948c6bcf61f23444912119fe0 mythtv-0.20_svn12325.patch.bz2 19111 +SHA256 5c556ab127a80071935a27b25a255f943340f95dbf1c92584e952f132f775072 mythtv-0.20_svn12325.patch.bz2 19111 diff --git a/media-tv/mythtv/mythtv-0.20_p12325.ebuild b/media-tv/mythtv/mythtv-0.20_p12325.ebuild new file mode 100644 index 000000000000..7795d49e8910 --- /dev/null +++ b/media-tv/mythtv/mythtv-0.20_p12325.ebuild @@ -0,0 +1,289 @@ +# 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_p12325.ebuild,v 1.1 2006/12/26 20:52:25 cardoe Exp $ + +inherit mythtv flag-o-matic multilib eutils debug qt3 + +DESCRIPTION="Homebrew PVR project" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via" + +IUSE="alsa altivec autostart 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 ) + autostart? ( net-dialup/mingetty + x11-wm/evilwm + x11-apps/xset )" + +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 + + if use autostart && use backendonly; then + echo + eerror "You can't have USE=autostart while having USE=backendonly." + eerror "USE=autostart is for mythfrontend" + 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 + + 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 + fi +} + +pkg_preinst() { + enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user" + usermod -a -G ${MYTHTV_GROUPS} mythtv + + export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/" +} + +pkg_postinst() { + if ! use backendonly; then + 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" + fi + + if ! use frontendonly; then + 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" + fi + + if use autostart; then + echo + 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 + +} +