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 | d52cac55c604f34eee535af15f9296231ce2651e (patch) | |
| tree | 237a925c21e0fe1a98bb329657367887ef6ba65d /media-video | |
| parent | Purge -frename-registers (diff) | |
| download | historical-d52cac55c604f34eee535af15f9296231ce2651e.tar.gz historical-d52cac55c604f34eee535af15f9296231ce2651e.tar.bz2 historical-d52cac55c604f34eee535af15f9296231ce2651e.zip | |
Fix bug #91351
Package-Manager: portage-2.0.51.21-r1
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 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 |
4 files changed, 18 insertions, 9 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/Manifest b/media-video/mplayer/Manifest index b8ada5ff7bbe..d33b44754e99 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,8 +1,8 @@ -MD5 6bea9462ce2ae0a7aa1b3282f70a6b8e mplayer-1.0_pre7.ebuild 17793 +MD5 5b50ccea4affd391c6e41bea4398a156 mplayer-1.0_pre7.ebuild 17821 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 -MD5 7b3535e39153391ed4ea80124f164fc5 mplayer-1.0_pre6-r6.ebuild 18297 +MD5 7ea4bcc2e290fe74d884653eb1057ac9 mplayer-1.0_pre6-r6.ebuild 18351 MD5 211ad7e953c470d98d76ced823f35c47 mplayer-1.0_pre6-r4.ebuild 18378 -MD5 195d69c0ae290afdf1b318daef4ad9a4 ChangeLog 58328 +MD5 8c394d7d6b0112edcc54d1283cfc8a3a ChangeLog 58473 MD5 a4a22d4a21e777cdb8092558f341b81f mplayer-1.0_pre6-r5.ebuild 18466 MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r4 429 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" |