Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493596)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

1 files changed, 24 insertions, 9 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 88e37715917a..d44e57268435 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ffmpeg-0.10.10-freetype251.patch 1841 SHA256 523e34408a435958c48021a85b366468062eff5e523b15499f7693c862135017 SHA512 082249f8fde79e1a658156901b68cee80ef1152f6b94927d235d1fb4dfb5acf7b51809af8e405984692536dee2e205357701043438f81b892163db6e592a4005 WHIRLPOOL 2c90c2f9b9f80b039797ac63329b8d6e8c9acca79d288d7cbb971c7275db84f28a7b2588890799ef03cd75614d4e148697e381c69d440639de676eb8f607cc39
+AUX ffmpeg-1.0.8-freetype251.patch 2008 SHA256 b52b832ad8b35ba79a1cbc5c592510d874e321de2ce80bfa52e21cd74aec6404 SHA512 e56c68980a52d9ff65e92267cf23ca5170c7ea7ec3100012af19f598c4fe64e6afac53100486edd5fc14ace31baaea01ddf552c74b9138c067cf95672e86c17e WHIRLPOOL 7a8084726afae99de24da2ba04889bb11993b59b070316ab2c9b20a38c59d61abdfa625888433e253be0c948cec39127c8b43d66f695ea48bedfd215cd03e392
+AUX ffmpeg-1.2.4-freetype251.patch 1992 SHA256 33108aa78dc6195ad94311b86d165fdcf946a1a7e98e20a2cac8824c1fe76513 SHA512 410dadabf940f54b03d8437f11e9d65ad2c4a254d650d9a519bd994cc1942a678da6470c6b7713379938b46188b1e9545e028fb39896da79410f86e3870eb1dc WHIRLPOOL aaa28731bab000a4419912e97cf69182e46f9bb09059c27de874183a4b3776ad5ec06095737640e6dbdbe02dbfcfb820e4faedb835cd37657bfeea2221d97c24
+AUX ffmpeg-2.0.2-freetype251.patch 2040 SHA256 f7478552a7b29d1420ff609fa5fc5fd20413224624da4c9e4e42358ab5ac8260 SHA512 34b736207172f1bc95734d5ce71282d96cadc2925879c8cda45acce1ac8c8f2c44d59a7e6f368f8c7a987b8ca967d4ab7ee4da765baa60d060ec7a91d3d9cc27 WHIRLPOOL f7af767d60556c4a09f5086c16855b9ab987d8015c4acc1cdcc779086cfdd6631cabe59203cc05d89e7ed008218817220408e666d46cf48f2e8f041dd376711e
 AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f4ca8c9547f5b9a28 SHA512 e2994e3b25b207021e00ed982a82efa8ab2fdf2499f5ef97b7f280a0abd33fac639b7e26c26b5ed7dac70931c009b7062b6c91c4b4b38d30a29f8b364a837ba0 WHIRLPOOL 78c41fd6dcd7f698b92ee6f9ac0c5c5d80c8e45c3dffb8c2bff72f0802084b78ce601dd716c6ae7b6bc6641b4f98a1ec33acfe761a13bcfaeafe3677fa6e3ee0
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
 DIST ffmpeg-0.10.10.tar.bz2 5785849 SHA256 936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91 SHA512 7179cb29596c67faedc73e57f0b7d55a9e05a3d036aa0454c47e316cdcaf16f7f2d8deb58380c2a02df3fce322089d9e6476024da5832b9b5e39c46d48b729bd WHIRLPOOL f9dfc3ef37356c1683ba6d76a4ecffc04f166b551d87c8421c940d2d637ae10ff4f2a8df473b8eec012319c001097bae719902a1b315933d1877f02e17100c76
@@ -10,24 +14,35 @@ DIST ffmpeg-1.0.8.tar.bz2 6452144 SHA256 8580a317aa09fdabdcf5119c87f59fd3baa4df0
 DIST ffmpeg-1.2.3.tar.bz2 5968552 SHA256 d97462cf1619bc9552092649c409ed94854b22cffbd274df8cfbefa8f8a3715b SHA512 81a9a0a351a44bd4ae4162a78f886a7e4981420d5bc6af980a1126068cf77494f236153a4a39cafc01049cb1c57247a79034e7fd3a5adb441d103024aee6c7de WHIRLPOOL 3ffc7ba68cb3acc01a2a01f662c856663645f92596e17aa919500fa90edde085b552a06edd50f9c852a9e8952307ed13bb6abd67ff923dfe3b131132032523fd
 DIST ffmpeg-1.2.4.tar.bz2 5967562 SHA256 3b96c8ce1b86575cd74f540e5b7a52681554289017d4b974e4efad2a09290ddf SHA512 9c3bf2b31cc0d0028cb83b9c4821073b7c11a0c24ca44f6353086e67c208c45840e71810d70309b655fb1e7b8bbe073f9ab7f336d8064c0e6130244a806a10b2 WHIRLPOOL ad1f10a5191a185c08022f80aa8861eede4680b083224e9181328b2f62a78d3a69c96b53a638125ac44ee68a949a96bd17b913955393d135293fb3ae2174651b
 DIST ffmpeg-2.0.2.tar.bz2 6191390 SHA256 986f63dc0785f473b1832d0eead502e39c9706fbe7f9677bbea0dad6fe0fab4a SHA512 4b194e78a011c0df0173f1e99511ae25272501cc380ca616d60e10a489b1f7e4f1b72f681e4539db4e2da491010fb2225190a24e480a1b285decf4085a4a31f4 WHIRLPOOL 080c9eef1bb0645d88f30efddb31e5443582345d11e6df508d74a0dad98380abb432af8f46ce348b4bcac478595f55416ca60ea5eeb57de8ee9ddcb7391bf2d1
+DIST ffmpeg-2.1.1-freetype251.patch 2824 SHA256 4fa40d2d0f16114ec5e328d581608e475040512eb3f27b93d896250fc254f58e SHA512 453ebda19b661c4b077d0214acb38afadd5e2743e2df03f8d1ba5bc37e00a3fe92c4d8b641054d56fe637e24d0989fcc8461a5957bf9086f08475875085bb3be WHIRLPOOL 5b4db507ecd9519d919018d55477bac678fc3d99104949bf0f618484e8018aa2fc26947deb96c5bb98e0b15bcce4372d74587dd3bc9205971f266771cd8ceb6e
 DIST ffmpeg-2.1.1.tar.bz2 6641619 SHA256 bef95e5b9aac45adec7ef434537504a63b4bbc22a8ce6a96a68e19c5efbadae2 SHA512 762691408d536753a08620162b04d2b7746e814d666e6e7b5341f4731de5e38e043ed47a6f0a96a09795aec8de07814946911fec48e8cdff60d0317f85a4b7e5 WHIRLPOOL bd14c405eea1b4214773a075ff4e7e902de34f1fc7a7a48722c295549b76e47ed51674996d1e065a96d71259463ae8ecb4b9be5223a298f58603303c2abf8f19
 DIST ffmpeg-2.1.tar.bz2 6640774 SHA256 926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df SHA512 e4c98a6d92c3e89ca55280c7e399f6abacc0f2b8d2e97662202e988b9632f124dd849cbbdd7472dc1d77c22d5ca023f6be14173e2b567a0d13775f64fbc08099 WHIRLPOOL 0ec7fedf2c90016f4baec18a5fa7d2f078e5f4405ecc66a9d6025ccfe3b56f1abbe7673926b34670e63ee968333ec1bb6b279202e160f826ff857f80141d790f
-EBUILD ffmpeg-0.10.10.ebuild 9629 SHA256 34ad62fd8e306d7afe517e8664d5e934b0f5057242e16523f29516d5be5dfbd9 SHA512 af2bea1048eb6927c8feb97d27eb31aafd6938b2c088b5f40a280221b0bba6935c19fef8528337319f6c7cbb293f11d02e443e9c13085deb8c2c82ad93247cb2 WHIRLPOOL 55711751a2238dd479687941fb0da5b3647707aab38fea9bf1d3c01e658f4143c47d269f2538b0b6a1326c6556cd0d3d1140d0232cf64c6da4fdad87eaa23117
+EBUILD ffmpeg-0.10.10.ebuild 9688 SHA256 9b558b48ece44c0bd24b0940439cd371e359b0f25004668a7a690696e631db32 SHA512 36297d05c87f3c104765e44d96c2a4fae00c26a8e637f3baab9169234fb3fe5bc97eef36af1d69c4dcb18b086afb2db528708c544e1c5f17a1b1121580c5aa2c WHIRLPOOL e025d23cdcb7dbc8e386ed74ec8ccfef232d24007c6f969d73515bcfd06c1420b0057eb551e2036a3d72bbd2f8b830be18a2d982540ebfcb18c3c594a59343c9
 EBUILD ffmpeg-0.10.9.ebuild 9628 SHA256 1ae7fe6e3d8cfff291dd06abbde97523225a04d69fa5634d999a233b0d65184a SHA512 282212ba8a13e6eaf8676f0a6b08f506ed5a183f050abcd30fef30f301248368a51dac89d5185332a25b4c59400b125467f8b277cbf58f3ea5d0e9e0f79bf5dc WHIRLPOOL f8602667c35525b7339cd3df4610e444ff762a13081bca9977b4728d8a8d6084a873eb7c170bc5e99a3d993ad5f1108306e40d94fc1d21b9e181b538823493c2
 EBUILD ffmpeg-1.0.7.ebuild 9602 SHA256 8043939761a0f81f9a69e5d70cb3a017445849f455a4e4ce9d36cfd2a032687c SHA512 23690d129f2b1a64de04309b3f9eadbfc6d4de696d0cd126d085812f434088977f31dfdf31f3da5453e1f7da6e83ecd4ae0e122db7701152c0d7bb12059ab9e8 WHIRLPOOL cadda4f937286bcedf83e61d7d1227c8e9b963922535cc284c4b9f6c3633b907be4eb68027bddbc87244ecf340f86af8ea9526688a731495f96d97f6dc71a7d2
-EBUILD ffmpeg-1.0.8.ebuild 9603 SHA256 9cf33b05e33f931f41fc18b18b46ec83395a984bf9c5eb4fec2d65e3f5c8a8f0 SHA512 783156f31283f29134a350de3bcac91fd248ae4a3d75ac4291d4f0a13d493a1b1b8f19a564dbbe2d933f52158494db03c9684e4ac6ec4e4f5d08ccdcbf380431 WHIRLPOOL 8296ccfe3e11f3afd60f4f7a4785c2b5cd25435e9048dcf33ec442e8dd35a995ea1746fbcb8c13e9069a3131db639e59e85418fddae64f98611f6c0abd1d27b5
+EBUILD ffmpeg-1.0.8.ebuild 9663 SHA256 ba4cf5934d84badb86c91f5c2b82eaffce6ebfb9861325bcac82c74d38b3a567 SHA512 93e95d7be0446cd002070d20e859f894e7c10ec382d5f62c75e9ddc8d305a17bbc64f5ae8b5d237f9fe8b0ad084aa2f2fa58453810e9fa65355d2e68b124ed0d WHIRLPOOL 8d540ec9708f9e7fdd6b165d3764429282969beafa3a6840be91fd990175215ddc104ede8d1d21081d7340c42ea9c655782fee01d2809e22e95e0da003cf2e6d
 EBUILD ffmpeg-1.2.3.ebuild 8938 SHA256 c93bdb73ebf4c2fc20f047983e3532cecd533918218196777de3e730f6cc0db8 SHA512 87c906c60da0302d4f3c5731995ec3a399d1c2b12ed571d2979d8cedfec8ebd561750da16449d76a684fdd1b883eeba7e782c3859148da8c9286acaa4cd33cbe WHIRLPOOL cb3f2b83ae6f849db0c7344cfb79f64fc06ff87f9dd7ea39f3352b8337ade1a16dde5b404a194c8e4185b8fb6b20f4128a80b19bb579a21503bcce423bfc35a4
-EBUILD ffmpeg-1.2.4.ebuild 8938 SHA256 355e1e93f1e29be91bccdae3e8a29a7fb2200eb6cd8ef65d11afbf45ae49f714 SHA512 67386dd72541faeb911c2ccf93d29becd149dd47af17c857062dc438fa38e6235691595e1fecc1a6506d485844589b6e60f04006e57726c5d863b2b684f072b9 WHIRLPOOL f0c6a478834ab4132753d3253ce7cfc7020a929067a7baaaab49b19451ae8ec3b4e8465a45dc6ef490630932220d82e5f10c2f101206be58f0c99e58bf65becc
-EBUILD ffmpeg-2.0.2.ebuild 9757 SHA256 1a73660a475f3a910e627fb356a787c00cfff1d5d1dd069aa93af8a1d4b0c613 SHA512 c6156d4301d691f2442066cdb5b020416d007dbfda569ba5f3c1851ab48a94f6775eedbb54ac4e930d281e7c142cdf178d20b8ff927d745eaf4f070d5f80be3b WHIRLPOOL 8448dd2b1b2f556949216f771a0ce44c24a80afe948898dfe6c6fdaa86c5ac302a8f6b89beb410fc388618779245bffdf5442c6741bd4832507317ea67c19f67
-EBUILD ffmpeg-2.1.1.ebuild 9924 SHA256 cf80853fa0e3c4f4acdfeb25faf858b69fa7e74c4aa7e8867667759216656c63 SHA512 2543ad88a67c7649b2ac77bf07d4882f5960284c4cf14c1a56d81c7aa644d1bb3451021eae8fb9d5f8bbe49f3a357e8fea1d3c5b7992db27f8d09ec581b388f5 WHIRLPOOL 8eca7d094267eb10639bf95574394102013fdb80b166a3d93d91e58d75d52aec6b76a3104d0c912bd00570b274b13005779e9fc324031e0ca8e7110b4b1adf2f
+EBUILD ffmpeg-1.2.4.ebuild 8995 SHA256 470de6c8c403d844e876d4fa3d4b41225931176eaf4b14ec44db784ada42e250 SHA512 9e3966f60881134384faa97588aaf3588d2b5450d47401c30af1cadc2da54d4cb7f2ed4c6d041ac80933c0966cbf7047754362b28cb41883ddf79bb30ad09873 WHIRLPOOL 1deaaed0a61741c233339e47a7fddd602dedda00be4d442ef56d98965ae4946ce0ee655eef58c0fe1e4aa9690c9e15ed89a2b846e198e23f0e69379abf846164
+EBUILD ffmpeg-2.0.2.ebuild 9814 SHA256 e87d2e765d731e2db9e83186eb002d52b645972d54b5044d4feb1312707d046e SHA512 a1ffd624912b33dfb9545d55fa401d74798d3320ba71171423e70994a475c954654cac97e393ea60aaf248a2fa88bd9f3577770c643241e9f9976fd464e152f9 WHIRLPOOL 4a57bfb9c8d5381ddb40cd30836ce38017ff94096317f1c968a4b3f18e2b6df2392e3550381a1f8468738bce830f38e4f35d9f48f7571d62bca16b2803ea7398
+EBUILD ffmpeg-2.1.1.ebuild 10115 SHA256 80bd673d4564818edc757d17482bb0b18c8d5794f94c5054b20368f9f49836fa SHA512 51d0fb7809f36e55410950921a227e66ca195f3b093aeaeed495ff83c0b9e62531ae50fd131797e90593f231a83a740411f978c983374efd66cbe90bdf76c66a WHIRLPOOL bae4a119aaf9186b6e7de8c3a7b1a5f1cdc97e4a11f27d3b2a811e17b1417f88f044b194ef0506f5ef7f189382923238116e09cb274b4e23b9e4a7354dc30e6c
 EBUILD ffmpeg-2.1.ebuild 9922 SHA256 ada45fb54f06e6be078dde8594d51a83fab8a58b5be5154c75e33aaccde8085b SHA512 fcae83cfd6f6a102fd573818d1e55f47a194a248218124e2f121f7866611bbf082be7bed44cfef29beee675a980b83fd76af6832901b2d6b8cfa6fdbe52d23ad WHIRLPOOL 2d70f8fd5cee37691d15e9f0fa87a30455e5d0459acce9a5489e3a1467cd5eb6646610dacd7f5a73515de73ff76719160abead0ea920e33c5c4be972e6df1402
 EBUILD ffmpeg-9999.ebuild 9925 SHA256 2d9183864b2fe21859e3b04d40b1cde163bcb5e76f7975ae0c08a81bd2d43cd9 SHA512 c708c7009e690005415708919c63764e7353254ceea41938ff280681ea055a1f5d173097e48fb85f81e42368d8ad645beedf5a8b52c10f98e630414650f38b5a WHIRLPOOL 65a3cca3423e90baf6792039cabcdc79ecdc9ace59a903b301482fa51a82f0449a78b56b7b4e32ef4c0881e07362272bc718617980ad2cb5b8c16a3cb0a042c0
-MISC ChangeLog 97039 SHA256 a810c1bfd841399e653dcc643c234d748cb0f41a0c1712e6d9c4b8a9d9f45961 SHA512 669b750dfbc89958de22fe9d450cec147ccb3be75ef60e0ccf03f93977589e7184b61a112a7c0df0f8db6736279b31f21e69931d46d71cba44e96957a4d35a43 WHIRLPOOL d348240888b739189f78743a54433cda6b7ffd516cfa6b2a7b617b42cec03c4b7462e8700ae50fee230b5a6c488ee24ed4de25bbbb70501374013e621c561fcd
+MISC ChangeLog 97442 SHA256 232813c3edafad59eaf1c3d6b0a1ab2c473de4f4388c026838308ebd7fa4a789 SHA512 75c0dd0350ab80e25584dcd93a7123df7ce324056a598f6f4ca5a4759823c00b2480c589f88ee58e02bd37bdbe19123be9f986b39f4e367a500e4a469091ef8a WHIRLPOOL 07249b02a91a052929bd5143e9eee6454ba83dd437d64eae8c07d7e351ec6cf52cf027f33230f2b66b80b7637c8bc033db8355cccfa361add04d005849a2a400
 MISC metadata.xml 4146 SHA256 474b6b289c999523a070334dfa7ee06f58a3264704c7352a3a1ae47b71daf46f SHA512 c3f32b37a9a250d1af577e6b78b450625e2b9b891b7c5eb7ee021f0c15cd599f893dce2f16b0b6bf2f58fd6e67bec6bd629e053c5d84d1e95ce355f2baea8da4 WHIRLPOOL 39e5994f1daf7ca5057275cf20b5e24a4ef277ef5687ecdde5987335432f8efbb02beea7d4fbc5c4e554c589e5edeecb19291b74a7b7972d72fbdc7b0d514de8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkTxsACgkQCaWpQKGI+9TvZwCdHjsQ7rheCbPz0ZvOHECwmFGy
-cZ8An0DwmG4skAmD+VT0xbQMFCgibGeM
-=9e+O
+iQIcBAEBCAAGBQJSpwj4AAoJEPiazRVxLXTF7MUQAIRM97FPz5ZOhERgN6d0jzmR
+NVVDwFf8ejRGwNjEYjv7OrU4sNc21t019ee+77Nw35EuLRqpK6o/VUABkmmzcjBY
+6Cj+a96v4cCiMzWusmbKRfaOBprdNHaKtevFSbmOpmIzdt9wSyN66/4uNazHSDmL
+E8TOx9UPy6GgXhbaVp3uYdpXSul2fzSJwOeKeYSzCEzoYtRW5Do+j+wNRHfM3uBQ
+wtmgTNIA1GffB8PgiByLj0oCBrI5UssNZgwOqMpymhvlxBNfbYRA31GlDsJoXGpU
+cV5SnbeoZ6GJw/JDcaM5BfSt/3XwDFfTXQ7F52laQ+xlrZQoAkNp5d0DKG9cTC4+
+ja3OT5RDUa3Bpy0+VdCsuuDDkrXE4GcWoNvjgKMhDwrFtI+7RxMsmxZoSoaGZ7/C
+DiPNEcUIMVFZIuHsmzh1ZwVWZCB3VIaoefqtA8REPr/g7V9Eyr4PszrLWeZRkt99
+5siaTyvNcj2DBMTKySz46VOSuv6SOAamENRxq7qHBAv5rW/6YGfU+Ofp+V1UdRSW
+c8I9O9g/vCepHOfa9ecrpJFoYSSos+x8URz+BA7c3nuoJqJpAycHpgKVEO0Szpp+
+zmo93r8ceZh3G44bOamFXCtmohlewX2Gwml0u04yEpnAwD/URRG5xMCSy0/Xbl+B
+AYzGdnEtrmwHG6GQMoD3
+=G6wr
 -----END PGP SIGNATURE-----