diff options
| author |   Daniel Ahlberg <aliz@gentoo.org> | 2004-06-02 21:45:18 +0000 |
|---|---|---|
| committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-06-02 21:45:18 +0000 |
| commit | 10558dd3b31c88d930d6a4bb52bedf2df1172a09 (patch) | |
| tree | e08a498b1b828b8bb65ad3db287e9aa4c0c90a10 /media-tv/mythfrontend | |
| parent | Added to ~ppc (Manifest recommit) (diff) | |
| download | gentoo-2-10558dd3b31c88d930d6a4bb52bedf2df1172a09.tar.gz gentoo-2-10558dd3b31c88d930d6a4bb52bedf2df1172a09.tar.bz2 gentoo-2-10558dd3b31c88d930d6a4bb52bedf2df1172a09.zip | |
Apply fixes from #52722 and #52154.
Diffstat (limited to 'media-tv/mythfrontend')
| -rw-r--r-- | media-tv/mythfrontend/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/mythfrontend/files/mythtv-0.15-directfb.patch | 19 | ||||
| -rw-r--r-- | media-tv/mythfrontend/mythfrontend-0.15.1.ebuild | 20 |
3 files changed, 41 insertions, 4 deletions
diff --git a/media-tv/mythfrontend/ChangeLog b/media-tv/mythfrontend/ChangeLog index 625067ee77a1..a0ff869a437e 100644 --- a/media-tv/mythfrontend/ChangeLog +++ b/media-tv/mythfrontend/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/mythfrontend # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.15 2004/06/01 17:25:48 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.16 2004/06/02 21:45:18 aliz Exp $ + + 02 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mythfrontend-0.15.1.ebuild: + + Added check for OpenGL implementation, closing #52722. + + Added directfb patch by Scott Alfer <gentoo@salfter.dyndns.org> from #52154. *mythfrontend-0.15.1 (01 Jun 2004) diff --git a/media-tv/mythfrontend/files/mythtv-0.15-directfb.patch b/media-tv/mythfrontend/files/mythtv-0.15-directfb.patch new file mode 100644 index 000000000000..7f72c06b111a --- /dev/null +++ b/media-tv/mythfrontend/files/mythtv-0.15-directfb.patch @@ -0,0 +1,19 @@ +*** 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/mythfrontend/mythfrontend-0.15.1.ebuild b/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild index f30fbad1908a..9776d81e44b5 100644 --- a/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild +++ b/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild,v 1.1 2004/06/01 17:25:48 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild,v 1.2 2004/06/02 21:45:18 aliz Exp $ -inherit flag-o-matic +inherit flag-o-matic eutils DESCRIPTION="Homebrew PVR project frontend." HOMEPAGE="http://www.mythtv.org/" @@ -25,7 +25,8 @@ DEPEND="virtual/x11 lcd? ( app-misc/lcdproc ) lirc? ( app-misc/lirc ) nvidia? ( media-video/nvidia-glx ) - cle266? ( media-libs/libddmpeg )" + cle266? ( media-libs/libddmpeg ) + opengl? ( >=x11-base/opengl-update-1.7 )" RDEPEND="${DEPEND} !media-tv/mythtv" @@ -40,6 +41,17 @@ pkg_setup() { 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 mythfrontend has been compiled you can switch back to the preferred implementation.." + die "Incompatible OpenGL implementation." + fi + fi return 0 } @@ -49,6 +61,8 @@ src_unpack() { 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 } src_compile() { |