Fix liba52 handling wrt #317797 by Simone Scanzoni.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 10 insertions, 14 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/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"