use libmpg123 for mp3 decoding and remove internal mp3lib, bug #384849 by Samuli Suominen

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 21 insertions, 11 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f04467924108..ef7fc9f0a19e 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.817 2011/12/16 13:36:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.818 2011/12/16 13:52:53 aballier Exp $
+
+  16 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  use libmpg123 for mp3 decoding and remove internal mp3lib, bug #384849 by
+  Samuli Suominen
 
   16 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   generate on the fly a snapshot version for live ebuilds and use that file for
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 7c6cb9a7aac3..ffeb302b2b87 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -12,13 +12,13 @@ DIST mplayer-1.0_rc4_p20110322.tar.xz 8323532 RMD160 7082c95fa20cb7e3d491546ae08
 DIST mplayer-1.0_rc4_p20111215.tar.xz 5209748 RMD160 294a0a6aaf773c0c59e772e059541a315b8134dd SHA1 69f46ffe5b26f1b30a4afbf66bae42f033fca199 SHA256 edb23cae8c49cace3ecb303b6d66490e9a143c5d2d9db803f9ec1bbbbb874635
 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20381 RMD160 19bc9b09ce7902b4a7b16d5b5bd2215dc07a7f1e SHA1 08e9ca9249683695feab78ca3644dcfa1cc586b8 SHA256 1322ed59489cec383d7dac04c752cd083132c21711183e5bc02d70b2a525ab94
 EBUILD mplayer-1.0_rc4_p20111215.ebuild 19479 RMD160 6048ba695449c7b2459f30647ddf00d11a5db393 SHA1 64aeeabfe1718112aafeb132c184fa3377490ae9 SHA256 bd76e50de8cd87faaca63fe48622c9dafe88d7a6af67b693a07487ed091b6a73
-EBUILD mplayer-9999.ebuild 19477 RMD160 5d090d0697a2306a41f642b678079c5b5ab77a0d SHA1 396cbece4146877bb62639264bc7cc975b78e8fe SHA256 b1de573802a09d5dd54257777f796c57d4125e0ebe6b0935b38f6957c16c4a56
-MISC ChangeLog 143029 RMD160 defb5bfa11070f3a89603a7c81d45262a3807ba3 SHA1 ab042640b40df156c706c52310c7114207288808 SHA256 be327d3ea807b563c26bbd256cc7e709d761de38ef260ae180dc15a4e5dfe116
+EBUILD mplayer-9999.ebuild 19806 RMD160 97909a74424a677905a90c23e9451434ba46de0b SHA1 1f1d8d1b8380dba91e8a4f03f1d55f4e75cf3347 SHA256 1361391a8a439c4fb2474eb3fe0fc1242f9904fc9c4e5ac49066511b0ac203d5
+MISC ChangeLog 143197 RMD160 88e37b28b29d6d5adeb7f668243849d4baaa53d3 SHA1 dcb0c550c55c1aaddc9093008212f701a632f827 SHA256 0ed668d9606099e2d7a709c0e81ec2f73a855ea4db8b519b528e566d03b7d36a
 MISC metadata.xml 3737 RMD160 7e18b891f225227f4ecad678e423777f5dd908a7 SHA1 daf40e426abbf0306e2ebeca72ebe54546d81e46 SHA256 dd83a6946f62cbeb84b0e65d2ba6289638d632b80a690714595a44aa3cf86c1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7rSUoACgkQvFcC4BYPU0oMkwCfW9dOchsCiVWhRlf0V/qkgw7v
-/cEAnReDhRANuQNtQONmrUcbHCW9OdW5
-=r1Tj
+iEYEARECAAYFAk7rTToACgkQvFcC4BYPU0ozMgCeP+NKHdJsXn7Z3ecuk11CBEYN
+LhkAn37fP8Bt8fW0l9ZU+5zfvkoiyAPG
+=tSX7
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 4d694d9b3b23..c453114b66a4 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.110 2011/12/16 13:36:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.111 2011/12/16 13:52:53 aballier Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas
+libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix
@@ -121,7 +121,7 @@ RDEPEND+="
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
-	mpg123? ( media-sound/mpg123 )
+	mp3? ( media-sound/mpg123 )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
@@ -396,10 +396,16 @@ 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
-			--disable-mp3lib
+			--disable-mpg123
 		"
 	fi
 	uses="a52 bs2b dv gsm lzo rtmp"
@@ -407,7 +413,7 @@ src_configure() {
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
 
-	uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim"
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora xanim"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done