From 8f555b3f402bb1acc819291e0cf7d3b0440bb497 Mon Sep 17 00:00:00 2001 From: Chris White Date: Sun, 24 Oct 2004 01:36:10 +0000 Subject: [PATCH] Fixed Live issues in Bug #68649 and half solved configure issues in Bug #61451 regarding real directories. --- media-video/mplayer/ChangeLog | 6 +++- media-video/mplayer/Manifest | 4 +-- .../mplayer/mplayer-1.0_pre4-r7.ebuild | 33 ++++++++++++------- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index ff753d7cd08c..9e55685b3b0b 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.217 2004/10/23 23:10:47 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.218 2004/10/24 01:36:10 chriswhite Exp $ + + 24 Oct 2004; Chris White mplayer-1.0_pre4-r7.ebuild: + Fixed Live issues in Bug #68649 and half solved configure issues in Bug #61451 + regarding real directories. 23 Oct 2004; Chris White mplayer-1.0_pre5-r2.ebuild: Fixed epatch issues. diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 1908124dde02..ec0ac54af8b8 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,6 +1,6 @@ -MD5 f38ab9a4eb25e4ecc306f9feb6473dce ChangeLog 40651 +MD5 126799c052876ce2c58ace914fd6f916 ChangeLog 40842 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224 -MD5 bfb6d9ef1418c847523f8294f7876786 mplayer-1.0_pre4-r7.ebuild 12485 +MD5 f65b87d3ad08ffae38278512a81ecbfd mplayer-1.0_pre4-r7.ebuild 12571 MD5 5ce773316e054bc500d6c2a21b23675e mplayer-1.0_pre5-r2.ebuild 14052 MD5 cae496a8886a461caa91d3f1904604ec mplayer-1.0_pre5-r3.ebuild 15427 MD5 71f585387107d02b1044d0133bcb09b8 mplayer-1.0_pre5-r4.ebuild 15414 diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild index e08cd4aa0baf..11d9d2736eae 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.17 2004/10/22 05:26:30 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.18 2004/10/24 01:36:10 chriswhite Exp $ inherit eutils flag-o-matic kmod -IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mmx mmx2 mpeg mythtv nas network nls oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xv xvid gnome" +IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mmx mmx2 mpeg mythtv nas network nls oggvorbis opengl oss png real rtc samba sdl sse svga tga theora truetype v4l v4l2 xinerama X xmms xv xvid gnome" BLUV=1.4 SVGV=1.9.17 @@ -61,8 +61,12 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) svga? ( media-libs/svgalib ) !ia64? ( theora? ( media-libs/libtheora ) - live? ( >=media-plugins/live-2004.03.27 ) + live? ( + x86? ( >=media-plugins/live-2004.07.20 ) + amd64? ( >=media-plugins/live-2004.03.27 ) + alpha? ( >=media-plugins/live-2004.03.27 ) ) + ) truetype? ( >=media-libs/freetype-2.1 ) xinerama? ( virtual/x11 ) xmms? ( media-sound/xmms ) @@ -113,6 +117,12 @@ src_unpack() { #adds mythtv support to mplayer use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch + #fixes a live api bug + if use live && use x86 + then + epatch ${FILESDIR}/mplayer-1.0_pre5-live.patch + fi + # GCC 3.4 fixes epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch @@ -212,14 +222,15 @@ src_compile() { myconf="${myconf} $(use_enable mmx)" myconf="${myconf} $(use_enable mmx2)" - if [ -d /opt/RealPlayer9/Real/Codecs ]; then - einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..." - REALLIBDIR="/opt/RealPlayer9/Real/Codecs" - elif [ -d /opt/RealPlayer8/Codecs ]; then - einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..." - REALLIBDIR="/opt/RealPlayer8/Codecs" - else - REALLIBDIR="/usr/lib/real" + if use real + then + if [ -d /usr/lib/win32 ] + then + REALLIBDIR="/usr/lib/win32" + else + eerror "Real libs not found! Install a stable version of win32codecs" + die "Real libs not found" + fi fi if [ -e /dev/.devfsd ]; then -- 2.26.2