diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2005-01-18 20:11:18 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2005-01-18 20:11:18 +0000 |
commit | c05ae6b96028bd25e3692f5a54c8e77119da98a8 (patch) | |
tree | 85ce196d9807bebcd481756c25f05457fd179d29 /media-tv | |
parent | Removed old vulnerable ebuilds. (diff) | |
download | historical-c05ae6b96028bd25e3692f5a54c8e77119da98a8.tar.gz historical-c05ae6b96028bd25e3692f5a54c8e77119da98a8.tar.bz2 historical-c05ae6b96028bd25e3692f5a54c8e77119da98a8.zip |
rev dump to CVS snapshot for bug fixes and feature updates since upstream won't release and won't suppport current stable
Package-Manager: portage-2.0.51-r13
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/mythtv/ChangeLog | 16 | ||||
-rw-r--r-- | media-tv/mythtv/Manifest | 27 | ||||
-rw-r--r-- | media-tv/mythtv/files/digest-mythtv-0.13-r1 | 1 | ||||
-rw-r--r-- | media-tv/mythtv/files/digest-mythtv-0.14-r1 | 1 | ||||
-rw-r--r-- | media-tv/mythtv/files/digest-mythtv-0.15.1 | 1 | ||||
-rw-r--r-- | media-tv/mythtv/files/digest-mythtv-0.15.1-r1 | 1 | ||||
-rw-r--r-- | media-tv/mythtv/files/digest-mythtv-0.16.20050115 | 1 | ||||
-rw-r--r-- | media-tv/mythtv/files/gcc-3.4-fix.patch | 39 | ||||
-rw-r--r-- | media-tv/mythtv/files/mythtv-0.15-directfb.patch | 19 | ||||
-rw-r--r-- | media-tv/mythtv/files/tvformat.fix.0.13.diff | 13 | ||||
-rw-r--r-- | media-tv/mythtv/metadata.xml | 3 | ||||
-rw-r--r-- | media-tv/mythtv/mythtv-0.13-r1.ebuild | 150 | ||||
-rw-r--r-- | media-tv/mythtv/mythtv-0.14-r1.ebuild | 173 | ||||
-rw-r--r-- | media-tv/mythtv/mythtv-0.15.1.ebuild | 197 | ||||
-rw-r--r-- | media-tv/mythtv/mythtv-0.16.20050115.ebuild (renamed from media-tv/mythtv/mythtv-0.15.1-r1.ebuild) | 205 | ||||
-rw-r--r-- | media-tv/mythtv/mythtv-0.16.ebuild | 4 |
16 files changed, 125 insertions, 726 deletions
diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog index 09817d916b0c..b8b2fcb889df 100644 --- a/media-tv/mythtv/ChangeLog +++ b/media-tv/mythtv/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for media-tv/mythtv -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.39 2004/12/05 00:46:13 iggy Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.40 2005/01/18 20:11:18 cardoe Exp $ + +*mythtv-0.16.20050115 (18 Jan 2005) + + 18 Jan 2005; Doug Goldstein <cardoe@gentoo.org> metadata.xml, + -files/gcc-3.4-fix.patch, -files/mythtv-0.15-directfb.patch, + -files/tvformat.fix.0.13.diff, -mythtv-0.13-r1.ebuild, + -mythtv-0.14-r1.ebuild, -mythtv-0.15.1-r1.ebuild, -mythtv-0.15.1.ebuild, + +mythtv-0.16.20050115.ebuild: + rev dump to CVS snapshot for bug fixes and feature updates since upstream + won't release and won't suppport current stable merge changes from eclass + remove old revs fix up ebuild add XrandX extension since Gentoo X.org always + has it 04 Dec 2004; Brian Jackson <iggy@gentoo.org> mythtv-0.16.ebuild: I can't find any of the other media-tv guys, and it's been fairly bug free diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index 3de34ad3fe39..e43a0a87b118 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1,29 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3d9bee3ecb9fb56ee0662360121d9792 mythtv-0.15.1.ebuild 6637 -MD5 d09c54cf8d8aa1f4a6d6bff6a3df0366 mythtv-0.16.ebuild 5794 -MD5 20e2255501865de5b568424821abf69d metadata.xml 161 -MD5 3429e6b7394b46b976da06b3a2a3ef5f ChangeLog 7597 -MD5 bb8f641b460d061161d9982b0464b9dc mythtv-0.13-r1.ebuild 4519 -MD5 069bb2ed03255dd27030c717e89ff508 mythtv-0.14-r1.ebuild 5581 -MD5 95274b0a4512cc3ab9e2b92e316aea6b mythtv-0.15.1-r1.ebuild 7667 +MD5 e90675fd2e5ccc8e77017e27375a02e8 mythtv-0.16.20050115.ebuild 6381 +MD5 f5e313e37938a6988e60395716056801 mythtv-0.16.ebuild 5794 +MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222 +MD5 0332ec5c89fa3788d97a3658eee437dc ChangeLog 8168 MD5 42fa0fc7989526cab3de95cd34b7b931 files/mythbackend.rc6 1680 -MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythtv-0.15.1 67 -MD5 24ab1e90e64fb0be4704e74b633e96b1 files/digest-mythtv-0.14-r1 65 -MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythtv-0.15.1-r1 67 +MD5 b139ca303519b8763216bb5f04ece04f files/digest-mythtv-0.16.20050115 75 MD5 b3a4780890d53640604812b8069a8297 files/mythfilldatabase.cron 74 -MD5 75594236f281302bcb8f60629e0da65b files/tvformat.fix.0.13.diff 407 -MD5 f34c79d00b235a08f18cf9f2107d6390 files/mythtv-0.15-directfb.patch 1185 -MD5 e7cc68f54ad1c6128aec944e105189e3 files/gcc-3.4-fix.patch 1773 MD5 f61ed76cd0d4dab547459acb1ee99882 files/mythbackend.conf 902 MD5 fb4505fe7e8b832e115d777bf836d3bc files/digest-mythtv-0.16 66 MD5 8d46f5508de5d412db9e4a757db00e26 files/mythtv-0.16-cx88.patch 674 -MD5 a01439b4ddf480862e31867fc4689698 files/digest-mythtv-0.13-r1 65 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFBwfYoFhz/XBeRBtARAufiAJ0Wt2ftCV4G+LMJRINrzCC7CzLzJgCdHUGe -rd3YlH5waPacbUK0kE1Ap5w= -=tse9 +iD8DBQFB7W1tFhz/XBeRBtARAiUeAJ9pfF193ApTNGUM99B9tJGLwGctXwCfUIbF +gyw4viK27YjPa8e9tC9eTcs= +=zfbJ -----END PGP SIGNATURE----- diff --git a/media-tv/mythtv/files/digest-mythtv-0.13-r1 b/media-tv/mythtv/files/digest-mythtv-0.13-r1 deleted file mode 100644 index d64835745f92..000000000000 --- a/media-tv/mythtv/files/digest-mythtv-0.13-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 bdca237336453cf68835063c1a4efa91 mythtv-0.13.tar.bz2 3263341 diff --git a/media-tv/mythtv/files/digest-mythtv-0.14-r1 b/media-tv/mythtv/files/digest-mythtv-0.14-r1 deleted file mode 100644 index 0d9553b02a81..000000000000 --- a/media-tv/mythtv/files/digest-mythtv-0.14-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c2ea3e39580d70aaa22c36a35f6afcca mythtv-0.14.tar.bz2 5802666 diff --git a/media-tv/mythtv/files/digest-mythtv-0.15.1 b/media-tv/mythtv/files/digest-mythtv-0.15.1 deleted file mode 100644 index 55e1ca838ced..000000000000 --- a/media-tv/mythtv/files/digest-mythtv-0.15.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 91aca494281ae966f45f941026b72985 mythtv-0.15.1.tar.bz2 6209329 diff --git a/media-tv/mythtv/files/digest-mythtv-0.15.1-r1 b/media-tv/mythtv/files/digest-mythtv-0.15.1-r1 deleted file mode 100644 index 55e1ca838ced..000000000000 --- a/media-tv/mythtv/files/digest-mythtv-0.15.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 91aca494281ae966f45f941026b72985 mythtv-0.15.1.tar.bz2 6209329 diff --git a/media-tv/mythtv/files/digest-mythtv-0.16.20050115 b/media-tv/mythtv/files/digest-mythtv-0.16.20050115 new file mode 100644 index 000000000000..d939052a9c06 --- /dev/null +++ b/media-tv/mythtv/files/digest-mythtv-0.16.20050115 @@ -0,0 +1 @@ +MD5 a16fa44a42ceb780ccf1bd7cb133fee8 mythtv-0.16.20050115.tar.bz2 14946055 diff --git a/media-tv/mythtv/files/gcc-3.4-fix.patch b/media-tv/mythtv/files/gcc-3.4-fix.patch deleted file mode 100644 index 097177687318..000000000000 --- a/media-tv/mythtv/files/gcc-3.4-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ur mythtv-0.15.1.orig/libs/libmythtv/fifowriter.cpp mythtv-0.15.1/libs/libmythtv/fifowriter.cpp ---- mythtv-0.15.1.orig/libs/libmythtv/fifowriter.cpp 2004-06-02 21:06:54.427866608 +0100 -+++ mythtv-0.15.1/libs/libmythtv/fifowriter.cpp 2004-06-02 21:08:37.942130048 +0100 -@@ -21,9 +21,9 @@ - maxblksize = new long[count]; - killwr = new int[count]; - fbcount = new int[count]; -- fifo_buf = new (struct fifo_buf *)[count]; -- fb_inptr = new (struct fifo_buf *)[count]; -- fb_outptr = new (struct fifo_buf *)[count]; -+ fifo_buf = new fifo_ptr[count]; -+ fb_inptr = new fifo_ptr[count]; -+ fb_outptr = new fifo_ptr[count]; - fifothrds = new pthread_t[count]; - fifo_lock = new pthread_mutex_t [count]; - empty_cond = new pthread_cond_t[count]; -diff -ur mythtv-0.15.1.orig/libs/libmythtv/fifowriter.h mythtv-0.15.1/libs/libmythtv/fifowriter.h ---- mythtv-0.15.1.orig/libs/libmythtv/fifowriter.h 2004-06-02 21:06:54.423867216 +0100 -+++ mythtv-0.15.1/libs/libmythtv/fifowriter.h 2004-06-02 21:08:03.708334376 +0100 -@@ -29,6 +29,7 @@ - long blksize; - } **fifo_buf, **fb_inptr, **fb_outptr; - -+ typedef struct fifo_buf* fifo_ptr; - pthread_t *fifothrds; - pthread_mutex_t *fifo_lock; - pthread_cond_t *full_cond, *empty_cond; -diff -ur mythtv-0.15.1.orig/settings.pro mythtv-0.15.1/settings.pro ---- mythtv-0.15.1.orig/settings.pro 2004-06-02 21:06:54.474859464 +0100 -+++ mythtv-0.15.1/settings.pro 2004-06-02 21:07:07.013953232 +0100 -@@ -14,7 +14,7 @@ - - release { - DEFINES += MMX -- QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer -+ QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer -fpermissive - QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE} - } - diff --git a/media-tv/mythtv/files/mythtv-0.15-directfb.patch b/media-tv/mythtv/files/mythtv-0.15-directfb.patch deleted file mode 100644 index 7f72c06b111a..000000000000 --- a/media-tv/mythtv/files/mythtv-0.15-directfb.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** mythtv-0.15/libs/libmythtv/videoout_directfb.cpp~ Wed May 26 22:50:27 2004 ---- mythtv-0.15/libs/libmythtv/videoout_directfb.cpp Wed May 26 22:50:27 2004 -*************** -*** 337,343 **** - desc.flags = DSDESC_CAPS; - desc.caps = DSCAPS_PRIMARY; - if(data->cardCapabilities.acceleration_mask & DFXL_BLIT) -! desc.caps = (DFBSurfaceCapabilities)(desc.caps | DSCAPS_DOUBLE); - DFBCHECKFAIL(data->dfb->CreateSurface(data->dfb, &desc, &(data->primarySurface)), false); - DFBCHECKFAIL(data->primarySurface->Clear(data->primarySurface, 0, 0, 0, 0xff), false); - DFBCHECKFAIL(data->primarySurface->Flip(data->primarySurface, 0, DSFLIP_ONSYNC), false); ---- 337,343 ---- - desc.flags = DSDESC_CAPS; - desc.caps = DSCAPS_PRIMARY; - if(data->cardCapabilities.acceleration_mask & DFXL_BLIT) -! desc.caps = (DFBSurfaceCapabilities)(desc.caps | DSCAPS_FLIPPING); - DFBCHECKFAIL(data->dfb->CreateSurface(data->dfb, &desc, &(data->primarySurface)), false); - DFBCHECKFAIL(data->primarySurface->Clear(data->primarySurface, 0, 0, 0, 0xff), false); - DFBCHECKFAIL(data->primarySurface->Flip(data->primarySurface, 0, DSFLIP_ONSYNC), false); diff --git a/media-tv/mythtv/files/tvformat.fix.0.13.diff b/media-tv/mythtv/files/tvformat.fix.0.13.diff deleted file mode 100644 index 4c0f98ad5663..000000000000 --- a/media-tv/mythtv/files/tvformat.fix.0.13.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -u -d -r1.57 channel.cpp ---- libs/libmythtv/channel.cpp 5 Dec 2003 01:05:35 -0000 1.57 -+++ libs/libmythtv/channel.cpp 14 Dec 2003 03:23:30 -0000 -@@ -342,6 +342,9 @@ - QString freqid = query.value(1).toString(); - QString tvformat = query.value(2).toString(); - -+ if (tvformat.isNull() || tvformat.isEmpty()) -+ tvformat = "Default"; -+ - pthread_mutex_unlock(&db_lock); - - // Tune diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml index a6b9e38a1b93..1cb3ba51155e 100644 --- a/media-tv/mythtv/metadata.xml +++ b/media-tv/mythtv/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>media-tv</herd> +<maintainer> + <email>cardoe@gentoo.org</email> +</maintainer> </pkgmetadata> diff --git a/media-tv/mythtv/mythtv-0.13-r1.ebuild b/media-tv/mythtv/mythtv-0.13-r1.ebuild deleted file mode 100644 index ee138e967693..000000000000 --- a/media-tv/mythtv/mythtv-0.13-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.13-r1.ebuild,v 1.6 2004/06/25 00:32:52 agriffis Exp $ - -inherit flag-o-matic eutils - -DESCRIPTION="Homebrew PVR project." -HOMEPAGE="http://www.mythtv.org/" -SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="alsa lcd lirc nvidia" - -DEPEND="virtual/x11 - >=x11-libs/qt-3.1 - >=media-sound/lame-3.93.1 - >=media-libs/freetype-2.0 - >=media-tv/xmltv-0.5.16 - >=sys-apps/sed-4 - alsa? ( media-libs/alsa-lib ) - lcd? ( app-misc/lcdproc ) - lirc? ( app-misc/lirc ) - nvidia? ( media-video/nvidia-glx )" - #dvb? ( media-libs/libdvb ) - -RDEPEND="${DEPEND} - !media-tv/mythfrontend" - -pkg_setup() { - local qt_use="$(</var/db/pkg/`best_version x11-libs/qt`/USE)" - if [ ! "`has mysql ${qt_use}`" ] ; then - eerror "Qt is missing MySQL support. Please add" - eerror "'mysql' to your USE flags, and re-emerge Qt." - die "Qt needs mysql support" - fi - - return 0 -} - -src_unpack() { - unpack ${A} ; cd ${S} - - epatch ${FILESDIR}/tvformat.fix.0.13.diff - - for i in `grep -lr "usr/local" "${S}"` ; do - sed -e "s:usr/local:usr:g" -i "${i}" || die "sed failed" - done -} - -src_compile() { - local cpu="`get-flag march || get-flag mcpu`" - if [ "${cpu}" ] ; then - sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed" - fi - - if use alsa ; then - sed -e "s:#CONFIG += using_alsa:CONFIG += using_alsa:" \ - -e "s:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:" \ - -i "settings.pro" || die "enable alsa sed failed" - fi - # Not quite ready for prime time. - #if use dvb ; then - # sed -e "s:#CONFIG += using_dvb:CONFIG += using_dvb:" \ - # -e "s:#DEFINES += USING_DVB:DEFINES += USING_DVB:" \ - # -e "s:#INCLUDEPATH += /usr/src:INCLUDEPATH += /usr:" \ - # -i "settings.pro" || die "enable dvb sed failed" - #fi - if use lcd ; then - sed -e "s:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:" \ - -i "settings.pro" || die "enable lcd sed failed" - fi - if use lirc ; then - sed -e "s:#CONFIG += using_lirc:CONFIG += using_lirc:" \ - -e "s:#LIRC_LIBS = -llirc_client:LIRC_LIBS = -llirc_client:" \ - -i "settings.pro" || die "enable lirc sed failed" - fi - if use nvidia ; then - sed -e "s:#CONFIG += using_xvmc:CONFIG += using_xvmc:" \ - -e "s:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:" \ - -i "settings.pro" || die "enable xvmc sed failed" - fi - # Needs a VIA supported kernel driver. - #if use via ; then - # sed -e "s:#CONFIG += using_via:CONFIG += using_via:" - # -e "s:#EXTRA_LIBS += -lddmpeg:EXTRA_LIBS += -lddmpeg:" - # -i "settings.pro" || die "enable lirc sed failed" - #fi - - qmake -o "Makefile" "${PN}.pro" - - econf || die "econf failed" - make || die "compile problem" -} - -src_install() { - einstall INSTALL_ROOT="${D}" - newbin "setup/setup" "mythsetup" - - dodir /etc/mythtv - mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv" - dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt - - insinto /usr/share/mythtv/database - doins database/* - - exeinto /usr/share/mythtv - doexe "${FILESDIR}/mythfilldatabase.cron" - - exeinto /etc/init.d - newexe "${FILESDIR}/mythbackend.rc6" mythbackend - insinto /etc/conf.d - newins "${FILESDIR}/mythbackend.conf" mythbackend - - dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.{txt,pdf} - dohtml docs/*.html - - keepdir /var/{log,run}/mythtv -} - -pkg_postinst() { - ewarn "Please note that /usr/share/mythtv/setup has been moved" - ewarn "to /usr/bin/mythsetup" - echo - - einfo "If this is the first time you install MythTV," - einfo "you need to add /usr/share/mythtv/database/mc.sql" - einfo "to your mysql database." - einfo - einfo "You might run 'mysql < /usr/share/mythtv/database/mc.sql'" - einfo - einfo "Next, you need to run the mythsetup program." - einfo "It will ask you some questions about your hardware, and" - einfo "then run xmltv's grabber to configure your channels." - einfo - einfo "Once you have configured your database, you can run" - einfo "/usr/bin/mythfilldatabase to populate the schedule" - einfo "or copy /usr/share/mythtv/mythfilldatabase.cron to" - einfo "/etc/cron.daily for this to happen automatically." - einfo - einfo "If you're upgrading from an older version and for more" - einfo "setup and usage instructions, please refer to:" - einfo " /usr/share/doc/${PF}/README.gz" - einfo " /usr/share/doc/${PF}/UPGRADING.gz" - ewarn "This part is important as there might be database changes" - ewarn "which need to be performed or this package will not work" - ewarn "properly." - echo -} diff --git a/media-tv/mythtv/mythtv-0.14-r1.ebuild b/media-tv/mythtv/mythtv-0.14-r1.ebuild deleted file mode 100644 index d1b5e14bcb45..000000000000 --- a/media-tv/mythtv/mythtv-0.14-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.14-r1.ebuild,v 1.7 2004/06/25 00:32:52 agriffis Exp $ - -inherit flag-o-matic - -DESCRIPTION="Homebrew PVR project." -HOMEPAGE="http://www.mythtv.org/" -SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="alsa arts dvb directfb lcd lirc nvidia cle266" - -DEPEND="virtual/x11 - >=x11-libs/qt-3.1 - >=media-sound/lame-3.93.1 - >=media-libs/freetype-2.0 - >=media-tv/xmltv-0.5.16 - >=sys-apps/sed-4 - alsa? ( media-libs/alsa-lib ) - arts? ( kde-base/arts ) - directfb? ( dev-libs/DirectFB ) - dvb? ( media-libs/libdvb ) - lcd? ( app-misc/lcdproc ) - lirc? ( app-misc/lirc ) - nvidia? ( media-video/nvidia-glx ) - cle266? ( media-libs/libddmpeg )" - -RDEPEND="${DEPEND} - !media-tv/mythfrontend" - -pkg_setup() { - local qt_use="$(</var/db/pkg/`best_version x11-libs/qt`/USE)" - if [ ! "`has mysql ${qt_use}`" ] ; then - eerror "Qt is missing MySQL support. Please add" - eerror "'mysql' to your USE flags, and re-emerge Qt." - die "Qt needs MySQL support" - fi - - return 0 -} - -src_unpack() { - unpack ${A} && cd ${S} - - for i in `grep -lr "usr/local" "${S}"` ; do - sed -e "s:usr/local:usr:g" -i "${i}" || die "sed failed" - done -} - -src_compile() { - # Fix bugs 40964 and 42943. - filter-flags -fforce-addr -fPIC - - if [ "${ARCH}" == "amd64" ]; then - sed -e "s:-march=pentiumpro::" -e "/DEFINES += MMX/d" -i settings.pro - else - local cpu="`get-flag march || get-flag mcpu`" - if [ "${cpu}" ] ; then - sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed" - fi - fi - - if use alsa ; then - sed -e 's:#CONFIG += using_alsa:CONFIG += using_alsa:' \ - -e 's:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:' \ - -i 'settings.pro' || die "enable alsa sed failed" - fi - if use arts ; then - sed -e 's:artsc/artsc.h:artsc.h:' \ - -i "libs/libmyth/audiooutputarts.h" || die "sed failed" - sed -e 's:#CONFIG += using_arts:CONFIG += using_arts:' \ - -e 's:#ARTS_LIBS = .*:ARTS_LIBS = `artsc-config --libs`:' \ - -e 's:#EXTRA_LIBS += -L/opt/.*:EXTRA_LIBS += `artsc-config --libs`:' \ - -e 's:#INCLUDEPATH += /opt/.*:QMAKE_CXXFLAGS += `artsc-config --cflags`:' \ - -i 'settings.pro' || die "enable arts sed failed" - fi - if use directfb ; then - sed -e 's:#CONFIG += using_directfb:CONFIG += using_directfb:' \ - -e 's:#EXTRA_LIBS += `directfb:EXTRA_LIBS += `directfb:' \ - -e 's:#QMAKE_CXXFLAGS += `directfb:QMAKE_CXXFLAGS += `directfb:' \ - -i 'settings.pro' || die "enable arts sed failed" - fi - if use dvb ; then - sed -e 's:#CONFIG += using_dvb:CONFIG += using_dvb:' \ - -e 's:#DEFINES += USING_DVB:DEFINES += USING_DVB:' \ - -e 's:#INCLUDEPATH += /usr/src/.*:INCLUDEPATH += /usr/include:' \ - -i 'settings.pro' || die "enable dvb sed failed" - fi - if use lcd ; then - sed -e 's:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:' \ - -i 'settings.pro' || die "enable lcd sed failed" - fi - if use lirc ; then - sed -e 's:#CONFIG += using_lirc:CONFIG += using_lirc:' \ - -e 's:#LIRC_LIBS = -llirc_client:LIRC_LIBS = -llirc_client:' \ - -i 'settings.pro' || die "enable lirc sed failed" - fi - if use nvidia ; then - sed -e 's:#CONFIG += using_xvmc:CONFIG += using_xvmc:' \ - -e 's:#DEFINES += USING_XVMC:DEFINES += USING_XVMC:' \ - -e 's:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:' \ - -i 'settings.pro' || die "enable xvmc sed failed" - fi - if use cle266 ; then - sed -e 's:#CONFIG += using_viahwslice:CONFIG += using_viahwslice:' \ - -e 's:#DEFINES += USING_VIASLICE:DEFINES += USING_VIASLICE:' \ - -e 's:#EXTRA_LIBS += -lddmpeg:EXTRA_LIBS += -lddmpeg:' \ - -i 'settings.pro' || die "enable lirc sed failed" - fi - - qmake -o "Makefile" "${PN}.pro" - - econf || die "econf failed" - emake -j1 || die "compile problem" -} - -src_install() { - einstall INSTALL_ROOT="${D}" - newbin "setup/setup" "mythsetup" - - dodir /etc/mythtv - mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv" - dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt - - insinto /usr/share/mythtv/database - doins database/* - - exeinto /usr/share/mythtv - doexe "${FILESDIR}/mythfilldatabase.cron" - - exeinto /etc/init.d - newexe "${FILESDIR}/mythbackend.rc6" mythbackend - insinto /etc/conf.d - newins "${FILESDIR}/mythbackend.conf" mythbackend - - dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.{txt,pdf} - dohtml docs/*.html - - keepdir /var/{log,run}/mythtv -} - -pkg_postinst() { - ewarn "Please note that /usr/share/mythtv/setup has been moved" - ewarn "to /usr/bin/mythsetup" - echo - - einfo "If this is the first time you install MythTV," - einfo "you need to add /usr/share/mythtv/database/mc.sql" - einfo "to your mysql database." - einfo - einfo "You might run 'mysql < /usr/share/mythtv/database/mc.sql'" - einfo - einfo "Next, you need to run the mythsetup program." - einfo "It will ask you some questions about your hardware, and" - einfo "then run XMLTV's grabber to configure your channels." - einfo - einfo "Once you have configured your database, you can run" - einfo "/usr/bin/mythfilldatabase to populate the schedule" - einfo "or copy /usr/share/mythtv/mythfilldatabase.cron to" - einfo "/etc/cron.daily for this to happen automatically." - einfo - einfo "If you're upgrading from an older version and for more" - einfo "setup and usage instructions, please refer to:" - einfo " /usr/share/doc/${PF}/README.gz" - einfo " /usr/share/doc/${PF}/UPGRADING.gz" - ewarn "This part is important as there might be database changes" - ewarn "which need to be performed or this package will not work" - ewarn "properly." - echo -} diff --git a/media-tv/mythtv/mythtv-0.15.1.ebuild b/media-tv/mythtv/mythtv-0.15.1.ebuild deleted file mode 100644 index 3585cd529bac..000000000000 --- a/media-tv/mythtv/mythtv-0.15.1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.15.1.ebuild,v 1.5 2004/06/28 16:21:19 morfic Exp $ - -inherit flag-o-matic eutils gcc - -DESCRIPTION="Homebrew PVR project." -HOMEPAGE="http://www.mythtv.org/" -SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="alsa arts dvb directfb lcd lirc nvidia cle266 opengl" - -DEPEND=">=media-libs/freetype-2.0 - >=media-sound/lame-3.93.1 - >=x11-libs/qt-3.1 - dev-db/mysql - alsa? ( >=media-libs/alsa-lib-0.9 ) - >=sys-apps/sed-4 - arts? ( kde-base/arts ) - directfb? ( dev-libs/DirectFB ) - dvb? ( media-libs/libdvb ) - lcd? ( app-misc/lcdproc ) - lirc? ( app-misc/lirc ) - nvidia? ( media-video/nvidia-glx ) - cle266? ( media-libs/libddmpeg ) - opengl? ( >=x11-base/opengl-update-1.7 ) - || ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )" - -RDEPEND="${DEPEND} - !media-tv/mythfrontend" - -pkg_setup() { - local qt_use="$(</var/db/pkg/`best_version x11-libs/qt`/USE)" - if [ ! "`has mysql ${qt_use}`" ] ; then - eerror "Qt is missing MySQL support. Please add" - eerror "'mysql' to your USE flags, and re-emerge Qt." - die "Qt needs MySQL support" - fi - if use opengl ; then - local gl_implementation="$( opengl-update --get-implementation )" - if [ "$gl_implementation" == "xfree" ] || [ "$gl_implementation" == "xorg-x11" ] ; then - return 0 - else - eerror "OpenGL implementation must be set to either xfree or xorg-x11 to allow compilation." - eerror "to change opengl implemantation use opengl-update <your xserver>." - eerror "After mythtv has been merged you can switch back to the preferred implementation.." - die "Incompatible OpenGL implementation." - fi - fi - return 0 -} - -src_unpack() { - unpack ${A} && cd ${S} - - for i in `grep -lr "usr/local" "${S}"` ; do - sed -e "s:usr/local:usr:g" -i "${i}" || die "sed failed" - done - - use directfb && epatch ${FILESDIR}/mythtv-0.15-directfb.patch - - #Applies patch for gcc-3.4.0 closing bug #52819 - if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] - then - epatch ${FILESDIR}/gcc-3.4-fix.patch - fi - -} - -src_compile() { - # Fix bugs 40964 and 42943. - filter-flags -fforce-addr -fPIC - - if [ "${ARCH}" == "amd64" ]; then - sed -e "s:-march=pentiumpro::" -e "/DEFINES += MMX/d" -i settings.pro - else - local cpu="`get-flag march || get-flag mcpu`" - if [ "${cpu}" ] ; then - sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed" - fi - fi - - if use alsa ; then - sed -e 's:#CONFIG += using_alsa:CONFIG += using_alsa:' \ - -e 's:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:' \ - -i 'settings.pro' || die "enable alsa sed failed" - fi - if use arts ; then - sed -e 's:artsc/artsc.h:artsc.h:' \ - -i "libs/libmyth/audiooutputarts.h" || die "sed failed" - sed -e 's:#CONFIG += using_arts:CONFIG += using_arts:' \ - -e 's:#ARTS_LIBS = .*:ARTS_LIBS = `artsc-config --libs`:' \ - -e 's:#EXTRA_LIBS += -L/opt/.*:EXTRA_LIBS += `artsc-config --libs`:' \ - -e 's:#INCLUDEPATH += /opt/.*:QMAKE_CXXFLAGS += `artsc-config --cflags`:' \ - -i 'settings.pro' || die "enable arts sed failed" - fi - if use directfb ; then - sed -e 's:#CONFIG += using_directfb:CONFIG += using_directfb:' \ - -e 's:#EXTRA_LIBS += `directfb:EXTRA_LIBS += `directfb:' \ - -e 's:#QMAKE_CXXFLAGS += `directfb:QMAKE_CXXFLAGS += `directfb:' \ - -i 'settings.pro' || die "enable arts sed failed" - fi - if use dvb ; then - sed -e 's:#CONFIG += using_dvb:CONFIG += using_dvb:' \ - -e 's:#DEFINES += USING_DVB:DEFINES += USING_DVB:' \ - -e 's:#INCLUDEPATH += /usr/src/.*:INCLUDEPATH += /usr/include:' \ - -i 'settings.pro' || die "enable dvb sed failed" - fi - if use lcd ; then - sed -e 's:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:' \ - -i 'settings.pro' || die "enable lcd sed failed" - fi - if use lirc ; then - sed -e 's:#CONFIG += using_lirc:CONFIG += using_lirc:' \ - -e 's:#LIRC_LIBS = -llirc_client:LIRC_LIBS = -llirc_client:' \ - -i 'settings.pro' || die "enable lirc sed failed" - fi - if use nvidia ; then - sed -e 's:#CONFIG += using_xvmc:CONFIG += using_xvmc:' \ - -e 's:#DEFINES += USING_XVMC:DEFINES += USING_XVMC:' \ - -e 's:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:' \ - -i 'settings.pro' || die "enable xvmc sed failed" - fi - if use cle266 ; then - sed -e 's:#CONFIG += using_viahwslice:CONFIG += using_viahwslice:' \ - -e 's:#DEFINES += USING_VIASLICE:DEFINES += USING_VIASLICE:' \ - -e 's:#EXTRA_LIBS += -lddmpeg:EXTRA_LIBS += -lddmpeg:' \ - -i 'settings.pro' || die "enable lirc sed failed" - fi - if use opengl ; then - sed -e 's:#DEFINES += USING_OPENGL_VSYNC:DEFINES += USING_OPENGL_VSYNC:' \ - -e 's:#EXTRA_LIBS += -lGL -lGLU:EXTRA_LIBS += -lGL -lGLU:' \ - -i 'settings.pro' || die "enable opgenl sed failed" - fi - - qmake -o "Makefile" "${PN}.pro" - - econf || die "econf failed" - emake -j1 || die "compile problem" -} - -src_install() { - einstall INSTALL_ROOT="${D}" - newbin "setup/setup" "mythsetup" - - dodir /etc/mythtv - mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv" - dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt - - insinto /usr/share/mythtv/database - doins database/* - - exeinto /usr/share/mythtv - doexe "${FILESDIR}/mythfilldatabase.cron" - - exeinto /etc/init.d - newexe "${FILESDIR}/mythbackend.rc6" mythbackend - insinto /etc/conf.d - newins "${FILESDIR}/mythbackend.conf" mythbackend - - dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.{txt,pdf} - dohtml docs/*.html - - keepdir /var/{log,run}/mythtv -} - -pkg_postinst() { - ewarn "Please note that /usr/share/mythtv/setup has been moved" - ewarn "to /usr/bin/mythsetup" - echo - - einfo "If this is the first time you install MythTV," - einfo "you need to add /usr/share/mythtv/database/mc.sql" - einfo "to your mysql database." - einfo - einfo "You might run 'mysql < /usr/share/mythtv/database/mc.sql'" - einfo - einfo "Next, you need to run the mythsetup program." - einfo "It will ask you some questions about your hardware, and" - einfo "then run XMLTV's grabber to configure your channels." - einfo - einfo "Once you have configured your database, you can run" - einfo "/usr/bin/mythfilldatabase to populate the schedule" - einfo "or copy /usr/share/mythtv/mythfilldatabase.cron to" - einfo "/etc/cron.daily for this to happen automatically." - einfo - einfo "If you're upgrading from an older version and for more" - einfo "setup and usage instructions, please refer to:" - einfo " /usr/share/doc/${PF}/README.gz" - einfo " /usr/share/doc/${PF}/UPGRADING.gz" - echo - einfo "You need to emerge xmltv manually since it is no longer needed" - einfo "if the internal DataDirect implementation is to be used." -} diff --git a/media-tv/mythtv/mythtv-0.15.1-r1.ebuild b/media-tv/mythtv/mythtv-0.16.20050115.ebuild index 3b73efe1a880..665e5a711d04 100644 --- a/media-tv/mythtv/mythtv-0.15.1-r1.ebuild +++ b/media-tv/mythtv/mythtv-0.16.20050115.ebuild @@ -1,17 +1,20 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.15.1-r1.ebuild,v 1.9 2004/09/21 04:49:10 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.20050115.ebuild,v 1.1 2005/01/18 20:11:18 cardoe Exp $ -inherit flag-o-matic eutils gcc +inherit myth flag-o-matic eutils -DESCRIPTION="Homebrew PVR project." +DESCRIPTION="Homebrew PVR project" HOMEPAGE="http://www.mythtv.org/" -SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/mythtv-0.16.20050115.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ~amd64" -IUSE="alsa arts dvb directfb lcd lirc nvidia cle266 opengl X xv debug" +KEYWORDS="~x86 ~amd64" +IUSE="alsa arts dvb directfb lcd lirc nvidia cle266 opengl X xv oss mmx" + +S=${WORKDIR}/mythtv DEPEND=">=media-libs/freetype-2.0 >=media-sound/lame-3.93.1 @@ -25,63 +28,65 @@ DEPEND=">=media-libs/freetype-2.0 lcd? ( app-misc/lcdproc ) lirc? ( app-misc/lirc ) nvidia? ( media-video/nvidia-glx ) - cle266? ( media-libs/libddmpeg ) - opengl? ( >=x11-base/opengl-update-1.7 ) || ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )" RDEPEND="${DEPEND} !media-tv/mythfrontend" -use debug && FEATURES="${FEATURES} nostrip" - pkg_setup() { - if use X; then QTP=x11-libs/qt; else QTP=x11-libs/qt-embedded; fi + if use X; then + QTP=x11-libs/qt + elif use directfb; then + QTP=x11-libs/qt-embedded + else + eerror "You must have either X or directfb in USE" + die "No QT library selected" + fi + local qt_use="$(</var/db/pkg/`best_version ${QTP}`/USE)" - if [ ! "`has mysql ${qt_use}`" ] ; then + if ! has mysql ${qt_use} ; then eerror "Qt is missing MySQL support. Please add" eerror "'mysql' to your USE flags, and re-emerge Qt." die "Qt needs MySQL support" fi - if use opengl ; then - local gl_implementation="$( opengl-update --get-implementation )" - if [ "$gl_implementation" == "xfree" ] || [ "$gl_implementation" == "xorg-x11" ] ; then - return 0 - else - eerror "OpenGL implementation must be set to either xfree or xorg-x11 to allow compilation." - eerror "to change opengl implemantation use opengl-update <your xserver>." - eerror "After mythtv has been merged you can switch back to the preferred implementation.." - die "Incompatible OpenGL implementation." - fi + + if ! use oss && ! use alsa && ! use arts ; then + eerror "You must have one of oss alsa or arts enabled" + die "No audio selected" fi return 0 } -src_unpack() { - unpack ${A} && cd ${S} +setup_pro() { + sed -e 's:EXTRA_LIBS += -L/usr/X11R6/lib -lXinerama -lXv -lX11 -lXext -lXxf86vm:EXTRA_LIBS += -lXinerama -lXv -lX11 -lXext -lXxf86vm:' \ + -i 'settings.pro' || die "failed to remove extra library path" - for i in `grep -lr "usr/local" "${S}"` ; do - sed -e "s:usr/local:usr:g" -i "${i}" || die "sed failed" - done - use directfb && epatch ${FILESDIR}/mythtv-0.15-directfb.patch + if [ "${ARCH}" == "amd64" ] || ! use mmx; then + sed -i settings.pro \ + -e "s:DEFINES += MMX:DEFINES -= MMX:" + fi - # Applies patch for gcc-3.4.0 closing bug #52819 - if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then - epatch ${FILESDIR}/gcc-3.4-fix.patch + if ! use X ; then + sed -e 's:CONFIG += using_x11:#CONFIG += using_x11:' \ + -i 'settings.pro' || die "disable x11 failed" fi -} -src_compile() { - # Fix bugs 40964 and 42943. - filter-flags -fforce-addr -fPIC + if ! use xv ; then + sed -e 's:CONFIG += using_xv:#CONFIG += using_xv:' \ + -e 's:EXTRA_LIBS += -L/usr/X11R6/lib:#EXTRA_LIBS += -L/usr/X11R6/lib:' \ + -i 'settings.pro' || die "disable xv failed" + fi - if [ "${ARCH}" == "amd64" ]; then - sed -e "s:-march=pentiumpro::" -e "/DEFINES += MMX/d" -i settings.pro - else - local cpu="`get-flag march || get-flag mcpu`" - if [ "${cpu}" ] ; then - sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed" - fi + if use lcd ; then + sed -e 's:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:' \ + -i 'settings.pro' || die "enable lcd sed failed" + fi + + if ! use oss ; then + sed -e 's:CONFIG += using_oss:#CONFIG += using_oss:' \ + -e 's:DEFINES += USING_OSS:#DEFINES += USING_OSS:' \ + -i 'settings.pro' || die "disable oss failed" fi if use alsa ; then @@ -89,6 +94,7 @@ src_compile() { -e 's:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:' \ -i 'settings.pro' || die "enable alsa sed failed" fi + if use arts ; then sed -e 's:artsc/artsc.h:artsc.h:' \ -i "libs/libmyth/audiooutputarts.h" || die "sed failed" @@ -98,77 +104,87 @@ src_compile() { -e 's:#INCLUDEPATH += /opt/.*:QMAKE_CXXFLAGS += `artsc-config --cflags`:' \ -i 'settings.pro' || die "enable arts sed failed" fi - if use directfb ; then - sed -e 's:#CONFIG += using_directfb:CONFIG += using_directfb:' \ - -e 's:#EXTRA_LIBS += `directfb:EXTRA_LIBS += `directfb:' \ - -e 's:#QMAKE_CXXFLAGS += `directfb:QMAKE_CXXFLAGS += `directfb:' \ - -i 'settings.pro' || die "enable directfb sed failed" - fi + if use dvb ; then sed -e 's:#CONFIG += using_dvb:CONFIG += using_dvb:' \ -e 's:#DEFINES += USING_DVB:DEFINES += USING_DVB:' \ -e 's:#INCLUDEPATH += /usr/src/.*:INCLUDEPATH += /usr/include/linux/dvb:' \ -i 'settings.pro' || die "enable dvb sed failed" fi - if use lcd ; then - sed -e 's:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:' \ - -i 'settings.pro' || die "enable lcd sed failed" - fi + if use lirc ; then sed -e 's:#CONFIG += using_lirc:CONFIG += using_lirc:' \ -e 's:#LIRC_LIBS = -llirc_client:LIRC_LIBS = -llirc_client:' \ -i 'settings.pro' || die "enable lirc sed failed" fi + if use nvidia ; then sed -e 's:#CONFIG += using_xvmc:CONFIG += using_xvmc:' \ -e 's:#DEFINES += USING_XVMC:DEFINES += USING_XVMC:' \ -e 's:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:' \ -i 'settings.pro' || die "enable nvidia xvmc sed failed" fi + if use cle266 ; then - sed -e 's:#CONFIG += using_viahwslice:CONFIG += using_viahwslice:' \ - -e 's:#DEFINES += USING_VIASLICE:DEFINES += USING_VIASLICE:' \ - -e 's:#EXTRA_LIBS += -lddmpeg:EXTRA_LIBS += -lddmpeg:' \ + sed -e 's:#EXTRA_LIBS += -lviaXvMC -lXvMC:EXTRA_LIBS += -lviaXvMC -lXvMC:' \ -i 'settings.pro' || die "enable cle266 sed failed" fi + + if ! use cle266 ; then + sed -e 's:CONFIG += using_xvmc using_xvmc_vld:#CONFIG += using_xvmc using_xvmc_vld:' \ + -e 's:DEFINES += USING_XVMC USING_XVMC_VLD:#DEFINES += USING_XVMC USING_XVMC_VLD:' \ + -i 'settings.pro' || die "disable VLD XvMC sed failed" + fi + + if use directfb ; then + sed -e 's:#CONFIG += using_directfb:CONFIG += using_directfb:' \ + -e 's:#EXTRA_LIBS += `directfb:EXTRA_LIBS += `directfb:' \ + -e 's:#QMAKE_CXXFLAGS += `directfb:QMAKE_CXXFLAGS += `directfb:' \ + -i 'settings.pro' || die "enable directfb sed failed" + fi if use opengl ; then sed -e 's:#DEFINES += USING_OPENGL_VSYNC:DEFINES += USING_OPENGL_VSYNC:' \ - -e 's:#EXTRA_LIBS += -lGL -lGLU:EXTRA_LIBS += -lGL -lGLU:' \ + -e 's:#EXTRA_LIBS += -lGL:EXTRA_LIBS += -lGL:' \ + -e 's:#CONFIG += using_opengl:CONFIG += using_opengl:' \ -i 'settings.pro' || die "enable opengl sed failed" fi - if ! use X ; then - sed -e 's:CONFIG += using_x11:#CONFIG += using_x11:' \ - -i 'settings.pro' || die "disable x11 failed" - fi + #Gentoo X ebuilds always have XrandrX + sed -e 's:#CONFIG += using_xrandr:CONFIG += using_xrandr:' \ + -e 's:#DEFINES += USING_XRANDR:DEFINES += USING_XRANDR:' \ + -i 'settings.pro' || die "enable xrandr sed failed" +} - if ! use xv ; then - sed -e 's:CONFIG += using_xv:#CONFIG += using_xv:' \ - -e 's:EXTRA_LIBS += -L/usr/X11:#EXTRA_LIBS += -L/usr/X11:' \ - -i 'settings.pro' || die "disable xv failed" - fi +src_unpack() { + # Fix bugs 40964 and 42943. + filter-flags -fforce-addr -fPIC - if use debug ; then - sed -e 's:#CONFIG += debug:CONFIG += debug:' \ - -e 's:CONFIG += release:#CONFIG += release:' \ - -i 'settings.pro' || die "enable debug failed" - fi + # fix bug 67832, fix can be removed for 0.17 when its released + is-flag "-march=pentium4" && replace-flags "-O3" "-O2" - sed -i -e "s:-O3::g" -e "s:-fomit-frame-pointer::g" settings.pro + myth_src_unpack +} +src_compile() { export QMAKESPEC="linux-g++" - qmake -o "Makefile" "${PN}.pro" - econf || die "econf failed" + econf || die sed -i -e "s:OPTFLAGS=.*:OPTFLAGS=${CFLAGS}:g" config.mak - # enable exceptions if they are disabled (qt-e). - # this might not work.. if so, rebuild qt-e with rtti and exceptions - sed -i -e "s:-fno-exceptions:-fexceptions:g" programs/mythfilldatabase/Makefile - emake -j1 || die "compile problem" + + qmake -o "Makefile" "${PN}.pro" + make qmake || die + emake -C libs/libavcodec || die + emake -C libs/libavformat || die + emake -C libs/libmythsamplerate || die + emake -C libs/libmythsoundtouch || die + emake -C libs/libmyth || die + emake -C libs/libmythtv || die + emake -C libs + emake || die } src_install() { - einstall INSTALL_ROOT="${D}" + myth_src_install newbin "setup/setup" "mythsetup" dodir /etc/mythtv @@ -186,37 +202,8 @@ src_install() { insinto /etc/conf.d newins "${FILESDIR}/mythbackend.conf" mythbackend - dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.{txt,pdf} + dodoc keys.txt docs/*.{txt,pdf} dohtml docs/*.html keepdir /var/{log,run}/mythtv } - -pkg_postinst() { - ewarn "Please note that /usr/share/mythtv/setup has been moved" - ewarn "to /usr/bin/mythsetup" - echo - - einfo "If this is the first time you install MythTV," - einfo "you need to add /usr/share/mythtv/database/mc.sql" - einfo "to your mysql database." - einfo - einfo "You might run 'mysql < /usr/share/mythtv/database/mc.sql'" - einfo - einfo "Next, you need to run the mythsetup program." - einfo "It will ask you some questions about your hardware, and" - einfo "then run XMLTV's grabber to configure your channels." - einfo - einfo "Once you have configured your database, you can run" - einfo "/usr/bin/mythfilldatabase to populate the schedule" - einfo "or copy /usr/share/mythtv/mythfilldatabase.cron to" - einfo "/etc/cron.daily for this to happen automatically." - einfo - einfo "If you're upgrading from an older version and for more" - einfo "setup and usage instructions, please refer to:" - einfo " /usr/share/doc/${PF}/README.gz" - einfo " /usr/share/doc/${PF}/UPGRADING.gz" - echo - einfo "You need to emerge xmltv manually since it is no longer needed" - einfo "if the internal DataDirect implementation is to be used." -} diff --git a/media-tv/mythtv/mythtv-0.16.ebuild b/media-tv/mythtv/mythtv-0.16.ebuild index e055bc35a85e..96aa726100f4 100644 --- a/media-tv/mythtv/mythtv-0.16.ebuild +++ b/media-tv/mythtv/mythtv-0.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.ebuild,v 1.10 2004/12/16 21:33:07 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.ebuild,v 1.11 2005/01/18 20:11:18 cardoe Exp $ inherit myth flag-o-matic eutils |