Added dga logic to fix bug #80861.

Package-Manager: portage-2.0.51-r15

4 files changed, 29 insertions, 12 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index aef43e3025a0..c0885c0ba742 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.269 2005/02/06 06:45:55 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.270 2005/02/06 15:28:08 chriswhite Exp $
+
+  07 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  Added dga logic to fix bug #80861.
 
   06 Feb 2005; Chris White <chriswhite@gentoo.org> files/mplayer-x11.patch:
   Fixing the patch to work with 71478's issue as well.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 864e4583f21c..41c90f7ebd4e 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b2b6e470405cd0df78230bda4e990486 ChangeLog 49532
+MD5 914df48fe270bbc8c858f5b9e7cbc214 ChangeLog 49676
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225
 MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050
 MD5 101520d159844f194c02877d2c7e30d4 mplayer-1.0_pre5-r3.ebuild 14870
 MD5 db18f76ee40620f5142febc063834345 mplayer-1.0_pre5-r4.ebuild 16471
-MD5 08e936e3712e6ec7cfe953fd1ed7f7d1 mplayer-1.0_pre5-r5.ebuild 16508
-MD5 4ef6527932ee82af09fc51159abbe642 mplayer-1.0_pre6.ebuild 15861
+MD5 1bda3f3470642ccbbbaa1d3a154afbce mplayer-1.0_pre5-r5.ebuild 16752
+MD5 17888ae56ef8f2d530e2179f7e6592d5 mplayer-1.0_pre6.ebuild 16104
 MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
@@ -48,7 +48,7 @@ MD5 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCBb00FdQwWVoAgN4RAqPzAKC2yQ8vshC4bpO75B4mcinSeFupSQCg+d1T
-pFUBP/MAW4J0DdnUTuQasPw=
-=lfWE
+iD8DBQFCBjeaFdQwWVoAgN4RAqLwAJ9Gec4KetdsxvV2N5GiFHsiHud5hgCePM9C
+BvTXE2ayUOegzhrOrlGvR10=
+=UuFN
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index 98eee05f974f..df0119ebe775 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 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-r5.ebuild,v 1.22 2005/02/06 06:30:35 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.23 2005/02/06 15:28:08 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-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 sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug dga 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 sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -38,6 +38,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
+	dga? ( virtual/x11 )
 	dvd? ( dvdread? ( media-libs/libdvdread ) )
 	encode? (
 		media-sound/lame
@@ -273,6 +274,12 @@ src_compile() {
 		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
 	fi
 
+	# this looks like a hack, but the 
+	# --enable-dga needs a paramter, but there's no surefire
+	# way to tell what it is.. so I'm letting MPlayer decide
+	# the enable part
+	use !dga && myconf="${myconf} --disable-dga"
+
 	# disable png *only* if gtk && png aren't on
 	if use png || use gtk; then
 		myconf="${myconf} --enable-png"
diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild
index adc101368919..b6bb6155733b 100644
--- a/media-video/mplayer/mplayer-1.0_pre6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.24 2005/02/06 06:30:35 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.25 2005/02/06 15:28:08 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dts
-dvb cdparanoia directfb dvd dv 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 nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv 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 nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -38,6 +37,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	arts? ( kde-base/arts )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
+	dga? ( virtual/x11 )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvd? ( dvdread? ( media-libs/libdvdread ) )
@@ -246,6 +246,12 @@ src_compile() {
 		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
 	fi
 
+	# this looks like a hack, but the
+	# --enable-dga needs a paramter, but there's no surefire
+	# way to tell what it is.. so I'm letting MPlayer decide
+	# the enable part
+	use !dga && myconf="${myconf} --disable-dga"
+
 	# disable png *only* if gtk && png aren't on
 	if use png || use gtk; then
 		myconf="${myconf} --enable-png"