Finished off Bug #61451 and closed bug #68552.

3 files changed, 22 insertions, 14 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 4d65985e83ec..c7a28fd9f752 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # 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.219 2004/10/24 01:41:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.220 2004/10/24 02:19:32 chriswhite Exp $
+
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Finished off Bug #61451 and closed bug #68552.
 
   24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
   Alpha stable marked live, so changing the dep/patch logic for it. Only amd64
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index eb20edaf7813..d3ff94ef993a 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,9 +1,9 @@
-MD5 be9b2880bea97463c09094ad4cca849b ChangeLog 41044
+MD5 c7829b3f9575e197f0724c2e442b4852 ChangeLog 41173
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 1b48b22f26fc4e284a525b0a7b87b947 mplayer-1.0_pre4-r7.ebuild 12588
 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
+MD5 0629093081de0a911a70e7ba03faeb07 mplayer-1.0_pre5-r4.ebuild 15433
 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r4 440
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
index d13e51b486ce..c2e38fbaee08 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r4.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_pre5-r4.ebuild,v 1.11 2004/10/20 23:23:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.12 2004/10/24 02:19:32 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	x86? (
 		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		>=media-libs/win32codecs-0.60
+		>=media-libs/win32codecs-20040916
 		)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -73,6 +73,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	xinerama? ( virtual/x11 )
 	jack? ( >=media-libs/bio2jack-0.3-r1 )
 	xmms? ( media-sound/xmms )
+	xanim? ( >=media-video/xanim-2.80.1-r4 )
 	>=sys-apps/portage-2.0.36
 	sys-libs/ncurses"
 
@@ -321,16 +322,20 @@ src_compile() {
 	myconf="${myconf} $(use_enable debug)"
 	myconf="${myconf} $(use_enable nls i18n)"
 
-	if [ -d /opt/RealPlayer9/Real/Codecs ]
+	if use real
 	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."
-		REALLIBDIR="/opt/RealPlayer9/Real/Codecs"
-	elif [ -d /opt/RealPlayer8/Codecs ]
+		if [ -d /usr/$(get_libdir)/real ]
+		then
+			REALLIBDIR="/usr/$(get_libdir)/real"
+		else
+			eerror "Real libs not found!  Install a stable version of win32codecs"
+			die "Real libs not found"
+		fi
+	fi
+
+	if use xanim
 	then
-		einfo "Setting REALLIBDIR to /opt/RealPlayer8/Codecs..."
-		REALLIBDIR="/opt/RealPlayer8/Codecs"
-	else
-		REALLIBDIR="/usr/$(get_libdir)/real"
+		myconf="${myconf} --with-xanimlibdir=/usr/lib/xanim/mods"
 	fi
 
 	if [ -e /dev/.devfsd ]