diff options
author | Robert Buchholz <rbu@gentoo.org> | 2008-10-25 15:39:53 +0000 |
---|---|---|
committer | Robert Buchholz <rbu@gentoo.org> | 2008-10-25 15:39:53 +0000 |
commit | 74e72455f565b688d6eeab51ca51306aff5a1e08 (patch) | |
tree | 002ce264ebfae5ff8144ebc86e509f902330b278 /media-tv | |
parent | Stable on ppc wrt bug 242726 (diff) | |
download | historical-74e72455f565b688d6eeab51ca51306aff5a1e08.tar.gz historical-74e72455f565b688d6eeab51ca51306aff5a1e08.tar.bz2 historical-74e72455f565b688d6eeab51ca51306aff5a1e08.zip |
Version bump (bug #217542), a lot of upstream changes, cleanup old stuff.
Downstream changes:
* USE flag restructuring, add xine use flag (bug #226181 by alpiturchi)
* Change freevoboot script so it works with slim (patch by Kai Dietrich)
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.2 x86_64
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/freevo/ChangeLog | 13 | ||||
-rw-r--r-- | media-tv/freevo/Manifest | 15 | ||||
-rw-r--r-- | media-tv/freevo/files/freevo-1.8.2-mplayerargs.patch | 99 | ||||
-rw-r--r-- | media-tv/freevo/files/freevo-1.8.2.boot | 57 | ||||
-rw-r--r-- | media-tv/freevo/files/freevo.rc6 | 74 | ||||
-rw-r--r-- | media-tv/freevo/freevo-1.5.4.ebuild | 103 | ||||
-rw-r--r-- | media-tv/freevo/freevo-1.7.3.ebuild | 191 | ||||
-rw-r--r-- | media-tv/freevo/freevo-1.8.2.ebuild (renamed from media-tv/freevo/freevo-1.7.4.ebuild) | 95 | ||||
-rw-r--r-- | media-tv/freevo/metadata.xml | 3 |
9 files changed, 235 insertions, 415 deletions
diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog index ffec6baf9b67..d60a180151ee 100644 --- a/media-tv/freevo/ChangeLog +++ b/media-tv/freevo/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-tv/freevo # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.59 2008/05/01 09:27:24 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.60 2008/10/25 15:39:53 rbu Exp $ + +*freevo-1.8.2 (25 Oct 2008) + + 25 Oct 2008; Robert Buchholz <rbu@gentoo.org> + +files/freevo-1.8.2-mplayerargs.patch, +files/freevo-1.8.2.boot, + -files/freevo.rc6, metadata.xml, -freevo-1.5.4.ebuild, + -freevo-1.7.3.ebuild, -freevo-1.7.4.ebuild, +freevo-1.8.2.ebuild: + Version bump (bug #217542), a lot of upstream changes, cleanup old stuff. + Downstream changes: + * USE flag restructuring, add xine use flag (bug #226181 by alpiturchi) + * Change freevoboot script so it works with slim (patch by Kai Dietrich) 01 May 2008; Tobias Scherbaum <dertobi123@gentoo.org> freevo-1.7.6.1.ebuild: diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest index b29d0d60ce35..12ce935531be 100644 --- a/media-tv/freevo/Manifest +++ b/media-tv/freevo/Manifest @@ -1,17 +1,14 @@ +AUX freevo-1.8.2-mplayerargs.patch 3173 RMD160 9012cde6ba6f4939255c36959e55d4f74f3ca315 SHA1 977e7efcbccaa9583a436b6e919f090abdc440a0 SHA256 90911180f74e6d0b61563e0f439720119461c80f25581f153083276ea1b3d647 +AUX freevo-1.8.2.boot 1632 RMD160 1ac38228250957180886a14f842f7154734e6b6b SHA1 fc4dbd9ed2d7fa219e12396215d74ee8130fa999 SHA256 36d047e29c8707d73c7e63538ee0ea2b77f64045954f73e0838f5ef7532982bc AUX freevo.boot 1553 RMD160 2c2174de08b850a0da21ee07752abd3b9c2fb463 SHA1 a02253e749f699fc9c5aed3a8bdc2d049cdb57f6 SHA256 754c16099054887a178372759aac0bab7104cb6dd0a829f6f534c6523e31002d AUX freevo.conf 1265 RMD160 3a64dbd4f6978ff77780c2cfb663e4937e0f84e3 SHA1 c4251e861eb933203141c8a1056653b18271551a SHA256 c74b609e3b1177cbbbd3ca507e65b5392eed18fcd488e327c63478664fbd6143 AUX freevo.desktop 126 RMD160 bab4ae937c10d2a1d895bfadefa80d999a979692 SHA1 e95ffdb2605fd9679a304161bb0f39f3a339b8fc SHA256 9553d646d154710af8d22b300c5a792433fad47efcd75224f416c46cd45e03e4 -AUX freevo.rc6 1709 RMD160 490c9e87bf32c6becdba09c91d8370906df9c873 SHA1 ea3282141b788d09b8cc4bf06e88a72cb4771dad SHA256 5c660c29e212d1828b8596047c962622627c7733bee9faf77d829eb502b28341 AUX xbox-lircrc 1690 RMD160 8472024be1e467c69346ce0ea87033d76f389a2e SHA1 4856c57582e83514f4dccd3489a7076a6b2a4aa9 SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187098ae1dd1070 -DIST freevo-1.5.4.tar.gz 4425484 RMD160 a5538af486ce6926f57f40abd90a7f655137f225 SHA1 dc8611e6af2bb09bfebc56b02c9784e305160a2f SHA256 d9a7c9455a94c281acb8c5e3f0fc68e4289af7a557af413db2244a254dd48090 DIST freevo-1.7.2.tar.gz 16225723 RMD160 e3d793eb55c8f14291a8c3d843b76181521d9b8f SHA1 8a7662ed7a9748b2b98ac4d691d209906b114bb6 SHA256 305a11be94cc354bc98ae56afefd7155df6fc533a2439d8daa05efe05c62a6aa -DIST freevo-1.7.3.tar.gz 16314410 RMD160 113073026634006531083844b4c0bc238b8dcaef SHA1 747604065bf28870217088b52fa017801548e98f SHA256 c6810e99b39e776e77855c3a5e0a3aa68e6d71e03c3e38ad2f59cd5a761bd5f7 -DIST freevo-1.7.4.tar.gz 20540153 RMD160 e5e2ce8fa9ac5b19bbfee01c446aa5eccd60f0b8 SHA1 73624a565c8c754c6ec14a5530c34f288b4c2a55 SHA256 5d377f4cb6ad29bc2b4fc8fe9501d055e9cd1b6b068fcf1d2928481bcba5b752 DIST freevo-1.7.6.1.tar.gz 20856412 RMD160 a2151d64ee0a75c405a85d89ba1193c4ddaf3fe5 SHA1 b1867392796b7f8ce1caf980e9f2052290bb44e5 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e -EBUILD freevo-1.5.4.ebuild 3126 RMD160 ec4707df57ed808f2886af1299fbe3f1260db056 SHA1 5a25a2f77965d02667bf742d3a3921211732b4e6 SHA256 2d96771c972d171811aed9b45ac419b4b9d1d58b67fc6cd4cc8dd7b18b431c7b +DIST freevo-1.8.2.tar.gz 26573021 RMD160 4a40c660bd4b58f4aa9ddcaa8deb99739c1d1421 SHA1 c08c87a9a80b3f139c1e67cd9a7ae08c92b605e8 SHA256 f8cc77fe66e8150b773ba2fab198cef053ba3e8af94820d12b8c7b3d556780ff EBUILD freevo-1.7.2.ebuild 6533 RMD160 ffa6467e0823fae9c1c6de41444c0948c3f56851 SHA1 367252968c6a9b1b38ad686798d9aa11c31d0de9 SHA256 e4a9371d08e4a6cd40e8a478b119747b1dc87f9da19ee4df3acdbbe901c21cc0 -EBUILD freevo-1.7.3.ebuild 6536 RMD160 b3654c0ac04ac458f91efc3dc3d52ed82b04ce8b SHA1 9b2640d84b4a2f9ddfdc6f28b0c85a22cce71096 SHA256 2ac745d468cfe0602b8220d6012f9537a418d9a7d39d551cfbf0c27cc24e6be0 -EBUILD freevo-1.7.4.ebuild 6505 RMD160 080936015e3357d54efb7f713958c53d8f72c5f8 SHA1 41ea3c764d7b9994a1060a703c14d1595902cecd SHA256 8bbaa72dbe5740039fed2f3de7636db99ad1bddfa1c62a3392f86b0b77297ebf EBUILD freevo-1.7.6.1.ebuild 6506 RMD160 3754c0b76b2c9614915e3534f65fa580dedd6fd8 SHA1 94d8ffc2492f6a4109117cf8cb73a2f8a5311050 SHA256 ef5d4908a74c599a92a2320bd9ad828f211f154c42547f6f13c8ce5a66b5118e -MISC ChangeLog 9830 RMD160 9960c13780cec6808dd779d4314e24c96619667a SHA1 ef713f93f37aea91d9694287e4bcefaf8df91597 SHA256 fe92ebfe5e7214a7013ba36c4c0d76f70b10f7ad3d35205246f2e333fcfba0ee -MISC metadata.xml 1122 RMD160 1ababa53034ab8827fc5aabfbadb65d45ac73ef5 SHA1 a281241c9a94813e08f8ecabe9db2667917ae2c5 SHA256 e50036228f4e41d10737d13e20bf734f9a444b8b697e8a64a892bdc8105f535e +EBUILD freevo-1.8.2.ebuild 7039 RMD160 6431bbbdcacde443e2742b9fa3f3d29c67035d4a SHA1 e0e88b53c7dab0b07b75e4758f8320a5e4de0318 SHA256 efb9a1276d98e45d9bd31355b787d169ff4e123c4ddccf178528677a8c809b09 +MISC ChangeLog 10342 RMD160 fa9ea7c8cfe34dfc70c10cefd70aec6063423eb4 SHA1 afb5372ba5821fdb782f7cd86490c5612e146d0a SHA256 11f9d75dd313c033b6cd8742eacd0f0fbbbbff44d9411d5ee4f494835c97f62b +MISC metadata.xml 1337 RMD160 0ef28da2292c0a670b447068723d6f7b0ba94040 SHA1 c55ebaca121cb0d6ca4ac21433934d5e603aaefb SHA256 a0689efacf368e999860198cbdbda67578885dc2cac4cc1747fdf074265f92ae diff --git a/media-tv/freevo/files/freevo-1.8.2-mplayerargs.patch b/media-tv/freevo/files/freevo-1.8.2-mplayerargs.patch new file mode 100644 index 000000000000..33b82c2677eb --- /dev/null +++ b/media-tv/freevo/files/freevo-1.8.2-mplayerargs.patch @@ -0,0 +1,99 @@ +------------------------------------------------------------------------ +r10971 | duncan | 2008-08-27 20:45:30 +0200 (Wed, 27 Aug 2008) | 2 lines + +Fixed a bug where remove didn't do what was expected; need to use filter instead + +------------------------------------------------------------------------ +Index: freevo/src/audio/plugins/mplayervis2.py +=================================================================== +--- freevo/src/audio/plugins/mplayervis2.py (revision 10970) ++++ freevo/src/audio/plugins/mplayervis2.py (revision 10971) +@@ -511,7 +511,7 @@ + args['verbose'] = '-v' + + vo = ['%(vo)s' % args, '%(vo_opts)s' % args] +- vo.remove('') ++ vo = filter(len, vo) + vo = ':'.join(vo) + + command = ['%(cmd)s' % args] +@@ -531,8 +531,7 @@ + elif '-framedrop' not in command: + command += config.MPLAYER_SOFTWARE_SCALER.split() + +- while '' in command: +- command.remove('') ++ command = filter(len, command) + + command += ['%(url)s' % args] + +Index: freevo/src/video/plugins/mplayer.py +=================================================================== +--- freevo/src/video/plugins/mplayer.py (revision 10970) ++++ freevo/src/video/plugins/mplayer.py (revision 10971) +@@ -299,11 +299,11 @@ + command = p.play(command, self) + + vo = ['%(vo)s' % args, '%(vo_opts)s' % args] +- vo.remove('') ++ vo = filter(len, vo) + vo = ':'.join(vo) + + ao = ['%(ao)s' % args, '%(ao_opts)s' % args] +- ao.remove('') ++ ao = filter(len, ao) + ao = ':'.join(ao) + + command = ['--prio=%(nice)s' % args] +@@ -342,8 +342,7 @@ + if options: + command += options + +- while '' in command: +- command.remove('') ++ command = filter(len, command) + + command = self.sort_filter(command) + +Index: freevo/src/tv/plugins/mplayer.py +=================================================================== +--- freevo/src/tv/plugins/mplayer.py (revision 10970) ++++ freevo/src/tv/plugins/mplayer.py (revision 10971) +@@ -192,11 +192,11 @@ + _debug_('mplayer args = %r' % (args,)) + + vo = ['%(vo)s' % args, '%(vo_opts)s' % args] +- vo.remove('') ++ vo = filter(len, vo) + vo = ':'.join(vo) + + ao = ['%(ao)s' % args, '%(ao_opts)s' % args] +- ao.remove('') ++ ao = filter(len, ao) + ao = ':'.join(ao) + + command = ['--prio=%(nice)s' % args] +@@ -235,8 +235,7 @@ + #if options: + # command += options + +- while '' in command: +- command.remove('') ++ command = filter(len, command) + + #command = self.sort_filter(command) + +Index: freevo/src/childapp.py +=================================================================== +--- freevo/src/childapp.py (revision 10970) ++++ freevo/src/childapp.py (revision 10971) +@@ -87,8 +87,7 @@ + debug_name = app[:app.find(' ')] + + else: +- while '' in app: +- app.remove('') ++ app = filter(len, app) + + if app[0].find('--prio=') == 0 and not config.RUNAPP: + try: diff --git a/media-tv/freevo/files/freevo-1.8.2.boot b/media-tv/freevo/files/freevo-1.8.2.boot new file mode 100644 index 000000000000..4f4c627f008b --- /dev/null +++ b/media-tv/freevo/files/freevo-1.8.2.boot @@ -0,0 +1,57 @@ +#!/bin/bash +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# use "freevoboot stop" to stop, "freevoboot xstop" if you use X. + +freevo=`grep ^freevo= /etc/conf.d/freevo | cut -d'"' -f2` +webserver=`grep ^webserver= /etc/conf.d/freevo | cut -d'"' -f2` +recordserver=`grep ^recordserver= /etc/conf.d/freevo | cut -d'"' -f2` + + +if [ "x$1" != "xstop" ]; then + if [ "$recordserver" == "yes" ]; then + echo "Starting Freevo recordserver" + /usr/bin/freevo recordserver start + fi + + if [ "$webserver" == "yes" ]; then + echo "Starting Freevo webserver" + /usr/bin/freevo webserver start + fi + + if [ "$freevo" == "daemon" ] && [ "x$1" != "xstartx" ]; then + echo "Starting Freevo daemon" + /usr/bin/freevo daemon start + elif [ "$freevo" == "yes" ] || [ "x$1" == "xstartx" ] ; then + echo "Starting Freevo" + if egrep -q '^display.*(x11|dga)' /etc/freevo/freevo.conf ; then + if [ -z "$DISPLAY" ] ; then + /usr/bin/freevo -fs &>/dev/null & + else + /usr/bin/freevo &>/dev/null + fi + else + /usr/bin/freevo start + fi + fi + +else + if [ "$freevo" == "daemon" ] && [ "x$1" != "xstopx" ]; then + echo "Stopping Freevo daemon" + /usr/bin/freevo daemon stop + elif [ "$freevo" == "yes" ] || [ "x$1" == "xstopx" ] ; then + echo "Stopping Freevo" + /usr/bin/freevo stop + fi + + if [ "$webserver" == "yes" ]; then + echo "Stopping Freevo webserver" + /usr/bin/freevo webserver stop + fi + + if [ "$recordserver" == "yes" ]; then + echo "Stopping Freevo recordserver" + /usr/bin/freevo recordserver stop + fi +fi diff --git a/media-tv/freevo/files/freevo.rc6 b/media-tv/freevo/files/freevo.rc6 deleted file mode 100644 index df44e7e7c7e6..000000000000 --- a/media-tv/freevo/files/freevo.rc6 +++ /dev/null @@ -1,74 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/files/freevo.rc6,v 1.6 2004/07/14 22:52:05 agriffis Exp $ - -depend() { - use net xfs lircd -} - -checkconfig() { - if [ -z "${freevo}" -o "${freevo}" = "no" ] && \ - [ -z "${webserver}" -o "${webserver}" = "no" ] && \ - [ -z "${recordserver}" -o "${recordserver}" = "no" ] ; then - eerror "All services are disabled." - eerror "Please check /etc/conf.d/freevo" - return 1 - fi - - sysctl -w dev.rtc.max-user-freq=1024 &> /dev/null -} - -start() { - checkconfig || return 1 - - if [ "${freevo}" == "daemon" ] ; then - ebegin "Starting Freevo daemon" - /usr/bin/freevo daemon start - eend $? - elif [ "${freevo}" == "yes" ]; then - ebegin "Starting Freevo" - if egrep -q '^display.*(x11|dga)' /etc/freevo/freevo.conf ; then - /usr/bin/freevo -fs &>/dev/null & - else - /usr/bin/freevo start - fi - eend $? - fi - - if [ "${recordserver}" == "yes" ]; then - ebegin "Starting Freevo recordserver" - /usr/bin/freevo recordserver start - eend $? - fi - - if [ "${webserver}" == "yes" ]; then - ebegin "Starting Freevo webserver" - /usr/bin/freevo webserver start - eend $? - fi -} - -stop() { - if [ "${webserver}" == "yes" ]; then - ebegin "Stopping Freevo webserver" - /usr/bin/freevo webserver stop - eend $? - fi - - if [ "${recordserver}" == "yes" ]; then - ebegin "Stopping Freevo recordserver" - /usr/bin/freevo recordserver stop - eend $? - fi - - if [ "${freevo}" == "daemon" ]; then - ebegin "Stopping Freevo daemon" - /usr/bin/freevo daemon stop - eend $? - elif [ "${freevo}" == "yes" ]; then - ebegin "Stopping Freevo" - /usr/bin/freevo stop - eend $? - fi -} diff --git a/media-tv/freevo/freevo-1.5.4.ebuild b/media-tv/freevo/freevo-1.5.4.ebuild deleted file mode 100644 index cdf8eb0b3a55..000000000000 --- a/media-tv/freevo/freevo-1.5.4.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.4.ebuild,v 1.11 2007/11/27 11:14:27 zzam Exp $ - -inherit distutils - -IUSE="matrox dvd encode lirc X nls" -DESCRIPTION="Digital video jukebox (PVR, DVR)." -HOMEPAGE="http://www.freevo.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -RESTRICT="mirror" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND=">=dev-python/pygame-1.5.6 - >=dev-python/imaging-1.1.3 - >=dev-python/pyxml-0.8.2 - >=dev-python/twisted-2 - >=dev-python/twisted-web-0.5.0-r1 - >=dev-python/mmpython-0.4.5 - >=media-video/mplayer-0.92 - >=media-libs/freetype-2.1.4 - >=media-libs/libsdl-1.2.5 - dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 ) - encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 ) - matrox? ( >=media-video/matroxset-0.3 ) - lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )" -RDEPEND="${DEPEND}" - -pkg_setup() { - if ! built_with_use media-libs/sdl-image png; then - eerror "media-libs/sdl-image must be emerged with the 'png' use flag" - eerror "Please fix and re-emerge freevo." - die "fix use flags" - fi -} - -src_install() { - distutils_src_install - - insinto /etc/freevo - doins "${T}/freevo.conf" - newins local_conf.py.example local_conf.py - - if [ "${PROFILE_ARCH}" == "xbox" ]; then - sed -i -e "s/# MPLAYER_AO_DEV.*/MPLAYER_AO_DEV='alsa1x'/" "${D}"/etc/freevo/local_conf.py - newins "${FILESDIR}"/xbox-lircrc lircrc - fi - - newinitd "${FILESDIR}/freevo.rc6" freevo - newconfd "${FILESDIR}/freevo.conf" freevo - - rm -rf "${D}/usr/share/doc" - newdoc Docs/README README.docs - dodoc BUGS COPYING ChangeLog FAQ INSTALL PKG-INFO README TODO \ - Docs/{CREDITS,NOTES,plugins/*.txt} - cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}" - - use nls || rm -rf "${D}"/usr/share/locale -} - -pkg_postinst() { - elog "If you want to schedule programs, emerge xmltv now." - elog - - elog "Please check /etc/freevo/freevo.conf and" - elog "/etc/freevo/local_conf.py before starting Freevo." - elog "To rebuild freevo.conf with different parameters," - elog "please run:" - elog " freevo setup" - elog - - if [ -e "${ROOT}/opt/freevo" ] ; then - ewarn "Please remove ${ROOT}/opt/freevo because it is no longer used." - fi - if [ -e "${ROOT}/etc/freevo/freevo_config.py" ] ; then - ewarn "Please remove ${ROOT}/etc/freevo/freevo_config.py." - fi - if [ -e "${ROOT}/etc/init.d/freevo-record" ] ; then - ewarn "Please remove ${ROOT}/etc/init.d/freevo-record" - fi - if [ -e "${ROOT}/etc/init.d/freevo-web" ] ; then - ewarn "Please remove ${ROOT}/etc/init.d/freevo-web" - fi - - local myconf - if [ "`/bin/ls -l /etc/localtime | grep -e "Europe\|GMT"`" ] ; then - myconf="${myconf} --tv=pal" - fi - if [ "${PROFILE_ARCH}" == "xbox" ]; then - myconf="${myconf} --geometry=640x480 --display=x11" - elif use matrox ; then - myconf="${myconf} --geometry=768x576 --display=mga" - elif use X ; then - myconf="${myconf} --geometry=800x600 --display=x11" - else - myconf="${myconf} --geometry=800x600 --display=fbdev" - fi - - "/usr/bin/freevo" setup ${myconf} || die "configure problem" -} diff --git a/media-tv/freevo/freevo-1.7.3.ebuild b/media-tv/freevo/freevo-1.7.3.ebuild deleted file mode 100644 index 0497512507e6..000000000000 --- a/media-tv/freevo/freevo-1.7.3.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.3.ebuild,v 1.2 2007/11/27 11:14:27 zzam Exp $ - -inherit distutils - -DESCRIPTION="Digital video jukebox (PVR, DVR)." -HOMEPAGE="http://www.freevo.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -IUSE="dvd lirc matrox minimal mixer nls sqlite tv X directfb fbcon doc" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc" - -RDEPEND=">=dev-python/pygame-1.5.6 - >=dev-python/pyxml-0.8.2 - >=dev-python/imaging-1.1.3 - =dev-python/twisted-2.4* - =dev-python/twisted-web-0.6* - >=media-video/mplayer-0.92 - >=media-libs/freetype-2.1.4 - >=media-libs/libsdl-1.2.5 - >=sys-apps/sed-4 - >=dev-python/elementtree-1.2.6 - >=dev-python/beautifulsoup-3.0 - >=dev-python/kaa-base-0.1.3 - >=dev-python/kaa-metadata-0.6.1 - >=dev-python/kaa-imlib2-0.2.1 - dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 ) - tv? ( media-tv/tvtime !minimal? ( media-tv/xmltv ) ) - mixer? ( media-sound/aumix ) - matrox? ( >=media-video/matroxset-0.3 ) - lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 ) - sqlite? ( ~dev-python/pysqlite-1.0.1 )" - -pkg_setup() { - if use directfb ; then - use dvd && ! (built_with_use media-libs/xine-lib directfb) \ - && ewarn "media-libs/xine-lib was not built with directfb support" - ! (built_with_use media-video/mplayer directfb) \ - && ewarn "media-video/mplayer was not built with directfb support" - if ! (built_with_use media-libs/libsdl directfb) ; then - eerror "media-libs/libsdl was not built with directdb support" - eerror "Please re-emerge libsdl with the directfb use flag" - die "directfb use flag specified but no support in libsdl and others" - fi - fi - - if use fbcon ; then - use dvd && ! (built_with_use media-libs/xine-lib fbcon) \ - && ewarn "media-libs/xine-lib was not built with fbcon support" - ! (built_with_use media-video/mplayer fbcon) \ - && ewarn "media-video/mplayer was not built with fbcon support" - if ! (built_with_use media-libs/libsdl fbcon) ; then - eerror "media-libs/libsdl was not built with fbcon support" - eerror "Please re-emerge libsdl with the fbcon use flag" - die "fbcon use flag specified but no support in media-libs/libsdl and others" - fi - fi - - if ! (use X || use directfb || use fbcon || use matrox) ; then - echo - ewarn "WARNING - no video support specified in USE flags." - ewarn "Please be sure that media-libs/libsdl supports whatever video" - ewarn "support (X11, fbcon, directfb, etc) you plan on using." - echo - fi - - if ! ( (built_with_use media-libs/sdl-image jpeg) \ - && (built_with_use media-libs/sdl-image png ) ) ; then - eerror "media-libs/sdl-image needs more image format support (USE=\"png jpeg\")" - die "re-emerge media-libs/sdl-image with the given USE flags" - fi -} - -src_install() { - distutils_src_install - - insinto /etc/freevo - newins local_conf.py.example local_conf.py - - if [ "${PROFILE_ARCH}" == "xbox" ]; then - sed -i -e "s/# MPLAYER_AO_DEV.*/MPLAYER_AO_DEV='alsa1x'/" "${D}"/etc/freevo/local_conf.py - newins "${FILESDIR}"/xbox-lircrc lircrc - fi - - if use X; then - echo "#!/bin/bash" > freevo - echo "/usr/bin/freevoboot startx" >> freevo - exeinto /etc/X11/Sessions/ - doexe freevo - - #insinto /etc/X11/dm/Sessions - #doins "${FILESDIR}/freevo.desktop" - - insinto /usr/share/xsessions - doins "${FILESDIR}/freevo.desktop" - fi - - exeinto /usr/bin - newexe "${FILESDIR}/freevo.boot" freevoboot - newconfd "${FILESDIR}/freevo.conf" freevo - - rm -rf "${D}/usr/share/doc" - - dodoc ChangeLog FAQ INSTALL PKG-INFO README TODO \ - Docs/{CREDITS,NOTES,*.txt,plugins/*.txt} - use doc && - cp -r Docs/{installation,html,plugin_writing} "${D}/usr/share/doc/${PF}" - - use nls || rm -rf "${D}"/usr/share/locale - - # Create a default freevo setup - cd "${S}/src" - if [ "${PROFILE_ARCH}" == "xbox" ]; then - myconf="${myconf} --geometry=640x480 --display=x11" - elif use matrox && use directfb; then - myconf="${myconf} --geometry=768x576 --display=dfbmga" - elif use matrox ; then - myconf="${myconf} --geometry=768x576 --display=mga" - elif use directfb; then - myconf="${myconf} --geometry=768x576 --display=directfb" - elif use X ; then - myconf="${myconf} --geometry=800x600 --display=x11" - else - myconf="${myconf} --geometry=800x600 --display=fbdev" - fi - sed -i "s:/etc/freevo/freevo.conf:${D}/etc/freevo/freevo.conf:g" setup_freevo.py || die "Could not fix setup_freevo.py" - python setup_freevo.py ${myconf} || die "Could not create new freevo.conf" -} - -pkg_postinst() { - echo - einfo "Please check /etc/freevo/freevo.conf and" - einfo "/etc/freevo/local_conf.py before starting Freevo." - einfo "To rebuild freevo.conf with different parameters," - einfo "please run:" - einfo " freevo setup" - - echo - ewarn "The way of starting Freevo for freevo-only-systems has changed" - ewarn "and does not require Freevo to run as root anymore." - ewarn "Please use freevoboot, a wrapper to be run as a user." - ewarn "Configuration is still in /etc/conf.d/freevo" - ewarn "and you can always start freevo directly." - if use X ; then - echo - ewarn "If you're using a Freevo-only system with X, you'll need" - ewarn "to setup the autologin (as user) and choose freevo as" - ewarn "default session. If you need to run recordserver/webserver" - ewarn "at boot, please use /etc/conf.d/freevo" - echo - ewarn "Should you decide to personalize your freevo.desktop" - ewarn "session, keep the definition for '/usr/bin/freevoboot starx'" - else - echo - ewarn "If you want Freevo to start automatically,you'll need" - ewarn "to follow instructions at :" - ewarn "http://freevo.sourceforge.net/cgi-bin/doc/BootFreevo" - echo - ewarn "*NOTE: you can use mingetty or provide a login" - ewarn "program for getty to autologin as a user with limited privileges." - ewarn "A tutorial for getty is at:" - ewarn "http://ubuntuforums.org/showthread.php?t=152274" - fi - - if [ -e "${ROOT}/etc/init.d/freevo" ] ; then - echo - ewarn "Please remove /etc/init.d/freevo as it is a security" - ewarn "threat. To set autostart read above." - fi - - if [ -e "${ROOT}/opt/freevo" ] ; then - echo - ewarn "Please remove ${ROOT}/opt/freevo because it is no longer used." - fi - if [ -e "${ROOT}/etc/freevo/freevo_config.py" ] ; then - echo - ewarn "Please remove ${ROOT}/etc/freevo/freevo_config.py." - fi - if [ -e "${ROOT}/etc/init.d/freevo-record" ] ; then - echo - ewarn "Please remove ${ROOT}/etc/init.d/freevo-record" - fi - if [ -e "${ROOT}/etc/init.d/freevo-web" ] ; then - echo - ewarn "Please remove ${ROOT}/etc/init.d/freevo-web" - fi -} diff --git a/media-tv/freevo/freevo-1.7.4.ebuild b/media-tv/freevo/freevo-1.8.2.ebuild index dd24aab3a599..c4608c5adb0c 100644 --- a/media-tv/freevo/freevo-1.7.4.ebuild +++ b/media-tv/freevo/freevo-1.8.2.ebuild @@ -1,47 +1,61 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.4.ebuild,v 1.1 2007/12/01 21:04:50 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.8.2.ebuild,v 1.1 2008/10/25 15:39:53 rbu Exp $ -inherit distutils +inherit distutils eutils DESCRIPTION="Digital video jukebox (PVR, DVR)." HOMEPAGE="http://www.freevo.org/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -IUSE="dvd lirc matrox minimal mixer nls sqlite tv X directfb fbcon doc" +IUSE="directfb cdparanoia doc dvd encode fbcon gphoto2 jpeg lame lirc matrox mixer nls snes sqlite tv tvtime vorbis xine xmame X" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc" - -RDEPEND=">=dev-python/pygame-1.5.6 - >=dev-python/pyxml-0.8.2 - >=dev-python/imaging-1.1.3 - >=dev-python/twisted-2.4 +KEYWORDS="~amd64 ~ppc ~x86" + +# TODO: We could also use dev-libs/libxml2 when +# built with USE=python alternatively to pyxml +RDEPEND="dev-python/pygame + dev-python/pyxml + dev-python/elementtree + dev-python/imaging + dev-python/beautifulsoup + >=dev-python/twisted-2.5 >=dev-python/twisted-web-0.6 - >=media-video/mplayer-0.92 - >=media-libs/freetype-2.1.4 + + >=dev-python/kaa-base-0.4.0 + >=dev-python/kaa-metadata-0.7.3 + >=dev-python/kaa-imlib2-0.2.3 + + media-video/mplayer >=media-libs/libsdl-1.2.5 - >=sys-apps/sed-4 - >=dev-python/elementtree-1.2.6 - >=dev-python/beautifulsoup-3.0 - >=dev-python/kaa-base-0.1.3 - >=dev-python/kaa-metadata-0.6.1 - >=dev-python/kaa-imlib2-0.2.1 - dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 ) - tv? ( media-tv/tvtime !minimal? ( media-tv/xmltv ) ) - mixer? ( media-sound/aumix ) - matrox? ( >=media-video/matroxset-0.3 ) + + cdparanoia? ( media-sound/cdparanoia ) + dvd? ( >=media-video/lsdvd-0.10 + encode? ( media-video/dvdbackup ) ) + flac? ( media-libs/flac ) + gphoto2? ( media-libs/libgphoto2 ) + jpeg? ( media-libs/jpeg ) + lame? ( media-sound/lame ) lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 ) - sqlite? ( ~dev-python/pysqlite-1.0.1 )" + matrox? ( >=media-video/matroxset-0.3 ) + mixer? ( media-sound/aumix ) + snes? ( || ( games-emulation/zsnes games-emulation/snes9x ) ) + sqlite? ( ~dev-python/pysqlite-1.0.1 ) + tv? ( media-tv/xmltv + tvtime? ( media-tv/tvtime ) ) + xine? ( media-video/xine-ui ) + vorbis? ( media-sound/vorbis-tools ) + xmame? ( games-emulation/xmame )" pkg_setup() { if use directfb ; then - use dvd && ! (built_with_use media-libs/xine-lib directfb) \ + use dvd && ! built_with_use media-libs/xine-lib directfb \ && ewarn "media-libs/xine-lib was not built with directfb support" - ! (built_with_use media-video/mplayer directfb) \ + ! built_with_use media-video/mplayer directfb \ && ewarn "media-video/mplayer was not built with directfb support" - if ! (built_with_use media-libs/libsdl directfb) ; then + if ! built_with_use media-libs/libsdl directfb ; then eerror "media-libs/libsdl was not built with directdb support" eerror "Please re-emerge libsdl with the directfb use flag" die "directfb use flag specified but no support in libsdl and others" @@ -49,18 +63,18 @@ pkg_setup() { fi if use fbcon ; then - use dvd && ! (built_with_use media-libs/xine-lib fbcon) \ + use dvd && ! built_with_use media-libs/xine-lib fbcon \ && ewarn "media-libs/xine-lib was not built with fbcon support" - ! (built_with_use media-video/mplayer fbcon) \ + ! built_with_use media-video/mplayer fbcon \ && ewarn "media-video/mplayer was not built with fbcon support" - if ! (built_with_use media-libs/libsdl fbcon) ; then + if ! built_with_use media-libs/libsdl fbcon ; then eerror "media-libs/libsdl was not built with fbcon support" eerror "Please re-emerge libsdl with the fbcon use flag" die "fbcon use flag specified but no support in media-libs/libsdl and others" fi fi - if ! (use X || use directfb || use fbcon || use matrox) ; then + if ! { use X || use directfb || use fbcon || use matrox ; } ; then echo ewarn "WARNING - no video support specified in USE flags." ewarn "Please be sure that media-libs/libsdl supports whatever video" @@ -68,13 +82,17 @@ pkg_setup() { echo fi - if ! ( (built_with_use media-libs/sdl-image jpeg) \ - && (built_with_use media-libs/sdl-image png ) ) ; then + if ! built_with_use -a media-libs/sdl-image jpeg png ; then eerror "media-libs/sdl-image needs more image format support (USE=\"png jpeg\")" die "re-emerge media-libs/sdl-image with the given USE flags" fi } +src_unpack() { + distutils_src_unpack + epatch "${FILESDIR}"/${P}-mplayerargs.patch +} + src_install() { distutils_src_install @@ -100,12 +118,12 @@ src_install() { fi exeinto /usr/bin - newexe "${FILESDIR}/freevo.boot" freevoboot + newexe "${FILESDIR}"/${P}.boot freevoboot newconfd "${FILESDIR}/freevo.conf" freevo rm -rf "${D}/usr/share/doc" - dodoc ChangeLog FAQ INSTALL PKG-INFO README TODO \ + dodoc ChangeLog FAQ RELEASE_NOTES README TODO \ Docs/{CREDITS,NOTES,*.txt,plugins/*.txt} use doc && cp -r Docs/{installation,html,plugin_writing} "${D}/usr/share/doc/${PF}" @@ -139,12 +157,15 @@ pkg_postinst() { einfo "please run:" einfo " # freevo setup" - einfo "To update your local configuration, please run" - einfo " # freevo convert_config /etc/freevo/local_conf.py -w" + ewarn "To update from existing installations, please run" + ewarn " # freevo convert_config /etc/freevo/local_conf.py -w" + ewarn "If you are using the recordserver, be sure to" + ewarn "read the RELEASE_NOTES in /usr/share/doc/${P}" echo einfo "To build a freevo-only system, please use the freevoboot" einfo "wrapper to be run it as a user. It can be configured in /etc/conf.d/freevo" + if use X ; then echo ewarn "If you're using a Freevo-only system with X, you'll need" @@ -153,7 +174,7 @@ pkg_postinst() { ewarn "at boot, please use /etc/conf.d/freevo" echo ewarn "Should you decide to personalize your freevo.desktop" - ewarn "session, keep the definition for '/usr/bin/freevoboot starx'" + ewarn "session, keep the definition for '/usr/bin/freevoboot startx'" else echo ewarn "If you want Freevo to start automatically,you'll need" diff --git a/media-tv/freevo/metadata.xml b/media-tv/freevo/metadata.xml index 3bae9bc9e824..471158bc3e4d 100644 --- a/media-tv/freevo/metadata.xml +++ b/media-tv/freevo/metadata.xml @@ -22,6 +22,9 @@ <use> <flag name="ivtv">Enables ivtv support</flag> <flag name="mixer">Enable support for adjusting volume via <pkg>media-sound/aumix</pkg></flag> + <flag name="snes">Enable Super Nintendo games support</flag> <flag name="tv">Enable support for the tv guide plugin</flag> + <flag name="xmame">Enables support for Xmame arcade games</flag> + <flag name="tvtime">Enables tvtime support, additional to tv use flag</flag> </use> </pkgmetadata> |