mplayer: update patchset

5 files changed, 18 insertions, 37 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 8a7ef2b..1646807 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -6,6 +6,13 @@
 # Advanced overlay ebuild is meant to be in sync with portage one,
 # provide additional features and eventually send some of them upstream.
 
+  22 Sep 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/mplayer-x86-sse2.patch, files/mplayer-live555.patch,
+  mplayer-9999.ebuild:
+  SSE2 issue is fixed upstream in FFmpeg.
+  Fix live555 detection in a better, non-intrusive way suggested by
+  Carl Eugen Hoyos.
+
   07 Sep 2012; Andrew Savchenko <bircoph@gmail.com> mplayer-9999.ebuild,
   metadata.xml:
   Add libopus decoder support.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 54f0487..50570ad 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,9 +1,8 @@
-AUX mplayer-live555.patch 642 SHA256 a9407e7a4440ff97dc7c3d47b8d892a064fa64d12592b32dc812f3f95faa3ea3 SHA512 2ec802b118c752f981877c32c0a9ddec2dd33f1326b260e96e61db021f2f2608e110fe0ceaa5189ee6726a64071168b3439ff05dacd38c600b0750d0eb142584 WHIRLPOOL 6569d0afa2edc3ce5ac8b34180925556b533e3353360df301d436c0faf6897172ed6a21f9fd571a2e7b957c781eb1104b5bbce01a1188f58de8d5de3fb13e695
+AUX mplayer-live555.patch 561 SHA256 650a1fcf2641eb41ab8b95b29c1e71c6acef90d663b35061654c9ca608a435ca SHA512 ec63dbee76d049a5592f90dbed59949eb12654ae4846044ae02d34697d5dcfd80cd2a926bb34e1589e2ce5b9a66e167751ead05ef91717ff4dbc94af4143ecd7 WHIRLPOOL 6a6545c3bd879027280785c97844a690fc6924f49a6174d06684e350323ec78783d98c801d1741c866062c75cd0a80062257c478d44b7bee63be656a9d08488b
 AUX mplayer-vesa.patch 1096 SHA256 b8b501493c5ea6548c9c2d23697098155d090fe0315c79152106d1990d92f322 SHA512 4ebe5ccfcc16d2c2201be0b8ce17b1e1e282d56062453465c79a7f9aedc0bec7b29d7615aaafac82f68c7589b00123df84f9727fe40d6abc07e40dff918fac8d WHIRLPOOL 8a08f34c1475bf941d5eab6c6e3a13648b4b17177d6705c5e7c59f1bf6a9bff5454d187efa950c8fa5379d9f44c84ab5de4318113f0e1d8e1d1e687b28050970
-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 18893 SHA256 0a2760f74e409f5199fbf8eebb6571f3e24bdb5c31804143418f7c84d5f58d7b SHA512 12c575e64fefcdc2882ac705870837ee0a3b0c51a826393bb91df1ae1427418ccc8d20a79a5e849013f8c5902e621b85df6b62120bb31bae23e9d64ce99db70f WHIRLPOOL 538e7a274fc95b2317e15865dce2d91aeb63dc8d4862990ba3d565c8a5f1d938860358af234467b369130992c0a9ea77e128008a3150a3b954ff2049088c31cb
-MISC ChangeLog 5532 SHA256 1f0400ab26125ce21385bcf8ce42a1ab86216d4ac2d0070ce67ecaa842f13fc3 SHA512 b7424d8a76580637197b1d7f760252e15c9bf63d0201e808104debe91864f91eba47e8ada68d523c8bdf13f247a47c20f2c203760b97fd63f16bd18b9b4e696c WHIRLPOOL 2b962b30a30185be3baecd1039cdc36b9f7ed3cf0acc6f35fee44f87e54e6e01fade07c4466329792868cc8113a0efa8e79ec9938a4f55b716f5cf075982d9de
+EBUILD mplayer-9999.ebuild 18805 SHA256 9b9d499150c12847fa0e34666a3a8e388cb966c07fa4a897d233808b6d18d636 SHA512 8c9c4f7736eddf5c419be415c5f32ee8d86ee9cc5e43cf5e53fcfda8a664a8fb0644d0b6a8ceff158b454bfd1f1bc7571f59865d0effc0f763685fc9c1fc2634 WHIRLPOOL 28fbc6a09aa43b05bd59b260d1bca73643d92537d84725b0b2108d30cbdb77ddce26ae357a9d551505c65067b8df01f6aa2809d904493fb6b5360bb06f57ad42
+MISC ChangeLog 5800 SHA256 4efad15d362367dea7498b4d7bf091fbab8c55df8dbe29bf2be274f5fbc1ef01 SHA512 baa6b638aa5ed455622339bda630c14e791fc6e7db55c18e174803623a24d7ef9b59289e7a9e005ab0f6a1b0b5b7d73d3bd577963c2a699fa036e4c1d887c770 WHIRLPOOL 15655a5909143b520ed4958b2b264d28682ec85aaf2213ea89fd5941390ae451a382ec47cc73be2a3a2cf3b8a67ad5aaa5d3fc0b91227a838174a92861431c29
 MISC metadata.xml 4048 SHA256 85f2e9d3c7eb8ef1465184d7ebf952af289a9c848b6a68c506504354e4550625 SHA512 86f654b98dbd2cf9ab97181b18292fb598034734e4682a7c466b07ebdb44c192fce6b584495422e77098a62445ff565d062b754b51c1aad8be0d1c7b654e4f43 WHIRLPOOL 406bf8d3010fcfa2543d0094a24ee2c63cc2d71ffdc6e9c39df612faa24f264097d4af8e9df5341224e241de953c44a18d7c8d87ab7e5becf2e9570a2426337d
diff --git a/media-video/mplayer/files/mplayer-live555.patch b/media-video/mplayer/files/mplayer-live555.patch
index f5754f2..f4020a1 100644
--- a/media-video/mplayer/files/mplayer-live555.patch
+++ b/media-video/mplayer/files/mplayer-live555.patch
@@ -1,13 +1,12 @@
 Index: configure
 ===================================================================
---- configure	(revision 35150)
+--- configure	(revision 35210)
 +++ configure	(working copy)
-@@ -6753,7 +6753,7 @@
+@@ -6787,6 +6787,7 @@
+ echocheck "LIVE555 Streaming Media libraries"
+ if test "$_live" = auto  && test "$networking" = yes ; then
+   cat > $TMPCPP << EOF
++#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
+ #include <liveMedia.hh>
+ #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
  #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
deleted file mode 100644
index d2cc0f3..0000000
--- a/media-video/mplayer/files/mplayer-x86-sse2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index bdc5eed..0f66562 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -265,8 +265,6 @@ src_prepare() {
 
 	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"
 	# change libvbe header location according to Gentoo's libvbe