diff options
| author |   Chris White <chriswhite@gentoo.org> | 2005-01-22 21:27:47 +0000 |
|---|---|---|
| committer | Chris White <chriswhite@gentoo.org> | 2005-01-22 21:27:47 +0000 |
| commit | 525a7273581033c1355313ab1b02563921b88d00 (patch) | |
| tree | c79cf7791fe9fbc2ba0f513e5bfb3700bd1fa35c | |
| parent | Marked as stable, since 2.5a blows up. Fixes #68896. (diff) | |
| download | gentoo-2-525a7273581033c1355313ab1b02563921b88d00.tar.gz gentoo-2-525a7273581033c1355313ab1b02563921b88d00.tar.bz2 gentoo-2-525a7273581033c1355313ab1b02563921b88d00.zip | |
Fixed bug #78209. Also removed the gif lib logic in pre6 as it's no longer required (fixed upstream) and now gif is a true enable/disable style flag.
| -rw-r--r-- | media-video/mplayer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre5-r5.ebuild | 6 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre6.ebuild | 11 |
3 files changed, 11 insertions, 13 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index e2fde42038a7..20f29c9c8e3f 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # 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.258 2005/01/22 20:57:22 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.259 2005/01/22 21:27:47 chriswhite Exp $ + + 23 Jan 2005; Chris White <chriswhite@gentoo.org> + mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild: + Fixed bug #78209. Also removed the gif lib logic in pre6 as it's no longer + required (fixed upstream) and now gif is a true enable/disable style flag. 23 Jan 2005; Chris White <chriswhite@gentoo.org> +files/mplayer-nl.patch, mplayer-1.0_pre6.ebuild: diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild index 6fd85709da3b..d0d4257225d5 100644 --- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre5-r5.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_pre5-r5.ebuild,v 1.13 2005/01/22 17:37:15 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.14 2005/01/22 21:27:47 chriswhite Exp $ inherit eutils flag-o-matic kernel-mod @@ -43,8 +43,8 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) >=media-libs/libdv-0.9.5 ) esd? ( media-sound/esound ) - gif? ( media-libs/giflib ) - !gif? ( media-libs/libungif ) + gif? ( media-libs/libungif ) + !gif? ( media-libs/giflib ) ggi? ( media-libs/libggi ) gtk? ( media-libs/libpng diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild index ec48238a9bbb..40cfe1d87253 100644 --- a/media-video/mplayer/mplayer-1.0_pre6.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre6.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.ebuild,v 1.15 2005/01/22 20:57:22 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.16 2005/01/22 21:27:47 chriswhite Exp $ inherit eutils flag-o-matic kernel-mod @@ -44,8 +44,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) dv? ( >=media-libs/libdv-0.9.5 ) ) esd? ( media-sound/esound ) - gif? ( media-libs/giflib ) - !gif? ( media-libs/libungif ) + gif? ( ||( media-libs/giflib media-libs/libungif ) ) ggi? ( media-libs/libggi ) gtk? ( media-libs/libpng @@ -416,12 +415,6 @@ src_compile() { --disable-sse2 \ ${myconf} || die - # when gif is autodetected, GIF_LIB is set correctly. We're explicitly controlling it, and it doesn't behave correctly. - # so... we have to help it along. - if use gif; then - sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak - fi - einfo "Make" make all || die "Failed to build MPlayer!" einfo "Make completed" |