mplayer: further sync with portage version

3 files changed, 15 insertions, 42 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 8f98f79..325b1a3 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -7,6 +7,9 @@
 # provide additional features and eventually send some of them upstream.
 
   23 Jan 2012; Andrew Savchenko <bircoph@gmail.com> mplayer-9999.ebuild:
+  Update library requirements, remove custom-cpuopts as upstrem does.
+
+  23 Jan 2012; Andrew Savchenko <bircoph@gmail.com> mplayer-9999.ebuild:
   Remove esd as esound is to be removed from portage.
 
   25 Nov 2011; Andrew Savchenko <bircoph@gmail.com> mplayer-9999.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bcaaf8a..6651e8b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,7 +1,8 @@
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
-EBUILD mplayer-9999.ebuild 19868 RMD160 0072b2ae0b26514dc50563442d554ed657126511 SHA1 a73d1fc9545e092a908d551c89ec496bc9552eec SHA256 d24255221d7cd494afc875f165ee3bf52494a4286d4f352ad613cb0e6cb32564
-MISC ChangeLog 3740 RMD160 15420083b02b0fd1699a675faf2500b6d44c047c SHA1 f1bc02854840cc1444659713d5e2509c8f2920b8 SHA256 96f21db913948dfef0a9eef2b3eb14c41baf9fc956dff401f2c299279b91ce57
-MISC ChangeLog.portage 141705 RMD160 e818b5f7aaa624295b226d50a6412e25f182252f SHA1 f04ff1d53ff426a4ca7f841ccc23b2e435d364a6 SHA256 ce29ea74d89cbd275017203119c701a1ab84d3b68b4ea93ef3696b50afa109c8
+EBUILD mplayer-9999.ebuild 18639 RMD160 b32ab11e691390baeee2e21b1d13e0a7bb80eb6b SHA1 1e8481221708725898cef14462cf39a1b1df4a79 SHA256 63a66929cad692825d7166cb6eebfc976a3e0ffbf81a1181b28404fd0dd59a4e
+MISC ChangeLog 3884 RMD160 d2d5ea6a1d3ae3370b92d0fb9ecd76ac5a7b42ad SHA1 50361341b2ad1c2f2ee8754913a7922d67cf2002 SHA256 2306ae7271890e8e213731b287f58216f0103f4490f3be57a24c5b64262507a1
+MISC ChangeLog-2008.portage 107064 RMD160 146604862227a837d1f463a96af6fe94d17421bf SHA1 5a18c910edcf540877f3b803fc85a9b74b503dd2 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b
+MISC ChangeLog.portage 39168 RMD160 c8055d06327180a0f0fc45875f4f221cfcf8b522 SHA1 82d53aac5e2a663880922614b1af1cd9556518b9 SHA256 2d3da3030752c943c163abfddb9b5f7c4d68cec1aca13f217448a3b275b9d2b7
 MISC metadata.xml 4176 RMD160 fb7388f5dc01c9e82c5a842be4f568befa3e8072 SHA1 51fe3845a53ad5b33c56b519ee1be2851cd4f795 SHA256 f01871d93360ee07a542f13c37685b23736a74b129d9084c9e12dfe6f7dda944
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 6d33c2e..088860e 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -13,7 +13,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r32598
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
-bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
+bs2b cddb +cdio cdparanoia cpudetection debug dga +dirac
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode +faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca libmpeg2 libav lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas nemesi
@@ -62,7 +62,7 @@ X_RDEPS="
 	x11-libs/libXext
 	x11-libs/libXxf86vm
 "
-[[ ${PV} == *9999* ]] && RDEPEND+=" external-ffmpeg? ( virtual/ffmpeg )"
+[[ ${PV} == *9999* ]] && RDEPEND+=" external-ffmpeg? ( >=virtual/ffmpeg-0.9.1 )"
 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="
@@ -96,7 +96,7 @@ RDEPEND+="
 	amr? ( !bindist? ( media-libs/opencore-amr ) )
 	ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] )
 	bidi? ( dev-libs/fribidi )
-	bluray? ( media-libs/libbluray )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
 	bs2b? ( media-libs/libbs2b )
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
@@ -206,7 +206,7 @@ fi
 REQUIRED_USE="bindist? ( !amr !faac !win32codecs )
 	cdio? ( !cdparanoia !cddb )
 	dvdnav? ( dvd )
-	ass? ( iconv truetype )
+	ass? ( truetype )
 	truetype? ( iconv )
 	unicode? ( iconv )
 	vorbis? ( tremor )
@@ -219,14 +219,6 @@ for x in ${uses}; do
 		${x}? ( encode )
 	"
 done
-# cpu options needs custom-cpuopts enabled
-# but since it is not so fatal we rather ignore them
-#uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
-#for x in ${uses}; do
-#	REQUIRED_USE+="
-#		${x}? ( custom-cpuopts )
-#	"
-#done
 # xorg options require X useflag enabled
 uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv xvmc"
 for x in ${uses}; do
@@ -259,23 +251,6 @@ pkg_setup() {
 		ewarn "mplayer for this system. Also, if your compile fails, try"
 		ewarn "disabling this use flag."
 	fi
-
-	if use custom-cpuopts; then
-		ewarn
-		ewarn "You are using the custom-cpuopts flag which will"
-		ewarn "specifically allow you to enable / disable certain"
-		ewarn "CPU optimizations."
-		ewarn
-		ewarn "Most desktop users won't need this functionality, but it"
-		ewarn "is included for corner cases like cross-compiling and"
-		ewarn "certain profiles. If unsure, disable this flag and MPlayer"
-		ewarn "will automatically detect and use your available CPU"
-		ewarn "optimizations."
-		ewarn
-		ewarn "Using this flag means your build is unsupported, so"
-		ewarn "please make sure your CPU optimization use flags (3dnow"
-		ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set."
-	fi
 }
 
 src_unpack() {
@@ -534,16 +509,10 @@ src_configure() {
 	# Platform specific flags, hardcoded on amd64 (see below)
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
-	# Turning off CPU optimizations usually will break the build.
-	# However, this use flag, if enabled, will allow users to completely
-	# specify which ones to use. If disabled, mplayer will automatically
-	# enable all CPU optimizations that the host build supports.
-	if use custom-cpuopts; then
-		uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
-		for i in ${uses}; do
-			myconf+=" $(use_enable ${i})"
-		done
-	fi
+	uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
 
 	use debug && myconf+=" --enable-debug=3"