Fix subtitles in mkv with recent ffmpeg, bug #463588. Also fix a wrong hunk in the libav-9 patch.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

1 files changed, 8 insertions, 12 deletions

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index d4296940eb2f..90e6cce54605 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -6,9 +6,11 @@ AUX mplayer-1.0_rc4-pkg-config.patch 2751 SHA256 9c0e5654ef05d64ae8bb91e32044335
 AUX mplayer-1.1-codecid.patch 656 SHA256 3844fcbdb3113e805a4c1e9231e8ff9d93c1e8b5400778d29c1c3b485d0d0ddd SHA512 14c78953b9523badaeadb60a72e101fb4100802a312c2f30c1e4fdc2a6ff32cdd82193bbff8e9ee4b1448d6bb0f1d5662f12237a09d86f2993007793d5fc46b3 WHIRLPOOL 631a495288be4b48ef24a7960ba344628d522043831dcc5519d276880209b1422ad90cb9183a363d9c75ec14481a7ba5ea254bd446d639f5a41c194ef6cf73f1
 AUX mplayer-1.1-ffmpeg.patch 1452 SHA256 9c04f0a14f625a41a7bda49c5fc8d2622a85da349799904ec56244e87dd38d26 SHA512 23aaf6fc85101b92e81e37f39c2929874891387d15e420d524dc7248bcf995273d763b98ecf496e06d89a99b567631c5978adfda1f3ad076fbf980347ccf7e49 WHIRLPOOL 0549d6765bc7f22f325bab4a6a70dfe9827a48fd486aa8acc912e717948f814be695441ca70d38a7d074d38cfd5ce04c14a1bcc37b77475cc059a925b19d0305
 AUX mplayer-1.1-libav-0.8.patch 441 SHA256 15d00ab246c9c61e598efddbd506d7ad289e7302d5792c8e36471308acd90e58 SHA512 577e5fb8ae9aeeb05fb74b95a8d16392ba5fc9b44da77122b2cee830559281b2c52a31aff6c5a8802c6552545daa7df7a85d33d7b36f83dd8f1b61ee4e08bcd4 WHIRLPOOL c95a776dea42c6b6b7480cc8c49d164687e9c59a566c921cdf562315fc5eced8b299ab98d23b970ff62e60471aa3a18f9492d81552ef12d0a67f4614b80f061e
-AUX mplayer-1.1-libav-9.patch 19580 SHA256 996fbaec53973faccd9e95acbf809c020fe215cd51dd64a28bc32a4b41590a96 SHA512 bf1ed7c936d7aff9ea734c578c2015614e2132cb51e8f6d6d50da52c61b2d0ba702482a894ae30e278ee2ee0fb344126d8fca0fc7adc49adc255f132c518f3cb WHIRLPOOL ce2e98b51ddf485c8dbe7a3de2f6d34cb210025d92c91404116149d5a491b9c9252de1efd18708fe05cf4c6855f98f19a8fd5431824dc9f13b94d67369bc57b2
+AUX mplayer-1.1-libav-9.patch 19609 SHA256 d81d9d848dcb0f3a045c3fca58ef2dfea694dd7b3d8ebc3aa65b52d9174b5b24 SHA512 9b16f9f05149c08decae0fcaa0b20d9b69e0d9a87863a1c1d0661f8cbe9629c5a2a493958ccbab7fda2898bbd74c9061994f5110132d674c9efa85ea23a97cf9 WHIRLPOOL 0e8dd58a5cf835d2d01bb78bbfae3656d9846b31a6336d40aa8719772c7a97b9bef44efbb02323c30c8f7d84b08a11ab7f296c0761c6c15537031fb22e2669d3
 AUX mplayer-1.1-missingbreak.patch 767 SHA256 4c530ebf979827020d483cb765a4c78a5fdb35fd4aa838073943514669173d20 SHA512 15373d2e4efaee54f2d0c169958cbe6e3e23a697011f6a82e67aa205b64dca3924898a1b1c577c536a451b519b3667115f511caee2f3692779b76cee21c02fe9 WHIRLPOOL a2354f43e3c6fa4948e480149494bc41fd26e8a23cc308ef3f1976359210f1209e45c0941ed07bb632931f9b732058b05468f581e62c15c0a927dd28d07a683e
 AUX mplayer-1.1-planaraudio.patch 4832 SHA256 dea33823a30ca6bd8fc197254ceeb9902dae83a17b7d772986bd672fabe75662 SHA512 95311d7cf56162cb7414b72e081d0ae36d77045d233c43dccbbd1de1bf4a6943cb6a2de3663d374decc73366e5402b98ad7bff399e1a8c5f2ba104eaa766d40a WHIRLPOOL 2b3ed41e994301a7a75aa7c46cc93f102f7457af292b3418264d63098942bcd3fd027a22fd34cbf669a2e167ad5485ecdb000e9b415d67b5058bb9ec68782f73
+AUX mplayer-1.1.1-avcodecidsubrip.patch 678 SHA256 d19e3a37ebdeb34af160ef5e1f5fc67c36f79b373fb2dbacbd36c803da4bc5bd SHA512 881cda24e9d67cf56aefd570b79ef30293f7a85b025f290d622e8c1515f8066e440a61a9b49b34a92f0ae2bebbb7e7361a788c358d6e5575e09525dba88e5239 WHIRLPOOL 84239a770ce67dd339b4c46f4c354e1b1df392307da68509ba1abecdf1b754941bf5cc100e273945d9298dacaaae923b4154bd77d64d84009576741515778d81
+AUX mplayer-1.1.1-codecidsubrip.patch 686 SHA256 8246822d9570e70e3e50bb640636764b666215770d6a15b01ce7362765f042d9 SHA512 1fa0d0d376b23d350f8d693c0f9fd5ad2ad7876621c2c0d713eba56f742cbc72209458d879fcd73466ccce45b5cf53f8ba9ef7f536b8998fa90e141dae0ed9fd WHIRLPOOL a59606991b6f9adb84a654fd9ee5e98255aa1f3b203ce77d8b142805880585f76cc62636cc9fb4dec755cb2850aadddac1f14a8f1f4aa9e28fde1489bfa2bffe
 AUX prepare_mplayer.sh 758 SHA256 d8a92d83db920a3e47b864b24e78407c1ef5b2c523e91dceae2d96f5bcce435e SHA512 eea43b7816080b0ffbe48db56fffa4606c98ecf8ce8a44bd02b405b5744c024ef55705f53710b8d7b2750a1b7565905f5fa572c34982e1db66810c392584520c WHIRLPOOL 09b1c09fd5264887c5d59b8dbdb5cd08811f4d952bb254dcb4649e3a55d248b8f43c49c9da9d98caad6a5578f15e0e1b40f1d44826cf60cb338bf7b049c26ddb
 DIST MPlayer-1.1.1.tar.xz 11202492 SHA256 ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76 SHA512 06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed0 WHIRLPOOL 3cd0f3845cd45961b778c384a322bc628cc9cd6fef3801b62389bd616a443ba5270c378a889412a7dc72d37ff26704d5d989d2c995a2a4a6540f6313ccacbb63
 DIST MPlayer-1.1.tar.xz 11208088 SHA256 76cb47eadb52b420ca028276ebd8112114ad0ab3b726af60f07fb2f39dae6c9c SHA512 8a9b96155e6794273b1496ff4987b65db14cd5ba4359b52604c2afccc574d0a2328e86f2edf98e65283c380780b9a8b3094da18a161cf7aee090986d5776178a WHIRLPOOL 4555281efc31bf74d6a4eaf63eaf9ff1555fcb65889167ffc889b34dd341bba9437c95a1a556dd4aa291f23aa5ec705a6d110ce38bee79f7198e00346793a58f
@@ -16,22 +18,16 @@ DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919
 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-1.1-r1.ebuild 18083 SHA256 6a0ac7c78e524d44967ff0c60bf53e6a61fa1df9a0bd4efc50dcda988567fe30 SHA512 172681edcf0b958766a8b80bd0643198d3a00a89035717da71e4da66660dbca779897691f98eceac3d4d070dda5a059236f50ceb1a96af06b8300d0654dd5e79 WHIRLPOOL 951ac075adb7be1415d06ddaf587ba456f8a7eeeb2747656aa0023b2bca131351eca4d45cc018e76c08f3052a2d50053fac74fd0347146361505cdb46e7ba587
+EBUILD mplayer-1.1.1-r1.ebuild 18286 SHA256 13121cb15995d7cba832c446eca9aa7dc5a7077875b2213d57d951f760ba2edc SHA512 522b0eb88090fa85f9e11bea26e116f4516718b6fc1eb13fa3a0037dbc7d3cc74237956fb4b18bc796c48ce2c96b8ebb966eedb0ae218ceee14105193cdef0be WHIRLPOOL 96af3db53941a21f9f14b5bbaa015e153a2ef7ef65a81757981de3deff9dacfc36437440d1fd2738e9417ca77dd83409c81e234fb235614fb1525c17ecd3ca54
 EBUILD mplayer-1.1.1.ebuild 18120 SHA256 1431402f258c3e6a5444b70418cd73d3a2c54721762350e3bf18d465298738af SHA512 c24161f9ab6a77ad87b3b094ec3aad950de617de6bd6e63a90627fe3dd9b26e2ddb079dbb5aef02570895a71fd74f4e7935c5c591cb2d1fc7150af9853287938 WHIRLPOOL 244b9904d46496e8a770f46ce0e58b4646ac43fc77bcfcf86a7b8960333e02032518178f6f429b42d7f61401c814d307b59288e09851ff0581582e9b610c6620
 EBUILD mplayer-9999.ebuild 16963 SHA256 cc21166af2ea77ddc3bd0cb218a0781faae858d105e7f9e253339b0f2eab1bf5 SHA512 5a55cb820ddbcc6a88cab4c00a082fac0eff746bb755f466067cd50ba5715b526b6c6d3092f5bb4ddc052b5e3dab0dfae0b4da90e094a798f9f134bbc54483c8 WHIRLPOOL 4b55fe25f9ac0c24a49d3719491ed9165e0a9d07370d228c2e2fc600c77ab6ba33a16f2999805ace69ace3cff98b48c246abf9f6426a927987bca1e430110097
-MISC ChangeLog 47882 SHA256 409a0daf09b3bf93cd215a2f6b78dcbb6b2bfb95a64302d6fbc5febf074eaca8 SHA512 4947cbdd1f2041513dd9b59889b01764028709e77d90e6264c0885b2c7f047f03d7034bebdd8503468947d74d9677db747722fdb60088af6d86e6b9fcbfb82f2 WHIRLPOOL 06d0a6cb94baa9c84409a7eb65423dfaecd62f2de27a69bd1f7de6097022c26dbc7d1325e01f4040f6dcf391342866a7ac1cac871e6bc405652b827f27c8f12c
+MISC ChangeLog 48224 SHA256 b756190decd444cc4b23f1189cfba1212ecd2856d684a093d3a35cb5153c3127 SHA512 e798772eccd1b8a7ff7e2536214c5d2e02552a4f7c9f99e05a93ecf0a45482dc31678c9c85fbef158587aa0c42c74e8a782b80545e5bd5b7dd1cf15b9873b45b WHIRLPOOL 124e9633a4a74da8c77b462eaddf57b86d7cddaf22eb7b81dd2371353c411e0a7e5f847125fe228c3164040f38ecb19d279b1121880a9a783b0ee1926011ebf7
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 2761 SHA256 0fe785443da73a55b99d98fe12c82e1f7507042aeb27d3eb70023dff1165d05c SHA512 fce5bb2777a78d6972b46db7f3d840b023b050c21ce76d77b276f4bf0cf7a48a9918e9bb8b9e9dab84ea2e5b4aa87913df7e0929daec08cda96c72400fef09a6 WHIRLPOOL bc277ac3a4996f5c73479bd08bbee9654b7cdadb8bc369d2ec545dab06414fa74724a08d1db8f3a7bcdd4bcc384034b8e9146da1344b240e1df3cea68efbd04f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRuguiAAoJEJQzkH1pP7W4WNwL/RUKo3HfDF74wh3W6DIkKTJe
-yOpKj+avREIf4yFhd5vVEBoz/GWchKG9U7DVGzlX++XcxbtYHbOBLx3UNpqzBR1U
-vGEgp5pr9qZcAte71Q2k6zXrZHd4P89Z9sLKiTz1sdxo8YX52J9Aszc6+0+zfhAU
-jXHasWyrxHs9rnU4NPh5UvWFhdBdWEIOkIfqsB8Zs2M4vx2tQzqnMir/Ja5gXLo/
-xUvx35TQo4GNsw4ZFCf6QJ8+6DIvEnfalw0md1d7+DcO0FeQRj5D5ISMsepIj2M6
-b7w2pMfX4mWgr4wPixZBH+AzvY6RP2h/qbQp1ULzzQXBerLcBzlmjEhZOkOawf+s
-1E57FVsbmKv7TRv/xO2VRKY5pai7fT9Pzw3SqGC/fFvLP76TUrxbcueSB8xRaTma
-193kyTno0XgxgeCYhSxpSxNDhCS85J4BAGUg4d4414Hcfl9We1SdM4U9i6NOMg1A
-3tD3DS9AIosw/p0j+lysogYLY3Q+xyGbBItDXmaluw==
-=EegS
+iEYEAREIAAYFAlG6Xn0ACgkQvFcC4BYPU0oH7ACglrRUvPO2xPd3RcHd+s5uYAmc
+fqkAoI/FxVDWXKpghJ0RJ3clE2gfQNcc
+=RIsN
 -----END PGP SIGNATURE-----