Fix build with ffmpeg 0.11 and encoding x264 with ffmpeg, both patches by Brennan Shacklett, bugs #322945 and #419551

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

1 files changed, 18 insertions, 25 deletions

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 7ea2351db77d..c03e9f95d166 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,31 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX transcode-1.0.6-imagemagick.patch 672 RMD160 2d1ab8cf8ca9846c8ca5de24033b358985050f85 SHA1 e2e2890f9217c068755d094fd1f656d8c344a69c SHA256 bd4d8aa5577fabac5becb03539db1e547e72cd2e4748cd53c62e8032acaf41ac
-AUX transcode-1.1.4-x264.patch 1837 RMD160 6ec8925ca714f688df06f5df229c741ca2076708 SHA1 6f54bbebc996e4576e31f16d22863f23de2ce2d9 SHA256 f1746212a2b2f2bfc01cce0e26c83c2392dbd776878a76e627f7ec809f5da0a9
-AUX transcode-1.1.5-ffmpeg.patch 6128 RMD160 7c21b8daf99b599f0b3005cd2b08ae5c894c4552 SHA1 2d3bb4486394ee55540e772f134e193874e5c2b4 SHA256 a0246b84d12d289a940468a289ad5471c29d7a35c8317293a0dc0c7428445487
-AUX transcode-1.1.5-jpeg-7.patch 460 RMD160 2e5f96ff0700890814e1af2338fe0d7dde147f04 SHA1 9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977 SHA256 f4807d5f598e387a7056c41bc0fefd29f61b75dcf946e2894c783481f6a627bd
-AUX transcode-1.1.5-mpa.patch 583 RMD160 6500b698ff0f46e2eeae47acd1d4e4c4c2f1cd4d SHA1 6f45d9167c3aa15a83cb29545749f55eb1f1e5a2 SHA256 9b31976d3104e024c3fd339d501575c48d3cbadc99bb3121e5934d48bc6fc193
-AUX transcode-1.1.7-ffmpeg-0.10.patch 402 RMD160 bf22b44f38e3191d24c9483c9d354b57e06ac8ea SHA1 3b1590f30f8f32350444f668584ec31be6e8e614 SHA256 5df30ce0bdaee1d61a5dd94d242ce010dc043305553519a1532c33b2628ec308
-AUX transcode-1.1.7-ffmpeg.patch 2274 RMD160 9873bd9a8ba3336948336a508551ca3dd0ceaabd SHA1 cc81c190db51d8a64623e2eea3b327ec7eb7ec57 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61
-DIST transcode-1.1.7.tar.bz2 2183627 RMD160 faa854acbbfd52faaa216505176f94d756d77841 SHA1 e35df68b960eb56ef0a59a4cdbed1491be56aee6 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92
-EBUILD transcode-1.1.7.ebuild 3146 RMD160 dcfafea6f3951c6cec1573a073e2f059a08f38b7 SHA1 fa39d9a4e43f843e56d000ba5bc8c6e3c0ede2c5 SHA256 b385bcc5568d0deaefef40c959c3953d7b348192c00d8f5620674ed11135f999
-MISC ChangeLog 50156 RMD160 e624836526507e9307db60dfd68f4a08ae665cb7 SHA1 375e04e7829021bb992c33b8fa8c545659aedbb8 SHA256 1dcd476fc30fee243cd41e382ef36fd5b4f4d3bc484325b2f1bf81b11d5cf4b7
-MISC metadata.xml 529 RMD160 c52a55dcb8ffedb63e2ddbc99d4bf959f9772550 SHA1 f26965716f7025486b78a2c953efd9180ed82fb5 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209
+AUX transcode-1.0.6-imagemagick.patch 672 SHA256 bd4d8aa5577fabac5becb03539db1e547e72cd2e4748cd53c62e8032acaf41ac SHA512 f0f7cba88468f586003b6cd763592282430f284018bedfd463b9aeb8ab843956a5a941935df32fc661edbb604e98351584bd04575c607f10fb9b262992830395 WHIRLPOOL 684461d5559997650f48895b4dc2e598919b26641aae9ba2b6358afa838f3911c6f56ca699a9f757a130fac3b29826b9ca6d80ad602092eff77724d13c9ba94a
+AUX transcode-1.1.4-x264.patch 1837 SHA256 f1746212a2b2f2bfc01cce0e26c83c2392dbd776878a76e627f7ec809f5da0a9 SHA512 39f6549441ef2945d23d63c92e40da842265b4c0edbbb55a0eda92fe5e6a7944894b23a26b05a2e583a1aff43197b55ceed44b09e6ee2793caf0c2f159183ca7 WHIRLPOOL 192d5ec557f9d1cb0ee10f4fed3406f55313b91e51f0597e499a34b2f8711b96386492a2275730f0866fdf5ffe96c06eca00e23b6f7a7df6e91d6b617eb84925
+AUX transcode-1.1.5-ffmpeg.patch 6128 SHA256 a0246b84d12d289a940468a289ad5471c29d7a35c8317293a0dc0c7428445487 SHA512 47a6e084e3079fdf2c068ea1ed24761b999481d56b04296cff50964218d9b5cb85697529de7127b8dd8c551e44ecb22b89550142a0722949dfa43f97c1da23bc WHIRLPOOL 84c213bfc16bf5e803ed83ed5b96d25e83c720ee113fcc397aa0f89d3c0b67d8ed125fd2ed55ad27d64b12c96b0a9700d266c826ca186aaaf005d8814b30aace
+AUX transcode-1.1.5-jpeg-7.patch 460 SHA256 f4807d5f598e387a7056c41bc0fefd29f61b75dcf946e2894c783481f6a627bd SHA512 eb362d6b4084565f8e808ccbc2f1ec9ea5d6c39fcc9eb787476d4dca4271d0d529cb25080d04e10f9181a32f2b68747f0d9402f90fb81c5e96b454bd4483e27d WHIRLPOOL 31a4b26f2e31aeccb1cc08b1c3d7c96ecbde31c30fb025632e03c0f6487bef0f9682c7c1e77af287dc4754732d39a7bd3d6c3f31d11eeda72f836123f94bc255
+AUX transcode-1.1.5-mpa.patch 583 SHA256 9b31976d3104e024c3fd339d501575c48d3cbadc99bb3121e5934d48bc6fc193 SHA512 e919d5e3840aba3acdd2af82634c5b42fffa4f00b259051cf28ba3ccb58228986cb4cab098ddfeb67d89d331192e5f41a75c5b4e0a18d2f72034fbf4c3cde54f WHIRLPOOL 96a26e5971b6d7b6aca2b40c8905c20101483608a999e43dd5ac69850e2c241c941da232588dcbc101cfdb3c57e6b7817ebe81e0684d0cec4c8bdd54557cf324
+AUX transcode-1.1.7-ffmpeg-0.10.patch 402 SHA256 5df30ce0bdaee1d61a5dd94d242ce010dc043305553519a1532c33b2628ec308 SHA512 d15a222ac21ba91758cdd8c7e43188cfa5fb015d3bdf2c74290b26e5fc12a5899f6a6ac59a9763ee8009ed7fb8fcf4b3dc9ec4f4cc5ca8049bd5f437e7b725bf WHIRLPOOL fc06332d4f2037083f57edfbcd71515fd6d9d64a03bceb3a71ab7d44b795c01eb6cfa8675a27bbe252fa12650dbca5b7100b04f78df3f5515f3827bf59fe88fa
+AUX transcode-1.1.7-ffmpeg-0.11.patch 12718 SHA256 52f62257ad3abcaf72b306549f66b3aee2a38d2b84713b42be26b7fdcd5f203d SHA512 9b39f15d20830fb57f86750a54a5a7c6025ad69733d668df45a06fd1134e0a6ee76a495a883797b41870b156b4b8895a4dcedbd5e28712d69a98baa7b5934663 WHIRLPOOL 11905b35e3b4b24e8e779945d81743520c554c0c8653d466db095d0d02510c2f6a00ce8d632f8993d829607d37ec8887e79401f6da230f1e8352bad7e55b0fe1
+AUX transcode-1.1.7-ffmpeg.patch 2274 SHA256 443776bbc3497e1f256eb74c19bcda293cfd751776817bafc1ca89ff510e3b61 SHA512 d238b645b27bb83e2a1753b9dc99909084292579b757831d560f9535f1eb4a4892bd89047f0b23625f66e72fe8d373002abf8a6a03334c720b065af4220f5a9a WHIRLPOOL edbec136aa7a53a8119f42c9a2f8f000a743e9045892f160dfa4e513137c9e10c16c0316894874bfeb9026f5f10345fb9b920ff1e5111eedec84f85ae9f680ae
+AUX transcode-1.1.7-preset-free.patch 1370 SHA256 2219fe618be2b2c3fbd6e3545cdbd8db8d1c268a0b37bfe867514f871d7d91ef SHA512 46514728ea0970bf69ef0341ea64dae495a1a571a0416cf20cfaa7c922ded0ae8dcfd717c720c53e457a16585722973266e5cc0b509034ed2549338dc9bac912 WHIRLPOOL d7247d7e506bc5fd2ed579d934ceb121a54c93683de143b7c4ffbdd4b33799acc9c1b4e93e90db4788c84bc4320be05ae90d2760a86a979ae1f57fd4e3bf3750
+DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
+EBUILD transcode-1.1.7-r1.ebuild 3231 SHA256 d43010e9f7cd95ccee688cea55fbca6d8814c2e6691215606c0bcfb09596e95f SHA512 28a6c11268e1b522f5bf56f81ec3bc900c8c3ad3813d1d1a8d13a858621f538ef7eb8b8fb2ba23dd0992a028403757589b0956a971c67311fd425c06f8dec213 WHIRLPOOL a1059f82c3f63bd3163324c0437ed9cee56f901e4034c728264c09b287dff4aba7b6c5a686e1f4ad531146a571c1b7c44ff70d06cbf1a806e23766faf5816b65
+EBUILD transcode-1.1.7.ebuild 3146 SHA256 b385bcc5568d0deaefef40c959c3953d7b348192c00d8f5620674ed11135f999 SHA512 b1eb4ac1d859ccc3e60dc7154ed41aa2a5fc30d3e25b1ce6e060f97ce6ed7d1feecf6d2ed86c423be882b6d98c3d964666414dead2ae1f0eda613f43fb8ab97c WHIRLPOOL 5e61963fc57633ce2bb9069e2714645ddda4bb02ae383a3eeadc1c6c4678eabc3f9ddb017c7a0cd278656d9c042f45674c5ddcde52c7afefb503b91cd6981d40
+MISC ChangeLog 50446 SHA256 16097f5f3f2722df636b5535db3c2921e02f66df7908209b42d5be0fc66e286e SHA512 a1263d24cd14d748c77bb23555b3f84a2875d7603aa6b4e6191c7dfb7e8650435cbf2a9330c74684d8531e56dca0c7f5521faef25981b198918519e11563bf61 WHIRLPOOL 03359a578e777f6f3e15f5e18dc466021c39aa48d0d082c89ffd1d524aa832cf8f6de598068aedb6735ce4be755719b0ec76462940d4ec5b04e1ebd596fca17f
+MISC metadata.xml 529 SHA256 58d8afd76de3ea91e1967cd96c24957e2ca06226222b81226e6b6ac55ce5f209 SHA512 6c5a6dd9ef9407f0c05f42cdfeaf4d3c2e2e6a4c91028331b6dd905acf1174e7bb937b780d12043f030a6afd344aef0df1a2a3d13cbda5a71724bd1f7a8b8302 WHIRLPOOL c27354b3de6c7cb67a30adac4c66e4b72726ecf3e1a1b05fa2e759ce174cfc51154dcfeb0c1b48754702e304fc95753c42ac626b0d6338021737b84bdb074385
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPtLqNAAoJEOSiRoyO7jvoyWwP/RUiDn7DsBanCRYcTo0XFhRl
-u9+fZJwuDFgpPpXqBkHySZLwN0k5ey6epDuY7ZyZoIJqDX2gPhcba6ebWSK3AkJ0
-Sur7oJhh7djzfP+fnPAEIUXtGH6oTEFdH2MqQXBbh3Tn7BIgLwoa7ut4w8kty3F4
-dzQCS1BcSRmvxh51QzotjfC9nbcLvjMnSJPE4dX+SME4oZegJCfRDALrmoPbr0E2
-939Ws6AUarEUOClsrXhRYdyFvHnPaQKTwhVMTGn5IerHnP1GpcwYxYyIm+vOs07n
-NOP+s55+i8/Kb/2/9Cqk8Kv52EuvSPDxZQW2/BDjfq/J3QryYOOkbRUIq3MeOxem
-fy1IAYEp6VzqJ+mqylJhH+NkJGToXRKaEDN/MrejSJIx9TPTDwL//XebuPmGOAP2
-SKLByjZxYGK0kJ71oGq0+sR0fOGVjmNVOupzNqByr3raUppPTw6cTUFmfVmIOi1w
-RV98t7loCOwu61pFsyjdXt8NMFYSjkGmyzHvOmR4WaNEG8yRCA7v4Zho71W4iXtF
-hpcVAdNE/ZcgH3GbUBWGObHFEtsd4f91hOQpSxQ4hx7Y4SjCrB3OGaeHuQDP5ToB
-2X3E7ioTzZcnu1bOeQUEPMifCMED2qdO/CVKS8bruHqH6I5myizcQv94ao9HPsCL
-DaDjvu662PRRT+7meM2n
-=XyWo
+iEYEARECAAYFAk/1rvYACgkQvFcC4BYPU0pgEwCcCkjHLOGstwu0rYvH7AkzcLAT
+R1EAniVnWN1T/XoOo/4wv2kfFm2BccK0
+=wwNq
 -----END PGP SIGNATURE-----