summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-10-25 12:48:11 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-10-25 12:48:11 +0000
commitc1dcfe4ce3b76dab6ec6f84f09363436da13c015 (patch)
treee86c37030c4ea5477f3d1641e3e18b60815e9977 /media-video/mplayer
parentfix build with recent ffmpeg versions (diff)
downloadgentoo-2-c1dcfe4ce3b76dab6ec6f84f09363436da13c015.tar.gz
gentoo-2-c1dcfe4ce3b76dab6ec6f84f09363436da13c015.tar.bz2
gentoo-2-c1dcfe4ce3b76dab6ec6f84f09363436da13c015.zip
internal mp3lib is gone, no need to disable it anymore
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild8
2 files changed, 5 insertions, 8 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ebf71f616e5f..cd2a473983cd 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.863 2012/10/21 19:53:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.864 2012/10/25 12:48:11 aballier Exp $
+
+ 25 Oct 2012; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+ internal mp3lib is gone, no need to disable it anymore
21 Oct 2012; Anthony G. Basile <blueness@gentoo.org> mplayer-1.1-r1.ebuild:
stable ppc ppc64, bug #394809
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 4da9dd281240..ba3da7623d46 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.133 2012/06/21 08:10:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.134 2012/10/25 12:48:11 aballier Exp $
EAPI=4
@@ -369,12 +369,6 @@ src_configure() {
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
use dts || myconf+=" --disable-libdca"
- # Disable internal mp3lib, bug #384849
- # Samuli Suominen: Looks like MPlayer in Portage is using internal mp3lib by
- # default, where as mpg123 upstream has incorporated all the optimizations
- # from mplayer's mp3lib in libmpg123 and more.
- # It makes very little sense to use the internal copy as default anymore.
- myconf+=" --disable-mp3lib"
if ! use mp3; then
myconf+="
--disable-mp3lame