Addendum to the planar formats support patch from upstream

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 32 insertions, 8 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2d06a9c7f14a..eeaf7411b4f7 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.872 2013/01/17 16:51:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.873 2013/01/17 17:48:55 aballier Exp $
+
+  17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild,
+  +files/mplayer-1.1-missingbreak.patch:
+  Addendum to the planar formats support patch from upstream
 
   17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mplayer-1.1-r1.ebuild:
   we need ffmpeg-1.1 for the libav-9 patch
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1a2b3b0b21fa..f0ec78e200a4 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,6 +11,7 @@ AUX mplayer-1.1-codecid.patch 656 SHA256 3844fcbdb3113e805a4c1e9231e8ff9d93c1e8b
 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-missingbreak.patch 767 SHA256 4c530ebf979827020d483cb765a4c78a5fdb35fd4aa838073943514669173d20 SHA512 15373d2e4efaee54f2d0c169958cbe6e3e23a697011f6a82e67aa205b64dca3924898a1b1c577c536a451b519b3667115f511caee2f3692779b76cee21c02fe9 WHIRLPOOL a2354f43e3c6fa4948e480149494bc41fd26e8a23cc308ef3f1976359210f1209e45c0941ed07bb632931f9b732058b05468f581e62c15c0a927dd28d07a683e
 AUX mplayer-1.1-planaraudio.patch 4832 SHA256 dea33823a30ca6bd8fc197254ceeb9902dae83a17b7d772986bd672fabe75662 SHA512 95311d7cf56162cb7414b72e081d0ae36d77045d233c43dccbbd1de1bf4a6943cb6a2de3663d374decc73366e5402b98ad7bff399e1a8c5f2ba104eaa766d40a WHIRLPOOL 2b3ed41e994301a7a75aa7c46cc93f102f7457af292b3418264d63098942bcd3fd027a22fd34cbf669a2e167ad5485ecdb000e9b415d67b5058bb9ec68782f73
 AUX prepare_mplayer.sh 758 SHA256 d8a92d83db920a3e47b864b24e78407c1ef5b2c523e91dceae2d96f5bcce435e SHA512 eea43b7816080b0ffbe48db56fffa4606c98ecf8ce8a44bd02b405b5744c024ef55705f53710b8d7b2750a1b7565905f5fa572c34982e1db66810c392584520c WHIRLPOOL 09b1c09fd5264887c5d59b8dbdb5cd08811f4d952bb254dcb4649e3a55d248b8f43c49c9da9d98caad6a5578f15e0e1b40f1d44826cf60cb338bf7b049c26ddb
 DIST MPlayer-1.1.tar.xz 11208088 SHA256 76cb47eadb52b420ca028276ebd8112114ad0ab3b726af60f07fb2f39dae6c9c SHA512 8a9b96155e6794273b1496ff4987b65db14cd5ba4359b52604c2afccc574d0a2328e86f2edf98e65283c380780b9a8b3094da18a161cf7aee090986d5776178a WHIRLPOOL 4555281efc31bf74d6a4eaf63eaf9ff1555fcb65889167ffc889b34dd341bba9437c95a1a556dd4aa291f23aa5ec705a6d110ce38bee79f7198e00346793a58f
@@ -23,15 +24,15 @@ DIST mplayer-1.0_rc4_p20120405.tar.xz 5449560 SHA256 8da4ad1daa5c9b70884f775406c
 EBUILD mplayer-1.0_rc4_p20110322-r1.ebuild 20417 SHA256 6041d8cffc438f974c5dbe4a288c1d1150f4e57580350b157aac331c889a8f5e SHA512 56cb232cba9a34412f27402f90e92041953f9475e6969eca77f3785bfadf72f9943480adfa2128091f468942237ac85bdfac8667cb581e24af391b2e690041d9 WHIRLPOOL 37630c6cb096da5f2dbfdc4eb016173415a52ca73468b69f5153d174e84feed8ebc1329343d29a8da4796e98bb75f893e583f17ff8b6df2624a7295238ec39f7
 EBUILD mplayer-1.0_rc4_p20120213.ebuild 17809 SHA256 6cc016d7af8980f09044137a18e2ae4b698710fc0de16ccd6da8ecd74649b30d SHA512 15c3f093de1e09fda757618dad9e8bcacec39aa126ab25a4a2afb8704a93a37c1dbe37954218deb103ea46dd9120fec90bb36863348c977a02af5f0b9cbfc952 WHIRLPOOL 64d77e04a94bbc15b2b6e5995f580852f69e4904bf4cd7422e36137f6d33ec41c3aafc99f0981855f6772b8e9d47656f26201deff55af76f460f839e0e93ee11
 EBUILD mplayer-1.0_rc4_p20120405.ebuild 17909 SHA256 b299103dbaa39026133d2e985d61de2b5ea46c692ad8031098e92b34f88beef7 SHA512 79a76c4ddde85c2cf3a4d77bb2530c82f1bd023ea9ec6f25c3700bce542540130a309fcfad5a879910f036b1c739c4628a0d492c7fb479847cc280e3881b1c63 WHIRLPOOL 606cbfc2f8d709e4abb1bfe5a7ce9cccbab3a1354dc8564f9376832855ecb945b2974058c618564e93c5c083ef633e76da53503baff8a342930786efc9a5abe6
-EBUILD mplayer-1.1-r1.ebuild 18647 SHA256 289af7eeb80fd53ba8d3ff3d7e76e9ee042a0aa3f49f04a4e82a80d069690d70 SHA512 c25830fe69e804d9e6cfa20934034f09541f51fa55dbae9dc7b939d7e886abc20f0b51c213ec40e73bff5346a5c04cd0c8439875237ee5a5be8d9a5bffc5066b WHIRLPOOL 39d3f9dee8556ed6229fe28fde84b3805b2001aa03ded92efbf72d5047dfe742a52210c02b7aa01af695a849b423dcc828a808b2c01a0394fa34189e9d5e7f91
+EBUILD mplayer-1.1-r1.ebuild 18690 SHA256 ee01d0277aea2e58c65a86d4096d14afefbe68358580e2f6532ee8073e5981fd SHA512 a18eb7120596edd3fd61fbba02cf291bd1a925049ab03177c1ad73c7fa4fbcaf46564679f8ac9e1217d6cb9f6ebab14b3ffd12cc431cdac9a02e8f1d924de02e WHIRLPOOL 5328af7c25b1b591e549f99ed6bdc1250cb8ec8c44436bed4c4208854117fa83a8874144d6552fcecf0cf97b13a3cc7385d0c6aa6c39f3e9383e10be3c8c08c5
 EBUILD mplayer-9999.ebuild 17671 SHA256 5c53e6df8311dc6f9720dff36bc1398c98081f30d20f353233461b9b1cbe038b SHA512 dfd6379a1b3c5cab08db0df0f85620879611631af9c324179b6810a0448626f061163928a0e3455c3974f4dbd12989576b05cfdd01f74834eb3af619cc10285d WHIRLPOOL 5462428f499009a637b9a84263b83b1b08c868a4b704a83884676448dbcd88833383ca9e924cc90667d0b444818b4f45adde23d69ac113ec5cd662949cd99fb4
-MISC ChangeLog 45219 SHA256 45f603cddf94d9f33b36421ce0192eed242742b51566e9287310db55e58585f4 SHA512 bf8f0706bac708d93108eb54adfec8644a312ce085d6cf3807b73928172f6327fafb192ac4ce177edfa53e55968c6b20c225397c31fc793e0f21c7dbfc260a93 WHIRLPOOL 794df1fe591959df81098be4d91d8025d26471716abc4f8ce547199dae1e6e022602692fefacc337ca96318513a3c47229e9c8f89f1ddf762bffd54e1a85e78c
+MISC ChangeLog 45397 SHA256 fc947aee8f71377770332938acb21d407040f5e03a9dc4b0497327f6a66dcaec SHA512 c32ab4a8a4362f1bd27015cf0f11771697f5bf24a7eae810a646eb0cfe4caf5014dd0fa91cc3f41cabee57d9785793d20da475d943f0de18e0a147a6a85027b4 WHIRLPOOL 2982f7ff7e50955e84a0014016fcf16782ad68801c8bda9d0d06e8705b0a5d1e861ff2fe11610c1bfd0f09d50afd3ad412f8ffec71274f778eae2317c8124f36
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 3504 SHA256 504d1f70863183cfdd1c5a00f86a2980be675675b7b6c4891b75f1c9f7993a21 SHA512 03662c349a7316c0ac7eff61c2a73c953e9c2e8989d0b76c0f31ddbaf6289a4ba308ac58f59fe71cdf132d55846ae13d6dd1b4023a4a9a278329665f4339f962 WHIRLPOOL f987c3c30783289a9109fb58dddda5a128a0233fa36a8d110b943b8893c75706f757fd7b85e78539dc239989cda069457ec5ea2a9419f19a40a0a9b80788b020
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD4LDAACgkQvFcC4BYPU0qdqACfUnuEnQLG5Tlp/uh3bEJa9wUM
-BGwAoLlwF1mVqX+rZn8VX2pXKaGAvinK
-=qBym
+iEYEAREIAAYFAlD4OYkACgkQvFcC4BYPU0oHJwCgr0vWVnyDiZLcTrFwvMQ47h3i
+2kIAmwYobSScvPOhgqnQP2WiCy9ogAoh
+=As1f
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/mplayer-1.1-missingbreak.patch b/media-video/mplayer/files/mplayer-1.1-missingbreak.patch
new file mode 100644
index 000000000000..0dd7064e8f0c
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.1-missingbreak.patch
@@ -0,0 +1,18 @@
+------------------------------------------------------------------------
+r35436 | upsuper | 2012-11-21 08:37:24 -0300 (Wed, 21 Nov 2012) | 2 lines
+
+Add missing break.
+
+------------------------------------------------------------------------
+Index: libmpcodecs/ad_ffmpeg.c
+===================================================================
+--- libmpcodecs/ad_ffmpeg.c	(revision 35435)
++++ libmpcodecs/ad_ffmpeg.c	(revision 35436)
+@@ -245,6 +245,7 @@
+         case 4:
+             copy_samples_planar(4, frame->nb_samples, channels,
+                                 buf, frame->extended_data);
++            break;
+         default:
+             copy_samples_planar(sample_size, frame->nb_samples, channels,
+                                 buf, frame->extended_data);
diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild
index 3c9ed5aca965..13de82131e61 100644
--- a/media-video/mplayer/mplayer-1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.18 2013/01/17 16:51:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.19 2013/01/17 17:48:55 aballier Exp $
 
 EAPI=4
 
@@ -270,7 +270,8 @@ src_prepare() {
 	base_src_prepare
 	if has_version '>=media-video/libav-9_rc' || has_version '>=media-video/ffmpeg-1.1' ; then
 		epatch "${FILESDIR}/${P}-libav-9.patch" \
-			"${FILESDIR}/${P}-planaraudio.patch"
+			"${FILESDIR}/${P}-planaraudio.patch" \
+			"${FILESDIR}/${P}-missingbreak.patch"
 	fi
 }