backport upstream fix for the vsynth1-flashsv2 test with recent zlib versions, bug #446390

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

4 files changed, 61 insertions, 7 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9a392c66c7a8..1ad67e339fab 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.588 2012/12/08 12:06:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.589 2012/12/08 12:38:44 aballier Exp $
+
+  08 Dec 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.6.ebuild,
+  +files/flashtest.patch:
+  backport upstream fix for the vsynth1-flashsv2 test with recent zlib
+  versions, bug #446390
 
   08 Dec 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   v4l1 indev is gone, no need to disable it explicitly
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 522a15a4065a..7fa24d250ea2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f4ca8c9547f5b9a28 SHA512 e2994e3b25b207021e00ed982a82efa8ab2fdf2499f5ef97b7f280a0abd33fac639b7e26c26b5ed7dac70931c009b7062b6c91c4b4b38d30a29f8b364a837ba0 WHIRLPOOL 78c41fd6dcd7f698b92ee6f9ac0c5c5d80c8e45c3dffb8c2bff72f0802084b78ce601dd716c6ae7b6bc6641b4f98a1ec33acfe761a13bcfaeafe3677fa6e3ee0
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
 DIST ffmpeg-0.10.2.tar.bz2 5780204 SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711 SHA512 d244931391b35b3aa531a623965cc7f6a1394eac4fd64c411bb12b7e17c2a837ee36d07914f46af87a9012b27dcb22eed09f567b39a142f6c91da692fae3776a WHIRLPOOL 093421f7d62eb567a1badccc2fe6461ff0724c471440e05ef96750ef8979585d5b159dad9a571e573fe99b517ecf30c3641d543b3a91de750460231aa79596a9
 DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f SHA512 41509b736b3158f3b77620bddee509c07d16d239feb881644a1cdbd97a0ea5e2a8cb469c47b2f19c03518dbed8388ab20684f095e023c97f1a6d0b4765f73e64 WHIRLPOOL 7cb9ebf16ec0ee4680876db86a4aa579819055451d546a7dfadf0b8b18c7930036d8670446c75ef2fa51c6ba2a1ed8e7dd1351459caf0023f72825900d901fb2
@@ -14,17 +15,17 @@ EBUILD ffmpeg-0.10.2.ebuild 8623 SHA256 8dff0fc88d64be8e49c771027dc43e50264d3956
 EBUILD ffmpeg-0.10.3.ebuild 8635 SHA256 7a93b57018947a7c57d3829c092aac4ee8e3b554c1116fd2fc41f4b4582bc7c3 SHA512 0a64ec7ef72af03d3997bc48191a4b8cf34ecc79d8cc4648a46e0ea303c38ba0bfe5877937328e7eec32950a6371288c7d4613eb14914bbe0f26f961cbda2d25 WHIRLPOOL 1e65a3790fa9c111c2266d5a2c5f6333ed3b37518dbd2a96d0ac7f6d969feb793430c7a79ee79de485d4c2e3d1b6da103936f22125ec87b061f319ab7bed4fc0
 EBUILD ffmpeg-0.10.4.ebuild 8643 SHA256 e3ae3ab73de82507e2f24356540378123567d869f2ac25315510752071b3df10 SHA512 4fb4c70b55b52f235a277c655a16c06b41c6720c21729ab56d0c04bde689e8e88f46082f07bdc2c750630f448b0e665877e5e116b8d1e5854ff0bc331eb1f0ed WHIRLPOOL 8a72ab46e5856b86836382ad73b2a8c10493577c5a54ccc1e2e896ffd8b986f2904b2adfcd431bd9c1f2df4c62cf55b6667b845b2b9f9b4f16da43f00402fa79
 EBUILD ffmpeg-0.10.5.ebuild 8643 SHA256 9cd95876fbefdbd3320b8667b0fc3e84f237916e22e74b5c6fdf739e6539fa25 SHA512 c72d810514a610c7399aa291ed9c6df941d59ca9b07206a2095446230c9799c917f2ac9324fa91682163ab478508804389409aad228c0b78ea29c077d93dd278 WHIRLPOOL 7310dac0aca5495bda031eac44eb5aa3eaaa8f6151039c41b4b749cd10b3ea1b7e2c6baab9225dec74539b1eff5a8e826e77420d0464390223a3e17059bec316
-EBUILD ffmpeg-0.10.6.ebuild 8645 SHA256 047f0b8fbba3c2af0672bd917d7f5f4f0a605a5fd1a99b6023bc6667219035bf SHA512 2af21f3a4924f4d441b799c7508c41d92634e60a9f85299a699fc20a2a0ee17198d96b4440410fe854896e232c78e52712a3edf9f5a8b7322b8f7a1644137f1c WHIRLPOOL d2054163e70653fc04b29db611ce012dab42b51a7586ea22a8c68daa68b74df928b6c8ab163381c183fd8999ed5508e8952e166adbf9de64e551fed1b6a375ad
+EBUILD ffmpeg-0.10.6.ebuild 8683 SHA256 1e050fd8dcc1b56bc6b9fa7eaeeff0a859ec7345958974c38304202c473db4f9 SHA512 ca505e9600edec8b829556997836f44fa2689c722966ec25921dc7175e45e9e5fdbde885272c492f2cdbf1f80ec4419f1dd6704f27efc41810ce415d6f400763 WHIRLPOOL 9b1a35247a6744ecf8c44eba0948bf7658bb6e1cd288193b9d878e9954e64aab75d0e24e97a04c916030382228d81b40376c8a5e85259cc41af89e8461eb3365
 EBUILD ffmpeg-0.11.1.ebuild 8781 SHA256 ac676957c3fa78197326e28cc49db75f626e10d73c218e58ec6daf125d5c1ec9 SHA512 79bcfc09186272f41ea531791c68390e7a65fb284848bc570162d9e92ac4b99d3eb1c391e2d1004f2450b86242b68261fabed99a6ff56734059479d864674030 WHIRLPOOL f0671834fdc160627a40de6d36075fd52744b8c8cbfdda68d2edd5b6e1584c9b424fb577d8614145b3809de4ec5399e5f92be0e1144968dc9be1dd3fde69f6dd
 EBUILD ffmpeg-0.11.2.ebuild 8781 SHA256 1b3d27693e38c9ac39fd75c58625c969c157e5d1ce4962d86102cd8c14dc331f SHA512 a04bfcd20231537bed1d977fc924b7fefc5a71691f62327224c57e3b659193fe86742572a488ce9399a151229b7a907fac06b0cd87fad2a7d69baca9fc0b880a WHIRLPOOL 72879505edec487f42f42504fdca88148869e6c7e588c13c2c881e2356ae9055be32f33711fe11d6b3ed6c10ca4587de8f2e5004e15de8c8c69d575228a99a39
 EBUILD ffmpeg-1.0.ebuild 9135 SHA256 3cb747f4032a2940bc7587e4b58eb3c086e7af1f563815bf342ced6fe76b7a42 SHA512 a29c8a1a2597d16d50dfcdf0fefa1dc0f7bb87fddf5d5950e827323060d90389519a4936ef46bb663a6bc54c84e08304fd44dccbd9720686811fa6ef0169915f WHIRLPOOL 32473219efd7e69e8c64edf85df4f01ff49c30d3d3db0d676ddfd9fe61d4c1c76efeb55dfaf2e57b4c2c2d58a87127224b42651d99780ccd2552a63ea54a3a0e
 EBUILD ffmpeg-9999.ebuild 9153 SHA256 78c2d1ba2f6704d1a27f779c72279f8bed48bce482fd91e5e7ee1e6e147a31fe SHA512 fdb9e27f133da9006b8435923e56edb274e985c7555688fb9b16891285fa586c9d9f6fcdb648933d3e936b7f95fec495ea3001b8ae8c2be39e823989808cfc69 WHIRLPOOL 03348da08b3e9cc8669dee00390d3ed7187c4affd2ffc6e267be033a9b0a6c9cf7c938d344d220b444cb231bde27904a75c647f24f2ab8f61157c54395be5303
-MISC ChangeLog 83130 SHA256 e6b5e9b764373a1cd35becb1f78f850719dd3b9198708946416d86b167ff9231 SHA512 7fe31713a40d3d5c9d77af6cd3304cea4321e43c83a4cc3fbe5d5dec4f283e0e8abe33eacf26de699a79150296593a3190509bc514cc3833f8619b98ad115cf1 WHIRLPOOL 9b3aa8c8372393cb7dcc3b181c006dd37d6cbc94f28b7fbe0d3a5cafc4f785e69858ce0b19e916048be1d0f38fc3112f063fbafdf3cb5637ddbfe9dafdc1ee88
+MISC ChangeLog 83326 SHA256 e42ae762beeceb289a935973177484b2911a805a0cf10ef25e281012fc93f1b2 SHA512 4fae5c7db182aa79a0644a5d96028c5994b406c44d08b825bb42d67b329ff06c085fe7cb1e78059a7ca7457d6153093ed84f3179a13aa843f65b4d35627667a8 WHIRLPOOL 23b80eaeb3a3265a54fe073aac138e28ffb7c611a8b048f867ba3578773fe579e05f0fff8fdee3b7eacb797590355b565bc002c20de5bcd13e0fc2721691d0ce
 MISC metadata.xml 3545 SHA256 71ea800494ce0b5c59dd2407f322e16d9416bf089ac3f9a45f2e70626a51de77 SHA512 e6f525b1b1a9ce95b9695b7b8ab42cb72f7cbf24633b061fe52e8a8b7570ba44f721ede5e1017b236ba26bbb21e7d9f6db6ed3f7b078a239dd15a828ba917e96 WHIRLPOOL e95c57c55d99cf57ac8e25bd4bee4e9fd4e6d2a027e2c29f1dc9b86195bf2c102fb32605415baf5201d315493966c30ea7f5b7a55f538629dc74d810080991fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDDLTwACgkQvFcC4BYPU0qYNACcDc8krru6etjbKsPAOLGvMMe7
-/H4AoLHOo1W1+2H3WO563MDGY1hLVXw2
-=EZxo
+iEYEAREIAAYFAlDDNNcACgkQvFcC4BYPU0ohHQCfRO81nz9zEVefg0kXc+F0ZCbL
+m6YAnjRWHN4IkoHYou+J0GpZxivR85Re
+=0cA1
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.6.ebuild b/media-video/ffmpeg/ffmpeg-0.10.6.ebuild
index cc7facd719ee..47426afc7a86 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.6.ebuild,v 1.1 2012/11/14 12:37:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.6.ebuild,v 1.2 2012/12/08 12:38:44 aballier Exp $
 
 EAPI="4"
 
@@ -120,6 +120,7 @@ src_prepare() {
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
 	epatch "${FILESDIR}/freiordl.patch"
+	epatch "${FILESDIR}/flashtest.patch"
 }
 
 src_configure() {
diff --git a/media-video/ffmpeg/files/flashtest.patch b/media-video/ffmpeg/files/flashtest.patch
new file mode 100644
index 000000000000..b15e799df396
--- /dev/null
+++ b/media-video/ffmpeg/files/flashtest.patch
@@ -0,0 +1,47 @@
+commit 785d8a3868fdd965299cd6e230803906b047eee0
+Author: Clément Bœsch <ubitux@gmail.com>
+Date:   Fri Feb 3 20:28:32 2012 +0100
+
+    fate: use compression level 0 for flashsv2 tests.
+    
+    Output sizes mismatch (and thus MD5) between zlib version 1.2.5 and
+    1.2.6 if compression level > 0. The issue doesn't affect the intra-only
+    tests.
+
+diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
+index b8d27cb..87db24f 100755
+--- a/tests/codec-regression.sh
++++ b/tests/codec-regression.sh
+@@ -294,7 +294,7 @@ do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact"
+ fi
+ 
+ if [ -n "$do_flashsv2" ] ; then
+-do_video_encoding flashsv2.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental"
++do_video_encoding flashsv2.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental -compression_level 0"
+ do_video_encoding flashsv2I.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental -g 1"
+ do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact"
+ fi
+diff --git a/tests/ref/vsynth1/flashsv2 b/tests/ref/vsynth1/flashsv2
+index 6c43bda..58e2e8f 100644
+--- a/tests/ref/vsynth1/flashsv2
++++ b/tests/ref/vsynth1/flashsv2
+@@ -1,5 +1,5 @@
+-ec13d68cbce263f589fe79bcd2e98364 *./tests/data/vsynth1/flashsv2.flv
+-8406137 ./tests/data/vsynth1/flashsv2.flv
++8d105780bb79915bc36f96f7a754f289 *./tests/data/vsynth1/flashsv2.flv
++9371095 ./tests/data/vsynth1/flashsv2.flv
+ ed28c0021768629b2675e72bf1632426 *./tests/data/vsynth1/flashsv2I.flv
+ 8755723 ./tests/data/vsynth1/flashsv2I.flv
+ efa88d09115a2e947eff00ee435ba3f3 *./tests/data/flashsv2.vsynth1.out.yuv
+diff --git a/tests/ref/vsynth2/flashsv2 b/tests/ref/vsynth2/flashsv2
+index b40988a..7102308 100644
+--- a/tests/ref/vsynth2/flashsv2
++++ b/tests/ref/vsynth2/flashsv2
+@@ -1,5 +1,5 @@
+-6fbb1cf84d473a93035047c3a3e344ff *./tests/data/vsynth2/flashsv2.flv
+-4814443 ./tests/data/vsynth2/flashsv2.flv
++3f4a7454fa664896ac7532e3551c4071 *./tests/data/vsynth2/flashsv2.flv
++9293862 ./tests/data/vsynth2/flashsv2.flv
+ d5a22183d9fe670174340a8a1847e52a *./tests/data/vsynth2/flashsv2I.flv
+ 5037122 ./tests/data/vsynth2/flashsv2I.flv
+ 8f63e24049ba1789a7f8353c695a3d99 *./tests/data/flashsv2.vsynth2.out.yuv