diff options
| author |   Chris White <chriswhite@gentoo.org> | 2004-10-20 23:23:28 +0000 |
|---|---|---|
| committer | Chris White <chriswhite@gentoo.org> | 2004-10-20 23:23:28 +0000 |
| commit | 76aefc04b633886a8d57cf21778f7c319dd2c76f (patch) | |
| tree | 19d849210989c23fefe721b5e867948ebce4361a /media-video | |
| parent | DEPEND fix (Manifest recommit) (diff) | |
| download | gentoo-2-76aefc04b633886a8d57cf21778f7c319dd2c76f.tar.gz gentoo-2-76aefc04b633886a8d57cf21778f7c319dd2c76f.tar.bz2 gentoo-2-76aefc04b633886a8d57cf21778f7c319dd2c76f.zip | |
Fixed some xvidix logic as per bug #28865.
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r7.ebuild | 10 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre5-r4.ebuild | 11 |
3 files changed, 22 insertions, 5 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 357ef2882d9d..f764000e13e0 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.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/mplayer-1.0_pre4-r7.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r7.ebuild index 47474ee1316d..47c7abded640 100644 --- 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 3ec7e46dfb54..d13e51b486ce 100644 --- 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 ) \ |