Fix liba52 handling wrt #317797 by Simone Scanzoni.

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

4 files changed, 13 insertions, 17 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ad79484aea96..be3a88ff24b1 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.733 2010/04/28 17:40:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.734 2010/04/29 17:08:12 ssuominen Exp $
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer-1.0_rc4_p20100427.ebuild, mplayer-9999.ebuild:
+  Fix liba52 handling wrt #317797 by Simone Scanzoni.
 
   28 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.0_rc4_p20100427.ebuild, mplayer-9999.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1ca347e56e3f..e6e21eeac5a5 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -13,7 +13,7 @@ DIST mplayer-1.0_rc4_p20100427.tar.bz2 16247617 RMD160 435eb69a406e2d53e92fd65cb
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
 EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8
-EBUILD mplayer-1.0_rc4_p20100427.ebuild 20402 RMD160 b60bd5eec354e049d9d06245cfe33c060d3b5859 SHA1 4066c05f84612da2aee429b1bfc587c4f0709595 SHA256 6e71b7996e0cf99fc39abd8fa1dc0bcfb7536c09b5d4e83d17e3dfd4ed6621a9
-EBUILD mplayer-9999.ebuild 20382 RMD160 0f458350617d5c883474d9c15960f26a00e25a2c SHA1 c3ed9b36ff501795b1be02a05aaeb5e84e4dd36f SHA256 71d6e9e087ecc22591d691c8e7b5cb9d72f33b0853a91151a3b8e87521fc2e4c
-MISC ChangeLog 129479 RMD160 3c87ee805107c196a009dda3fe7f65561cf1ff5a SHA1 85036201c206755afec532f23b917a5391dfe997 SHA256 3c5ad1253c64f084b4db710bc5bb1735884ca7d0661f939e90e4546c44cc57dd
+EBUILD mplayer-1.0_rc4_p20100427.ebuild 20242 RMD160 48f29cd100c754ef2ec959c49854a3c580cfd1bd SHA1 a20b43304ca84e28cc04a08896a6993fb733a99c SHA256 d3ce9ec7a9b5ba1d817b51e0a63e3c06f3d98a6f9f6b7c91fed90416f4ad9497
+EBUILD mplayer-9999.ebuild 20239 RMD160 1e3b57be6750211d57f1acda4c5f2d050fdb4652 SHA1 1106b98542435e5c466066aaf1e4d38ba7c61583 SHA256 52dcfdde36f3444fd0fd228c280a065aea07740bd58a289206605ccc883212cb
+MISC ChangeLog 129645 RMD160 efd07b3ec532963a59bf70d23201acdc947758dd SHA1 4d538a37e9b0279bbe3fa1d3969a7ab0b3ff8d16 SHA256 b2984e6bcbd2927c9082cdfa4250dce1eb9083e54014a5ee9b4340ef31b2a7af
 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild
index 5d91f9365e09..1a1698f8633b 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild,v 1.3 2010/04/28 17:40:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild,v 1.4 2010/04/29 17:08:12 ssuominen Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ FONT_URI="
 if [[ ${PV} == *9999* ]]; then
 	RELEASE_URI=""
 else
-	RELEASE_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+	RELEASE_URI="mirror://gentoo/${P}.tar.bz2"
 fi
 SRC_URI="${RELEASE_URI}
 	!truetype? ( ${FONT_URI} )
@@ -321,10 +321,6 @@ src_configure() {
 	#
 	# internal dvdread and dvdnav use flags enable internal
 	# versions of the libraries, which are snapshots of the fork.
-	#
-	# Only check for disabled a52 use flag inside the DVD check,
-	# since many users were getting confused why there was no
-	# audio stream.
 
 	if use dvd; then
 		use dvdnav || myconf+=" --disable-dvdnav"
@@ -335,7 +331,6 @@ src_configure() {
 			--disable-dvdread-internal
 			--disable-libdvdcss-internal
 		"
-		use a52 || myconf+=" --disable-liba52-internal"
 	fi
 
 	#############
@@ -399,6 +394,7 @@ src_configure() {
 	##########
 	# Won't work with external liba52
 	myconf+=" --disable-liba52"
+	use a52 && myconf+=" --enable-liba52-internal"
 	# Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-musepack"
 
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 9d433efb8c2c..0affbac409a5 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.53 2010/04/28 17:40:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.54 2010/04/29 17:08:12 ssuominen Exp $
 
 EAPI="2"
 
@@ -321,10 +321,6 @@ src_configure() {
 	#
 	# internal dvdread and dvdnav use flags enable internal
 	# versions of the libraries, which are snapshots of the fork.
-	#
-	# Only check for disabled a52 use flag inside the DVD check,
-	# since many users were getting confused why there was no
-	# audio stream.
 
 	if use dvd; then
 		use dvdnav || myconf+=" --disable-dvdnav"
@@ -335,7 +331,6 @@ src_configure() {
 			--disable-dvdread-internal
 			--disable-libdvdcss-internal
 		"
-		use a52 || myconf+=" --disable-liba52-internal"
 	fi
 
 	#############
@@ -399,6 +394,7 @@ src_configure() {
 	##########
 	# Won't work with external liba52
 	myconf+=" --disable-liba52"
+	use a52 && myconf+=" --enable-liba52-internal"
 	# Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-musepack"