diff options
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/mythtv/ChangeLog | 9 | ||||
| -rw-r--r-- | media-tv/mythtv/Manifest | 17 | ||||
| -rw-r--r-- | media-tv/mythtv/files/digest-mythtv-0.18.2_pre7882 | 1 | ||||
| -rw-r--r-- | media-tv/mythtv/files/digest-mythtv-0.19_pre8554 | 1 | ||||
| -rw-r--r-- | media-tv/mythtv/files/mythtv-0.19_pre8554-xrandr.patch | 25 | ||||
| -rw-r--r-- | media-tv/mythtv/mythtv-0.19_pre8554.ebuild (renamed from media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild) | 85 |
6 files changed, 99 insertions, 39 deletions
diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog index 153042221bf5..93837d3d2bda 100644 --- a/media-tv/mythtv/ChangeLog +++ b/media-tv/mythtv/ChangeLog @@ -1,6 +1,13 @@ # 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.79 2006/01/09 13:19:38 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.80 2006/01/11 04:01:47 cardoe Exp $ + +*mythtv-0.19_pre8554 (11 Jan 2006) + + 11 Jan 2006; Doug Goldstein <cardoe@gentoo.org> + +files/mythtv-0.19_pre8554-xrandr.patch, -mythtv-0.18.2_pre7882.ebuild, + +mythtv-0.19_pre8554.ebuild: + Provide 0.19 snapshot. This will fix a bunch of people's problems 09 Jan 2006; Caleb Tennis <caleb@gentoo.org> mythtv-0.18.1-r1.ebuild, mythtv-0.18.1-r2.ebuild, mythtv-0.18.2_pre7882.ebuild: diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index ee6ca6119c29..fc30544fb1f1 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1,9 +1,12 @@ -MD5 32dd8378789ea8f1e47ad43a979133ad ChangeLog 14711 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 3baf3cf772dcd0205678c9ecfbfb1259 ChangeLog 14972 MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931 MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606 MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67 MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67 -MD5 c8fa0250a9ef05fee9c04fbd2aa6752f files/digest-mythtv-0.18.2_pre7882 76 +MD5 2edeadd6127a8651b20a76f6f08df86d files/digest-mythtv-0.19_pre8554 74 MD5 ce6902dd0c8832390052b427a14acc42 files/mythbackend-0.18.2.conf 431 MD5 5177341c71c9899006f0df39b3602db1 files/mythbackend-0.18.2.rc 954 MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73 @@ -11,8 +14,16 @@ MD5 a0dc63e4be8c214490e4ed4f13ed9544 files/mythtv-0.18.1-cc-on-mute.patch 679 MD5 58ad62106705e1d4641f95ea96a37748 files/mythtv-0.18.1-cputypes-configure.patch 994 MD5 340e376a796fcc134e37222f01d705b3 files/mythtv-0.18.1-opengl-fix.patch 304 MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631 +MD5 96e1efbc2a12349e4c5ada14422868af files/mythtv-0.19_pre8554-xrandr.patch 744 MD5 0d20a49cff965a0f3ab35cb0600b65b4 files/runmythfe 104 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222 MD5 f2c7e6f87a9c718acdd942b22140e2a9 mythtv-0.18.1-r1.ebuild 5109 MD5 cac72423d3f6c98d2ef628c3e83c4ff2 mythtv-0.18.1-r2.ebuild 5488 -MD5 fb29a88443b913ea42d515a7caf16731 mythtv-0.18.2_pre7882.ebuild 5687 +MD5 9a1578bd13ca8cc9002e71a7f1117f2a mythtv-0.19_pre8554.ebuild 6328 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDxIOABtvusYtCZMsRAgtTAJ94Z4xl/+MQIo0gfz4kEkJV1iQUAgCeL1A2 +oqy+Ur9/RP+ut8w7thBk75E= +=kBPG +-----END PGP SIGNATURE----- diff --git a/media-tv/mythtv/files/digest-mythtv-0.18.2_pre7882 b/media-tv/mythtv/files/digest-mythtv-0.18.2_pre7882 deleted file mode 100644 index 1a6260ca46d3..000000000000 --- a/media-tv/mythtv/files/digest-mythtv-0.18.2_pre7882 +++ /dev/null @@ -1 +0,0 @@ -MD5 eb570ff72128f475df2ed62747d6640b mythtv-0.18.2_pre7882.tar.bz2 17170015 diff --git a/media-tv/mythtv/files/digest-mythtv-0.19_pre8554 b/media-tv/mythtv/files/digest-mythtv-0.19_pre8554 new file mode 100644 index 000000000000..778bcd677dba --- /dev/null +++ b/media-tv/mythtv/files/digest-mythtv-0.19_pre8554 @@ -0,0 +1 @@ +MD5 0ca58b04f93c072b070dae6ccc598138 mythtv-0.19_pre8554.tar.bz2 19216717 diff --git a/media-tv/mythtv/files/mythtv-0.19_pre8554-xrandr.patch b/media-tv/mythtv/files/mythtv-0.19_pre8554-xrandr.patch new file mode 100644 index 000000000000..7e3dd087db6c --- /dev/null +++ b/media-tv/mythtv/files/mythtv-0.19_pre8554-xrandr.patch @@ -0,0 +1,25 @@ +Index: configure +=================================================================== +--- configure (revision 8554) ++++ configure (working copy) +@@ -2844,6 +2844,7 @@ + + if test x"$xrandr" = x"yes" ; then + CCONFIG="$CCONFIG using_xrandr" ++ echo "CONFIG_XRANDR_LIBS=-lXrandr -lX11" >> $MYTH_CONFIG_MAK + fi + + if test x"$xvmc" = x"yes" ; then +Index: settings.pro +=================================================================== +--- settings.pro (revision 8554) ++++ settings.pro (working copy) +@@ -82,6 +82,7 @@ + + EXTRA_LIBS += $$LOCAL_LIBDIR_OGL + EXTRA_LIBS += $$LOCAL_LIBDIR_X11 ++EXTRA_LIBS += $$CONFIG_XRANDR_LIBS + EXTRA_LIBS += $$CONFIG_XV_LIBS + EXTRA_LIBS += $$CONFIG_XVMC_LIBS + EXTRA_LIBS += $$CONFIG_OPENGL_VSYNC_LIBS + diff --git a/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild b/media-tv/mythtv/mythtv-0.19_pre8554.ebuild index 261e5c5a6aea..38d09dc70be7 100644 --- a/media-tv/mythtv/mythtv-0.18.2_pre7882.ebuild +++ b/media-tv/mythtv/mythtv-0.19_pre8554.ebuild @@ -1,8 +1,8 @@ # 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.18.2_pre7882.ebuild,v 1.2 2006/01/09 13:19:38 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19_pre8554.ebuild,v 1.1 2006/01/11 04:01:47 cardoe Exp $ -inherit eutils qt3 flag-o-matic debug +inherit flag-o-matic eutils debug qt3 DESCRIPTION="Homebrew PVR project" HOMEPAGE="http://www.mythtv.org/" @@ -11,14 +11,17 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alsa altivec arts debug dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia vorbis opengl oss unichrome" +IUSE="alsa altivec arts debug dbox2 dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome" -DEPEND=">=media-libs/freetype-2.0 +RDEPEND=">=media-libs/freetype-2.0 >=media-sound/lame-3.93.1 - || ( ( x11-libs/libX11 + || ( ( x11-libs/libX11 + x11-libs/libXext x11-libs/libXinerama x11-libs/libXv - x11-libs/libXrandr ) + x11-libs/libXrandr + x11-libs/libXxf86vm + ) virtual/x11 ) $(qt_min_version 3.3) dev-db/mysql @@ -29,7 +32,7 @@ DEPEND=">=media-libs/freetype-2.0 lcd? ( app-misc/lcdproc ) lirc? ( app-misc/lirc ) nvidia? ( media-video/nvidia-glx ) - vorbis? ( media-libs/libvorbis ) + oggvorbis? ( media-libs/libvorbis ) opengl? ( virtual/opengl ) ieee1394? ( >=sys-libs/libraw1394-1.2.0 sys-libs/libavc1394 @@ -38,9 +41,10 @@ DEPEND=">=media-libs/freetype-2.0 !x11-base/xfree !<x11-base/xorg-x11-6.8" -S=${WORKDIR}/${PN} +DEPEND="${RDEPEND} + || ( x11-apps/xinit virtual/x11 )" -MYTHTV_GROUPS="video,audio" +S=${WORKDIR}/mythtv pkg_setup() { @@ -50,7 +54,7 @@ pkg_setup() { die "Qt needs MySQL support" fi - if ! best_version x11-libs/libXv && ! built_with_use x11-base/xorg-x11 xv; then + if ! has_version x11-libs/libXv && ! built_with_use x11-base/xorg-x11 xv; then eerror "xorg-x11 is missing XV support. Please add" eerror "'xv' to your USE flags, and re-emerge xorg-x11." die "xorg-x11 needs XV support" @@ -75,6 +79,8 @@ src_unpack() { unpack ${A} cd ${S} + epatch "${FILESDIR}"/${P}-xrandr.patch + if [ $(get_libdir) != "lib" ] ; then sed -i -e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \ -e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \ @@ -82,27 +88,33 @@ src_unpack() { sed -i -e "s:/lib/mythtv/:/$(get_libdir)/mythtv/:" \ ${S}/libs/libmyth/mythcontext.cpp || die fi + +# # Fix bugs 40964 and 42943. +# filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer +# is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer" } src_compile() { use unichrome && use nvidia && die "You can not have USE="unichrome" and USE="nvidia" at the same time. Must disable one or the other." - local myconf="$(use_enable altivec) - $(use_enable oss audio-oss) - $(use_enable alsa audio-alsa) - $(use_enable arts audio-arts) - $(use_enable jack audio-jack) + local myconf="--prefix=/usr --mandir=/usr/share/man" + use oss || myconf="${myconf} --disable-audio-oss" + use alsa || myconf="${myconf} --disable-audio-alsa" + use arts || myconf="${myconf} --disable-audio-arts" + use jack || myconf="${myconf} --disable-audio-jack" + use altivec || myconf="${myconf} --disable-altivec" + myconf="${myconf} $(use_enable lirc) $(use_enable joystick joystick-menu) $(use_enable unichrome xvmc-vld) + $(use_enable dbox2) $(use_enable dvb) $(use_enable dvb dvb-eit) --dvb-path=/usr/include $(use_enable opengl opengl-vsync) - $(use_enable vorbis vorbis) $(use_enable nvidia xvmc) $(use_enable ieee1394 firewire) - --enable-xv --enable-xrandr + --enable-xv --disable-directfb --enable-x11 --enable-proc-opt" @@ -125,7 +137,7 @@ src_compile() { MCPU=$(get-flag "mcpu") strip-flags filter-flags "-march=*" "-mtune=*" "-mcpu=*" - filter-flags "-O" "-O?" "-Os" + filter-flags "-O" "-O?" if [[ -n "${MARCH}" ]]; then myconf="${myconf} --arch=${MARCH}" @@ -137,22 +149,22 @@ src_compile() { myconf="${myconf} --cpu=${MCPU}" fi - myconf="${myconf} --extra-cflags=${CFLAGS}" - +# 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 - cd ${S} - sed -e "s:CCONFIG linux backend:CCONFIG linux:" \ - -i 'configure' || die "Removal of mythbackend failed" - fi +# if use frontendonly; then +# ##Backend Removal +# cd ${S} +# sed -e "s:CCONFIG linux backend:CCONFIG linux:" \ +# -i 'configure' || die "Removal of mythbackend failed" +# fi # let MythTV come up with our CFLAGS. Upstream will support this CFLAGS="" CXXFLAGS="" - econf ${myconf} || die "configure died" + 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" @@ -162,22 +174,24 @@ src_compile() { src_install() { einstall INSTALL_ROOT="${D}" || die "install failed" - dodoc AUTHORS COPYING FAQ UPGRADING README + for doc in AUTHORS COPYING 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 + doexe "${FILESDIR}/mythfilldatabase.cron" - newinitd "${FILESDIR}"/mythbackend-0.18.2.rc mythbackend - newconfd "${FILESDIR}"/mythbackend-0.18.2.conf mythbackend + newinitd ${FILESDIR}/mythbackend-0.18.2.rc mythbackend + newconfd ${FILESDIR}/mythbackend-0.18.2.conf mythbackend fi - dobin "${FILESDIR}"/runmythfe + dobin ${FILESDIR}/runmythfe - ewarn "Want MythFrontend to always run? Add the following to your" + ewarn "Want MythFrontend to always? Add the following to your" ewarn "myth user. i.e. My user is mythtv" echo "crontab -e -u mythtv" echo "* * * * * /usr/bin/runmythfe &" @@ -186,6 +200,8 @@ src_install() { 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 } @@ -197,7 +213,7 @@ pkg_preinst() { pkg_postinst() { einfo "Want MythFrontend to alway run? Run the following:" - echo "crontab -e -u mythtv" + echo " #crontab -e -u mythtv" einfo "And add the following:" echo "* * * * * /usr/bin/runmythfe &" echo @@ -205,3 +221,4 @@ pkg_postinst() { einfo "To always have MythBackend running and available run the following:" echo "rc-update add mythbackend default" } + |