mplayer: fix numerous issues

- build with newest live libs;
- build on non-SSE2 x86;
- remove libav;
- remove unneeded (cdio, cddb) block.

6 files changed, 60 insertions, 17 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 6554891..4955838 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -6,6 +6,16 @@
 # Advanced overlay ebuild is meant to be in sync with portage one,
 # provide additional features and eventually send some of them upstream.
 
+  06 Sep 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/mplayer-live555.patch, +files/mplayer-x86-sse2.patch,
+  mplayer-9999.ebuild, metadata.xml:
+  Fix configure test on recent live libraries.
+  Fix build of bundled ffmpeg on non-SSE2 x86 hosts.
+  Remove USE="libav": due to severe incompatibilities between libav
+  and ffmpeg, mplayer now supports only libav.
+  Remove cdio and cddb mutual block: they may be used at the same
+  time now.
+
   07 Apr 2012; Andrew Savchenko <bircoph@gmail.com> mplayer-9999.ebuild:
   mplayer: sync with portage
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 2455dfc..2828e46 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,8 @@
+AUX mplayer-live555.patch 642 SHA256 a9407e7a4440ff97dc7c3d47b8d892a064fa64d12592b32dc812f3f95faa3ea3 SHA512 2ec802b118c752f981877c32c0a9ddec2dd33f1326b260e96e61db021f2f2608e110fe0ceaa5189ee6726a64071168b3439ff05dacd38c600b0750d0eb142584 WHIRLPOOL 6569d0afa2edc3ce5ac8b34180925556b533e3353360df301d436c0faf6897172ed6a21f9fd571a2e7b957c781eb1104b5bbce01a1188f58de8d5de3fb13e695
+AUX mplayer-x86-sse2.patch 1100 SHA256 3a1f8bf56cc068ca2c026381e8daddf2368314e6cc2506bd9356378dfec9634c SHA512 522679ba42e64d61db74f41c9cf4e9b52a4b994238853fe6b64eb01f80fb6aca8b10beab974dea556e859d961e96060ed534f3db6e1fb105b2394e337c80ae7a WHIRLPOOL 5f3c3d6c6195561312aa7d2570dae00d9f7d069aad090a88f63f99e175940ea4a03d83bdde22326cb99fa3052bfbf6308b71f6212eaed19fe0c330607724c61f
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
-EBUILD mplayer-9999.ebuild 18715 SHA256 1751a18f9e614f2c765ad103212bbe77018e2d3263e4f9b7667ecba6e159d7f1 SHA512 273dacccb3fd3397c32d471a341b823d45f6c181e6c2e86fab0fb7fe5bdedcc15716a5d35f4a92ad4c2d9a0da0aa85a2ee7f92bfdc9c39d1d215dcd72ddef876 WHIRLPOOL 0e1bbda0d679f8673284a0c9d5e6f5aec7aef9fd7787d6afe3cbfa9392cf4ce23c13946f01c7e9f76f44a08ddb956c6d79901aa34a2009321fb1849c8ef0649c
-MISC ChangeLog 4791 SHA256 2d8d79e2c0a79d0ba27e5ece4f9cac98a723f36f1df249d448b6ef1948b904cf SHA512 4d0a320310415ff335aadd58a6fc2c19786e2d38cb7de975a453e9d0627ea96bbec4d4a4b1518bac99cc87a4262393a231803ad7f8ddd6ad7fe9e647123c71aa WHIRLPOOL 11c84a098d285312abd119bb12353a1c15ecae9019f51dbfa5bc444fc1decef112a4e74eef9af6078bb7865ec9b65b5d5fd7de520f6f49103f5a14d3719f4d0f
-MISC metadata.xml 4010 SHA256 d31f92144f4f51a30c2ad1988acc294023baba8f5a5fee4dc98e3133d882858d SHA512 5e302bc73762702da50814e900b686cd1f1bad50ceb465eb2e19d0bfd0509b868eab6f3a9d3beb6c09000e64647a4bc5e4f35261bc33acf494e370a47be097ef WHIRLPOOL 828c2d78de71dd12d78b9adff1071df0c216e958e26768a26b761652a1fe11d28aee906854b66ca35e84cd3e2343b091ba9bb7eecf88aac25eafc0604f2c5c78
+EBUILD mplayer-9999.ebuild 18716 SHA256 3b694567ce6d27ebed78c1ba74f91714d6276c235c3d87e27644b42aac81f24a SHA512 290804b3887da4179ae8d3d8acef4a7f15801bde7ea18f5ff158a47d19bf10b5bb67c565996871c7502e8964a5a179e7b24efd14ced303569cd70ff7a1b395e3 WHIRLPOOL 4569065e3fd7c4b49040e7c435a1e18a2961f3456d2ca02447291090c7d13517c169b48eb14f7450a903a86ed692b6accd4862e627a6ffbf1582dc437c951bd6
+MISC ChangeLog 5237 SHA256 d18613cb3423b2104082ced09ff3454799b914087da9ce6571ba1b5bdb8a5314 SHA512 1d584b9636dad93c857599b046668b6b9aecc48fe19f711d2a2aa88d80b4e27671cbe9836c44fcecbc7b6397c608e7764667fad7d872f825d6beb33eeb9b1e67 WHIRLPOOL bbbc0c36159b07ea93ecc512c1dcb8d87bfc4d910c6ad55539c21dfaf039c8faa5a18e4b2e5996425123abfb15accff95e8a26ba08bc5d50a3db26e096ae7724
+MISC metadata.xml 3954 SHA256 6397b3a10056a01c021686d28c36fc3fc90129ffd185a928f653c320b559a6e6 SHA512 0682cc2348b3a31ee609452332db57ec1b66993e748f5971a3d9cc287cd7319eb2e252640481336f6091a9807494dfc209adf90241fd7bce41e47162f29d6277 WHIRLPOOL 7eddfdaccafff7aa7b6a9e4e7e691818e8a44167aca4ac44e4cebb72d7b8e60584af24a6a6e319f278feadb6c707604f7c0b61db32ed2b40885fddb83cf22cd1
diff --git a/media-video/mplayer/files/mplayer-live555.patch b/media-video/mplayer/files/mplayer-live555.patch
new file mode 100644
index 0000000..f5754f2
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-live555.patch
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure	(revision 35150)
++++ configure	(working copy)
+@@ -6753,7 +6753,7 @@
+ #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
+ #endif
+ #include "BasicUsageEnvironment.hh"
+-int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), 0, "", 0); return 0; }
++int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), "", 0, "", 0); return 0; }
+ EOF
+ 
+   _live=no
diff --git a/media-video/mplayer/files/mplayer-x86-sse2.patch b/media-video/mplayer/files/mplayer-x86-sse2.patch
new file mode 100644
index 0000000..d2cc0f3
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-x86-sse2.patch
@@ -0,0 +1,22 @@
+Index: configure
+===================================================================
+--- configure	(revision 35150)
++++ configure	(working copy)
+@@ -8553,7 +8553,7 @@
+ $(ff_config_enable "$arch_all" "$arch" "#" "ARCH")
+ $(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH")
+ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE")
+-$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_EXTERNAL")
++$(ff_config_enable "$cpuexts_all" "$cpuexts SSE2" "#" "HAVE" "_EXTERNAL")
+ $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_INLINE")
+ 
+ 
+@@ -8958,7 +8958,7 @@
+ echo "%define CONFIG_GPL 1" >> "$TMPS"
+ echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS"
+ echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS"
+-echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE" "_EXTERNAL")" >> "$TMPS"
++echo "$(ff_config_enable "$cpuexts_all" "$cpuexts SSE2" "%" "HAVE" "_EXTERNAL")" >> "$TMPS"
+ echo "$(ff_config_enable "$yasm_features_all" "$yasm_features" "%" "HAVE")" >> "$TMPS"
+ 
+ cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 5617af6..95d4f81 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -20,7 +20,6 @@
 	<flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="faad">Use external faad library for AAC decoding</flag>
-	<flag name="libav">Use libav instead of ffmpeg.</flag>
 	<flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg.</flag>
 	<flag name="live">Enables live.com streaming media support</flag>
 	<flag name="md5sum">Enables md5sum video output</flag>
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 65bc09f..a7e7477 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
 
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+inherit base eutils flag-o-matic multilib toolchain-funcs ${SVN_ECLASS}
 
 # BUMP ME PLZ, NO COOKIES OTHERWISE
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r32598
@@ -16,20 +16,15 @@ IUSE="3dnow 3dnowext +a52 aalib +alsa altivec amr aqua bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga +dirac
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode -external-ffmpeg faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 libav lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas nemesi
++libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas nemesi
 +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga svga-helper
 tga +theora tivo +tremor +truetype toolame +twolame +unicode v4l vdpau vidix
 +vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
 
-if use libav; then
-	EGIT_REPO_URI="git://git.libav.org/libav.git"
-	EGIT_PROJECT="libav" # git eclass sets it to PN otherwise
-else
-	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-	EGIT_PROJECT="ffmpeg" # git eclass sets it to PN otherwise
-fi
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+EGIT_PROJECT="ffmpeg" # git eclass sets it to PN otherwise
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
 for x in ${VIDEO_CARDS}; do
@@ -188,7 +183,7 @@ fi
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="bindist? ( !amr !faac !win32codecs )
-	cdio? ( !cdparanoia !cddb )
+	cdio? ( !cdparanoia )
 	dvdnav? ( dvd )
 	libass? ( truetype )
 	toolame? ( !twolame )
@@ -214,9 +209,6 @@ for x in ${uses}; do
 done
 unset uses
 
-PATCHES=(
-)
-
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
 		elog
@@ -270,6 +262,11 @@ src_prepare() {
 	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
 
 	base_src_prepare
+
+	# fix build on non-sse2 x86 CPUs
+	use x86 && epatch "${FILESDIR}/${PN}-x86-sse2.patch"
+	# fix build with latest live
+	epatch "${FILESDIR}/${PN}-live555.patch"
 }
 
 src_configure() {