diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2005-05-09 19:13:15 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2005-05-09 19:13:15 +0000 |
| commit | dc3e2b4496fbe105a76ca49835688a55379c618b (patch) | |
| tree | f72b653f2b324c4510e43dbd89fdd185add93032 /media-video/mplayer | |
| parent | Purge -frename-registers (diff) | |
| download | gentoo-2-dc3e2b4496fbe105a76ca49835688a55379c618b.tar.gz gentoo-2-dc3e2b4496fbe105a76ca49835688a55379c618b.tar.bz2 gentoo-2-dc3e2b4496fbe105a76ca49835688a55379c618b.zip | |
Fix bug #91351
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre6-r6.ebuild | 8 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre7.ebuild | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 4721706ed4b6..b641e3d15add 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.311 2005/05/09 19:06:01 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.312 2005/05/09 19:13:15 lu_zero Exp $ + + 09 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild, + mplayer-1.0_pre7.ebuild: + 3dfx requires dga. Fix for bug #91351 09 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild, mplayer-1.0_pre7.ebuild: diff --git a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild index 5b325ee32a43..6fabd1662e55 100644 --- a/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild @@ -1,6 +1,6 @@ # 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-r6.ebuild,v 1.8 2005/05/09 19:06:01 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6-r6.ebuild,v 1.9 2005/05/09 19:13:15 lu_zero Exp $ inherit eutils flag-o-matic kernel-mod @@ -315,8 +315,12 @@ src_compile() { # --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" + # 3dfx requires dga + if ! use dga && ! use 3dfx ; then + myconf="${myconf} --disable-dga" + fi + # 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_pre7.ebuild b/media-video/mplayer/mplayer-1.0_pre7.ebuild index 0bfabd3d81ca..dfa47111cba3 100644 --- a/media-video/mplayer/mplayer-1.0_pre7.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre7.ebuild @@ -1,6 +1,6 @@ # 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_pre7.ebuild,v 1.9 2005/05/09 19:06:01 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.10 2005/05/09 19:13:15 lu_zero Exp $ inherit eutils flag-o-matic kernel-mod @@ -298,8 +298,9 @@ src_compile() { # --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" - + if ! use dga && ! use 3dfx ; then + myconf="${myconf} --disable-dga" + fi # disable png *only* if gtk && png aren't on if use png || use gtk; then myconf="${myconf} --enable-png" |