Fixed some xvidix logic as per bug #28865.

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 357ef2882d9d8f10c05d8587fb11292857b197e8..f764000e13e0660527b0c66afc78571e6a97d2ac 100644 (file)
--- 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.214 2004/10/20 00:03:01 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.215 2004/10/20 23:23:28 chriswhite Exp $
+
+  20 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Fixed some xvidix logic as per bug #28865.
 
   19 Oct 2004; Chris White <chriswhite@gentoo.org> :
   Did filter flags on a few problematic flags as per Bug #67903.

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 5593321e8300d73160d08430004e71d728815a0a..0cbce283b8a00b6640dd97fe89563cf4f7a3535b 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,7 +1,7 @@
-MD5 b20eb2d742e8c4c9bfb3a58bcd756f7c ChangeLog 40239
+MD5 c3f1cbeb02b3004f89dafa551d66fa1d ChangeLog 40394
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
-MD5 27d3b9d9184cc1f8a2e8a89acb03b161 mplayer-1.0_pre4-r7.ebuild 12329
-MD5 6c180023645a1cc5ad1a5d4a39fde89a mplayer-1.0_pre5-r4.ebuild 15335
+MD5 b5ed2878991f4ea23a7f7a86eb68b886 mplayer-1.0_pre4-r7.ebuild 12421
+MD5 71f585387107d02b1044d0133bcb09b8 mplayer-1.0_pre5-r4.ebuild 15414
 MD5 d994774e1e84665b3a64bdd961b63af8 mplayer-1.0_pre5-r2.ebuild 14055
 MD5 cae496a8886a461caa91d3f1904604ec mplayer-1.0_pre5-r3.ebuild 15427
 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107

diff --git a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
index 47474ee1316d93acc7b3f45872e811d8c358bd15..47c7abded64057fef186a389c1ebf7073270ae8d 100644 (file)
--- a/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.15 2004/10/17 00:21:47 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild,v 1.16 2004/10/20 23:23:28 chriswhite Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -199,6 +199,13 @@ src_compile() {
                myconf="${myconf} $(use_enable matrox xmga)"
        fi
 
+       if use svga
+       then
+               myconf="${myconf} --enable-svga"
+       else
+               myconf="${myconf} --disable-svga --disable-vidix"
+       fi
+
        myconf="${myconf} $(use_enable 3dnow)"
        myconf="${myconf} $(use_enable 3dnowex)"
        myconf="${myconf} $(use_enable sse)"
@@ -274,7 +281,6 @@ src_compile() {
                $(use_enable libcaca caca)      \
                $(use_enable opengl gl)         \
                $(use_enable sdl)               \
-               $(use_enable svga)              \
                $(use_enable tga)               \
                $(use_enable alsa)              \
                $(use_enable arts)              \

diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
index 3ec7e46dfb546f5a5e6dbb8feac479d423834cb2..d13e51b486ce84003b800d953b968ad60c477a88 100644 (file)
--- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2004/10/20 00:03:01 chriswhite Exp $
+# $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 $
 
 inherit eutils flag-o-matic kmod
 
@@ -259,7 +259,14 @@ src_compile() {
        fi
        myconf="${myconf} $(use_enable opengl gl)"
        myconf="${myconf} $(use_enable sdl)"
-       myconf="${myconf} $(use_enable svga)"
+
+       if use svga
+       then
+               myconf="${myconf} --enable-svga"
+       else
+               myconf="${myconf} --disable-svga --disable-vidix"
+       fi
+
        myconf="${myconf} $(use_enable tga)"
 
        ( use xvmc && use nvidia ) \