mplayer: live555 is fixed upstream

4 files changed, 6 insertions, 17 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index eef3f46..35bcf42 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -6,6 +6,10 @@
 # Advanced overlay ebuild is meant to be in sync with portage one,
 # provide additional features and eventually send some of them upstream.
 
+  24 Sep 2012; Andrew Savchenko <bircoph@gmail.com>
+  -files/mplayer-live555.patch, mplayer-9999.ebuild:
+  mplayer: live555 is fixed upstream
+
   23 Sep 2012; Andrew Savchenko <bircoph@gmail.com> mplayer-9999.ebuild:
   Fully synced with portage tree.
   Remove hooks for non-live ebuilds: they will not be supported
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bf012eb..da769df 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,8 +1,7 @@
-AUX mplayer-live555.patch 561 SHA256 650a1fcf2641eb41ab8b95b29c1e71c6acef90d663b35061654c9ca608a435ca SHA512 ec63dbee76d049a5592f90dbed59949eb12654ae4846044ae02d34697d5dcfd80cd2a926bb34e1589e2ce5b9a66e167751ead05ef91717ff4dbc94af4143ecd7 WHIRLPOOL 6a6545c3bd879027280785c97844a690fc6924f49a6174d06684e350323ec78783d98c801d1741c866062c75cd0a80062257c478d44b7bee63be656a9d08488b
 AUX mplayer-vesa.patch 1096 SHA256 b8b501493c5ea6548c9c2d23697098155d090fe0315c79152106d1990d92f322 SHA512 4ebe5ccfcc16d2c2201be0b8ce17b1e1e282d56062453465c79a7f9aedc0bec7b29d7615aaafac82f68c7589b00123df84f9727fe40d6abc07e40dff918fac8d WHIRLPOOL 8a08f34c1475bf941d5eab6c6e3a13648b4b17177d6705c5e7c59f1bf6a9bff5454d187efa950c8fa5379d9f44c84ab5de4318113f0e1d8e1d1e687b28050970
 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 18150 SHA256 bcff60ac3916e297364a2605983313db6efd5a7bc5e70444ec239340312f89be SHA512 b9a57f234dc87e85bb576f87ac48c761b0c5e9456361c8716979f4d8e118b658cea5f22824f8ae63dfbde2e8369135e7d9e56d35228d06f291ffe234d66c12b1 WHIRLPOOL e64cb19f53289ac578c461cde57d58a71617fd456a6ab7d892e72252bf976e9dd245566c2aab6cacd1b560c0a2cf43386ef7329d16d6551a6ee863d48760790d
-MISC ChangeLog 5982 SHA256 d28207eef851e2e113f8716357d8018bfc722c0a1b88812c8bd874b4eb2bf5be SHA512 59d4d3f7ec656d9426cbdebf1e5ae0371e0a4e7189fe8bee534982cb6210ad4018f9e5bd0b041654da5f1afc50eabca2a1e02ded24ddfce1b7b988acb48d18fa WHIRLPOOL e27aeebe11cf155b712cbb10cb838e0d1613dcd65dfa0e1d7d302c29d5a994217adf13b306e6a7ba6ad3bd3c206ba9640605036c43690676e229483724a7c675
+EBUILD mplayer-9999.ebuild 18078 SHA256 bb6e44b1d45249b2c5a384951b8c6095e5b3185757e4804fb1fce8505d5591d6 SHA512 829ddc6dd46489dc7c315bcfd5d5922d194018e1a42ae1ae8fd448634ff24592891f4f385d776d1207fe0649ea0cd16e38a37f39e0784762e1d8df38f3def99f WHIRLPOOL 704b0d7f5495f7b65cf81d2b10ffe24cfd6e991300d50c7c005186376ee10bf957cad4cd55e84728e755d8ac5df3f194fb4ee2fd4507bcd49f1d89e6c7efa60e
+MISC ChangeLog 6125 SHA256 ae3f8fd51a9a23f04a91c5a376bf5d2e372fef1b97ab2a4e5f15342574cf0c6f SHA512 3cbfbba01d08bc31d6644a3f782b2e7dc52ab3e06f2df687d4dd23cdb760af7d39a7e168015778bbfca7a8e61d35f042eeb14b7306babd1cd53e1ee488256087 WHIRLPOOL 49855b47c3054d27d4e96ba6f630af30294633a72bdfbdc33ddaf1763504458b94cf8a96d8cee11cc40818b9d35cbb731c9dfd3a8794437ddb4290fde3f561cf
 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
deleted file mode 100644
index f4020a1..0000000
--- a/media-video/mplayer/files/mplayer-live555.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35210)
-+++ configure	(working copy)
-@@ -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/>
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 97c5f5b..3eee664 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -246,8 +246,6 @@ src_prepare() {
 
 	base_src_prepare
 
-	# fix build with latest live
-	epatch "${FILESDIR}/${PN}-live555.patch"
 	# change libvbe header location according to Gentoo's libvbe
 	epatch "${FILESDIR}/${PN}-vesa.patch"
 }