Remove USE musepack since ffmpeg offers internal codecs for SV7 and SV8 support.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 19 insertions, 12 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 80459512c0b5..4eee8a1cd322 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.652 2009/07/24 22:46:58 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.653 2009/07/26 10:48:35 ssuominen Exp $
+
+  26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer-1.0_rc2_p20090530.ebuild, mplayer-9999.ebuild:
+  Remove USE musepack since ffmpeg offers internal codecs for SV7 and SV8
+  support.
 
   24 Jul 2009; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
   Drop support for old AMR libs
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index e5368a1b1963..8d6daf4bbaf2 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -13,8 +13,8 @@ DIST mplayer-1.0_rc2_p20090530.tar.bz2 8207308 RMD160 d76dc6475fdd2892190f900d2d
 DIST mplayer-1.0_rc2_p28450.tar.bz2 8159720 RMD160 3c287a1cc63cc82c686abbe985fa4c46e0541fe3 SHA1 97e286c033a6c514a008a017b8bdd3d2e4327036 SHA256 6e8fb85fcf02161d265a7a081ba17df25fd1dd75f2714f97b240e08a8aa67131
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
 EBUILD mplayer-1.0_rc2_p20090322.ebuild 19353 RMD160 ae92efe3b47ddb3259dbbe48241f15b440aa699e SHA1 7885a0f8821c47cb1903252aa21bca0181e1869e SHA256 18a8d0bc8a73fc4091a717dfd9d069f80da75fabbc96883e37b3dcaf1ce829fd
-EBUILD mplayer-1.0_rc2_p20090530.ebuild 19279 RMD160 5a113edd7aa58ce80f04c9bd1d9eacf0f0aa3fe0 SHA1 98421d5a76c3039fa8d4448f0978125ecf8ce64a SHA256 dde6e306ab8a431575306ce9a607610d196e67fc2a5a804343ee4a65d65e6d1b
+EBUILD mplayer-1.0_rc2_p20090530.ebuild 19314 RMD160 7f032d9eb0efa7dfe4780a0687b8c3db22889b7f SHA1 aad5293ea37234498c69a2d58ef8ea94b669bcd0 SHA256 1a24b0028c8a54462a743731b8bf91545d90f68ffe6077601300a7546cea1c8b
 EBUILD mplayer-1.0_rc2_p28450.ebuild 17803 RMD160 c89f570c099ff5b520a09d4b63e7cbdf233e106a SHA1 e1f3a552776c6e9d83440096dc6e5f14fc0fb872 SHA256 098ae1eb72d0a1d3fb5b87af573008ea54dacc90478b16b66b37de2b094467af
-EBUILD mplayer-9999.ebuild 19523 RMD160 002e411240bff78d199faaab3153520924c72ef7 SHA1 9f6bafd9e12d76d31bae9c894ef2d26ef9b60980 SHA256 198a212976fbf07bef0ec3ad93f86bdcbf4523b504a1cf05ddf88ef442a6d701
-MISC ChangeLog 114988 RMD160 c9c61ade3a158fa0eac02ac0d08aee571101cd0b SHA1 f69a1d69f57ac8974aa69d549075ee851c361bcc SHA256 03856034d254a32ef2f73c3c9f7d51bc75b887d0d6b61a41957d1151f7aaea02
+EBUILD mplayer-9999.ebuild 19550 RMD160 bd37c1ae0edc8111cd301945f9f528523c554a2a SHA1 95f440fe429dcb01779dee39b8bca33fc78d5f15 SHA256 7b798f97de2b81a8685b48bd9592c63d8fd1fb1a2ce570ae88dfa81f5cd3ff73
+MISC ChangeLog 115187 RMD160 b0b7176fb7cdab7ab83c0828048491ae9dab11ae SHA1 1b4c41968e7f6c45fecb5dbdab3b13fa39e4dd11 SHA256 da954a26fa1e951eb149a1912c3deb5987e09dfcc0017c5013e88f0f25f81668
 MISC metadata.xml 3593 RMD160 d613446febcde8437b7538d90faa4460564a853f SHA1 daca810ed4b0deff90353a51d090ef968e66a701 SHA256 4e990fc238b931183832494e563a98b81306535c289f1e54cc933237dfa8d846
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
index f2e4d3cb9d1e..bc9f9ea3bee7 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.10 2009/06/21 19:02:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.11 2009/07/26 10:48:35 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags
 custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
 +enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack
 joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
-mmxext mng +mp2 +mp3 musepack nas +nemesi +network nut openal +opengl +osdmenu
+mmxext mng +mp2 +mp3 nas +nemesi +network nut openal +opengl +osdmenu
 oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm
 +schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
 +truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim
@@ -89,7 +89,6 @@ RDEPEND="sys-libs/ncurses
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	opengl? ( virtual/opengl )
@@ -350,6 +349,8 @@ src_configure() {
 	########
 	# Won't work with external liba52
 	myconf="${myconf} --disable-liba52"
+	# Use internal musepack codecs for SV7 and SV8 support
+	myconf="${myconf} --disable-musepack"
 
 	use aac || myconf="${myconf} --disable-faad-internal"
 	use amrnb || myconf="${myconf} --disable-libamr_nb"
@@ -364,7 +365,7 @@ src_configure() {
 	use schroedinger || myconf="${myconf} --disable-libschroedinger-lavc"
 	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
 	! use png && ! use gmplayer && myconf="${myconf} --disable-png"
-	for x in gif jpeg live mad mng musepack pnm speex tga theora xanim; do
+	for x in gif jpeg live mad mng pnm speex tga theora xanim; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
 	if use vorbis || use tremor; then
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index d434ee4ba9a6..a0ea37cf8b5c 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.9 2009/07/24 22:46:58 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.10 2009/07/26 10:48:35 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags
 custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
 +enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack
 joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
-mmxext mng +mp2 +mp3 musepack nas +nemesi +network nut openal +opengl +osdmenu
+mmxext mng +mp2 +mp3 nas +nemesi +network nut openal +opengl +osdmenu
 oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm
 +schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
 +truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim
@@ -108,7 +108,6 @@ RDEPEND="sys-libs/ncurses
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
@@ -389,6 +388,8 @@ src_configure() {
 	########
 	# Won't work with external liba52
 	myconf="${myconf} --disable-liba52"
+	# Use internal codecs for SV7 and SV8 support
+	myconf="${myconf} --disable-musepack"
 
 	use aac || myconf="${myconf} --disable-faad-internal"
 	use dirac || myconf="${myconf} --disable-libdirac-lavc"
@@ -401,7 +402,7 @@ src_configure() {
 	use schroedinger || myconf="${myconf} --disable-libschroedinger-lavc"
 	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
 	! use png && ! use gmplayer && myconf="${myconf} --disable-png"
-	for x in gif jpeg live mad mng musepack pnm speex tga theora xanim; do
+	for x in gif jpeg live mad mng pnm speex tga theora xanim; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
 	if use vorbis || use tremor; then