diff options
Diffstat (limited to 'media-libs/gegl')
24 files changed, 76 insertions, 1356 deletions
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index a6e0dc4de44f..4b081139a6dc 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -1,35 +1,16 @@ -AUX gegl-0.2.0-cve-2012-4433-1e92e523.patch 2365 BLAKE2B 64361413f30f81e881c51b050d644f7c83a5d44359568c93fc1139b89b98607f6005a3aba33c3c86fb9bc292415116d71653c84255ee3f8cc28adcd13e554b37 SHA512 f27c89ac3b7742da348f75190cb1d5ad2569ab71a188b42a64e23a6254489770c701714e8de49602fdb8e8f063c3c9130abac330dceacee15603098bc1b70348 -AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 BLAKE2B bd601e99324c3861ef3da7685518891ba7e55f316120da8660b8afc85179c9ce7e9ef54c0c73d99754ed3ca0cd05f4e3803613db438909fb6983958cfcbb5221 SHA512 c48ed73b4a042263464819981e5f9fb0c0fc7abe8291840da9e839833a8cd548077fa99fed4b523a5bbac120d4336d2007a243baa359b40a0f0e3ff633bffa57 -AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 BLAKE2B 11fb013522cdeaa06bef97c421763d3b4d0900181667b7dd5688c0fc0a666a68ab50cccdce7105f20802df5e7ce58f67bc48e16f9447fe0fbe27efb60ed52f0b SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493 -AUX gegl-0.2.0-ffmpeg-4-0-compat.patch 507 BLAKE2B 348cd79471d63192b65a52d8ab91c9e227d9364876db04da707bf7fb36a9211b27781061a85442a7d1cd178f9ba5a459e806e451c9eee5c5c4e841b96abef05f SHA512 e80364dcbd47eb49f0a10d3104ef2927e2eeda27a0a9016e2157401ebd17aa99b8707a42c1ae12e4118d7fc3d8fa15f49f4a3230e00177a5158511618c4a2339 -AUX gegl-0.2.0-ffmpeg-av_frame_alloc.patch 1340 BLAKE2B 485bca4ea457dd135535058ce3cd62fcff8f237ab94c98243c8ac17a1b137d67bc4d8750e30372345798b1c197e21158694d79ffccba9a076b32e4b9e1fad7ce SHA512 142d35b2c75b0f3512c3ba3a1f4e5597c282401a13c688069caed4f868b6ce0dbf16764a7b87cecd8d7e48f98ed5cd1c5cccec833f40bbb3816b898fea3939ac -AUX gegl-0.2.0-fix-without-exiv2.patch 823 BLAKE2B f2f0f8ff2d12ae0586518d4bfdbeea55ace61dc63171ed14a4196d8672f6009e26766553b882732801e6e56a28fca640a5a33dd8335682353f096ff77c149db7 SHA512 19b8299e82bbfb0d6879ffd4d75e149c4ea3c6ae474bf9e2f4b975d87240985fe136731e388d0c63b3baadebc30871a5b54241d683107aa19bc7bcdbd710d118 -AUX gegl-0.2.0-g_log_domain.patch 1079 BLAKE2B 7d0ba02291aa33b4a8077d56de01c5b0e10b46740c64565bf8b6a9867a6d76fe6fa07a752d0698f0674236e0be06c41135af114847096cfec642572fba315c06 SHA512 a538d42164dbefbd5044461fe8fdac5d3b2de2d7df5013a5206b0230fe48ea7cf537972b8aab2a40081a15ece1dd818bef70cef95cd0a04bc7179764070a1e45 -AUX gegl-0.2.0-introspection-version.patch 1233 BLAKE2B 1565b0600b5d5c55e0e3909670c59fb6b73d91222911cc4caac07025cfadba39af39d60d42d133ed209f1464bf97aa5a5bd7da233e673a4557ef4451999ab7f3 SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23 -AUX gegl-0.2.0-libopenraw-0.1.patch 1733 BLAKE2B 16aacee7c0a702b0965c0f342822710b8b791fc950e10040de92a4eef06b4d5010b1f8fb8c0d1b23d5bc43e92487e37d278dd750baf06a641d91bbd5205b676f SHA512 8eaa767c7d30e77ebffacb9ebb01789f05c82385ed7671767f0e04dba98a95ee22a4a8f0ca8f19365e0b26e74641dbe00939ff8baa40e84a8a26770c325ad980 -AUX gegl-0.2.0-underlinking.patch 2038 BLAKE2B 80dc1aeeb73d08ae7184f5eb57f97a16ec4d5b237bf7fb4232fef16c443f913d16b179a297e0bea8b8b459cd740720843d06d537e9cc703c66ae3b54b6c70255 SHA512 c952d015ac74eefea96c6b6c4190fc5c230654cb6efee20ea06f9b43e4f3dac8953ce94f604602489556e4ab59b44f85daff95e3e7c98c640b2b532d1de3dfc5 -AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84 AUX gegl-0.3.34-failing-tests.patch 1076 BLAKE2B 39ebadca2d03708d6449849bf8a1c23d05c591493c229b55093d5308c277cb12b428e69b6410ce428cb5c9dbace91c5f3d4822ec3b32c0afc33aee95a58bdbf6 SHA512 084d42d50ba9d750d0a3d729f53da4fad177674862eacde17f2e4ea1bbc62d91fa62164fd7bb5dc1d3cda2fbf08a9db048f577927f203cc912ecf365eb4cc688 AUX gegl-0.3.34-fno-common.patch 184 BLAKE2B a1994ad4171f60a52695ea36814d0051addb358413a49725d089667aa842f45da7e3e3027c8e29fdb7a5ce378186ae10eab685b538c2685c1f2d40c3bf5a9ac9 SHA512 4c1f787fabbfac1d13dd5f997fc799e3238f7b17cf8b51a63253ad7d5dac7f99c92990aa31aef14740e0e66d100ec0b532a0aef899f49f6142d785529d2b808f -AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f -AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a AUX gegl-0.4.18-cltostring_force_utf8.patch 910 BLAKE2B 9d5ca10ba4f7ba3b79726daef87fac72617cc627f2d4324409212f41255e524be2000aac415e361105afe2e0b488811e835f1e584c11dfda64eedfafd63a7bb9 SHA512 62d4ecf5f010648d479de674264ce428a8d71c542beeb92401c329c34f83a0bac22c4d805bceb7ca76c498f63276bdaa589588d96d735402346c55c2dd58a547 AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5 AUX gegl-0.4.18-meson_cpu_detection.patch 1506 BLAKE2B ad1038c71b3d2b735fe20010710a94c9460990d9bfb965731c732945d00f992d27f9168fd3fdda3b88ac913c984ad4ad7f231f1d5cd7bae8a8312e91d37cfdf2 SHA512 d9e96e57db0821c5510bb3d8faee3850ab4083e2f1697b5acda75e719ca778cd48ae86cffbc66b621de65dbf5096d125e612af329c7a7ef11f586d24be52a3dc AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417 -DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 -DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02 -DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27 DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab -EBUILD gegl-0.2.0-r6.ebuild 4873 BLAKE2B 5bc1189a195da303ebbb13e7e211743cdd711561c399513139dbc098287e9333698fc106cfe2ed1959874e0a740f4a8b25f23134d5962aa6f3aa55bd87276239 SHA512 4c677caf2159ae4300244a84f05e28836c32327ad85abbb812435987756cd704f95557bb779f0a7510edf8263f3422004791ada25b6b9cf5ccc61d77d2e774a8 -EBUILD gegl-0.3.34-r1.ebuild 5237 BLAKE2B 126d2ae08ac5620cfdf77fc9f0dbfe5aac17936863c22cdf4114cf8702ea04dd23f0b47305ec35808819c91b77ba35cdba07f0e2892018b651e7492cbfa1d30f SHA512 ac2acdd2fa6dbe3f41855d0419b868905067e0932876a7554272de0578cf033bece1719127deaa180c1ac269328810c24f9325698091f2a64bd7854d3deeacbc -EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B a6fc62fd62139fa40fadb7e14ff1160c408e21a5b9e383fa79ddf4232452856c7235e2b74cc5a330ed38f4910b9223225ffaf8efc59f54fdc73c38036a66ac06 SHA512 58fc9363a644ce358c29217783c1beb0b2291605af9f507adcc34f8cff15a582087e03817398dc9c4d442e624a98035c46a27b9d7a440c97f6125286bb36128b -EBUILD gegl-0.4.16-r1.ebuild 4832 BLAKE2B 5250f514403c6da6e62cd9dfd56b623af7affc9075f088ff687e205c269e62fcd72ab114d511f95c4cf7202b2fdb5a4de79165f7fd838a6dbeb8a6b2bf8d58cd SHA512 bbefeb2c55be67533b8428afb52a7dfc350fc653d45b6b69e30b4280439899bd0df3d725795afcba312ce1c4f3ecafd8491b625fccaa3f4c767f274d88fb6793 -EBUILD gegl-0.4.16.ebuild 4785 BLAKE2B a5a4eee532e7454cd5c154d2067a339a268d6cb5f2bcf58b602f853ba50f7e64beeeb8dfcb9145b888806e651778dd20c4419bd8885176dde8cbbd000978c38f SHA512 c351367b7445dc6bb360bea700638e1a23026abe8fd4707612325b2ac7096155b10941d8947976eefb76367f0b6b1695c209fb9f188736a4ec4eb3dfd63ae54a -EBUILD gegl-0.4.18-r1.ebuild 4822 BLAKE2B e2d3604bdb9424d8a46b6b696dea3078df5a8c71b35e35beb18f2713f6e4ed2c9d5fd6f148cd7bd6efe4e3c1ac8e8b26217d0556eb173c0bfa548d4752c6dce1 SHA512 e699700774e5728354a708de6f704dfd67694cf37765c002b629b5f34875cf02aeffc568aa949e8e23330dfbf29a15343f84fc7f3bdd636352e478e4b5586613 -EBUILD gegl-0.4.18.ebuild 4815 BLAKE2B 071fdd84d129cbe18bb3c01a613d8286aaf5d464ce46e04b39b13368bd9eceba2400ece71a6b2becaece62e7933ea3737f1db58abde220ac6b3addf2d79e3057 SHA512 fe41c1f229eb5c34b0413bce192bd5ca03f2f94fad1a99928fad2e603b5bcbe0e9996b966a05a2f200b2eb2a1f2a29246086993276b8a1d29af471847e06eb51 -EBUILD gegl-0.4.22-r1.ebuild 4781 BLAKE2B fed7f87e693fa3d662b52c1729ce3eec8a606c78a6b8ade14e6d28f9456681854a28b31ebbc6c97c9601e77419489254b0b303861a86c150d0b7e2bd57575aa1 SHA512 04b9d4a338dbd4b3f45c2fd01fd9d0dc07d0f9d26d301992cb02154d327949a58ec8c52a73552a3cc49f023a91ef3e86a308f510531f35be827b1c395e081537 -EBUILD gegl-0.4.22.ebuild 4774 BLAKE2B 7d220b64f490ab65dbe3a87cafb7d1b55dae285b4d03179939479431eca4b44fd11edcc4eb3d31c1aee979cc6d3122b71c60b5ec9d980a8c2b8911f5497ede7b SHA512 5d321f47fd284e67f748115dbc87591fd4fe18463df747d43b54e8aac07fe763a9ece2e0eea1bc31481806c58bc58dbf84ec8c1b8c44ff39d0eb08b9fcf2df5b -EBUILD gegl-9999.ebuild 4395 BLAKE2B 18c36f50c02010c6fee96c1d90a6154b20f1338f66b824100e358210cee92385972d7b70b2fbafaf5a2a178c7184455017a5da607738cb7368024b9eb99999f3 SHA512 f221199f6db08de50b3f19fa6006528bed6754db0dd5afdf49da49a0031f467d09f76ae7314364df894ac26c0ccb2f1d1bd939c5df50409c61f99f6251962b46 +DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d +EBUILD gegl-0.4.18-r1.ebuild 4763 BLAKE2B d4cea7753856b77dd0adfef506a68e2d6d12ce8f653f58eccf63f16772b7af0fb7b420237ef384c61e7c737b289cdf936cd5752319ec51f7b1664b024e5bc3da SHA512 d86ac00595ed73e3047f8e902e20517817dff79f977ac08968873c3537448dd418eed0d7a6c820443cf7ec808ef8c1190686f93f20282a76d6faeccbb04696df +EBUILD gegl-0.4.18.ebuild 4756 BLAKE2B dc2c7d5f917192b380e234a1c560c1ec604010fdfd534598d8e7bed6a399b24b56c2329ee2a2cad60e64fb7d8e568a6e6bc5d5ae39971b8d7c0625f4efaba2b4 SHA512 77186edc254f7d76f30481ee47dcfe74b923859c78739aa3c2fb28f8dc249f9f09cdea9b4064b52edec0f39d8139c97b4947497012e380d7037025f5420b9d5d +EBUILD gegl-0.4.22-r1.ebuild 4722 BLAKE2B 1d154668b7004738e5e85e850a1f106912bbba4d792892ac979c6fd628411909c0fcf513b0ff3ad47b81094f5903b975cffb08cd00f5dd206043f9f89754842c SHA512 f77899a70cfaf9d35be73f76bff9c385d6c487782b1dfe386b18c632acf052d9f8711648373ade81782f25f5014c7b683fefdbff0b5e8e364f6900958ea598b9 +EBUILD gegl-0.4.22.ebuild 4715 BLAKE2B 9a164071500ebf3acc505b7f259b36e8ae90870e5a7620e621f0006245419e0bb18ca6ab44c7800e4ca6f27819d6a0eb48be8545b763881b65b1aa88cf9ca41e SHA512 abd52bc37f8164900e6d0ec093615713ec828007695a88205f20693ab040f1d448c5d4caa974e7c1760a510aefc15b8df61733690cb3525d16ea9be52ade8124 +EBUILD gegl-0.4.24.ebuild 4728 BLAKE2B 4fc14a34770df8cfd7ed2840212fb04732d362aae008cf9db76cf26e085c263359e837afc3f9cb8465600d0a522c9bb96dc495b95716409cc662ee5976ab1cea SHA512 9db9c9a476a2310afb265f70d0c087c0cf67a775fa317116453f00f6f7a3c6f5855637ad8744e6264e9a53522aac60f146b2cde0ed37af57b212d61479cb62fd +EBUILD gegl-9999.ebuild 4336 BLAKE2B 04d0df100f84f9e0b4c016d6c8d01e6a69ccb65fe22e17afb095291c9e9afddfaa043f01b66c9c3f3e9ea0c4afb8bb9b1cadb5a5eb887279ab0359ead2dd5841 SHA512 a0fbd02d61fdd484017c1c09020616426649eb8a546408ce0bd33df939a5940917b08d246f4ab3f585d13dc3d2c0b42e2a58e8c61cfb3196be94474ba66b9655 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016 diff --git a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch b/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch deleted file mode 100644 index 0babb0f41c1b..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1e92e5235ded0415d555aa86066b8e4041ee5a53 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Tue, 16 Oct 2012 14:58:27 +0000 -Subject: ppm-load: CVE-2012-4433: don't overflow memory allocation - -Carefully selected width/height values could cause the size of a later -allocation to overflow, resulting in a buffer much too small to store -the data which would then written beyond its end. ---- -diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c -index efe6d56..3d6bce7 100644 ---- a/operations/external/ppm-load.c -+++ b/operations/external/ppm-load.c -@@ -84,7 +84,6 @@ ppm_load_read_header(FILE *fp, - /* Get Width and Height */ - img->width = strtol (header,&ptr,0); - img->height = atoi (ptr); -- img->numsamples = img->width * img->height * CHANNEL_COUNT; - - fgets (header,MAX_CHARS_IN_ROW,fp); - maxval = strtol (header,&ptr,0); -@@ -109,6 +108,16 @@ ppm_load_read_header(FILE *fp, - g_warning ("%s: Programmer stupidity error", G_STRLOC); - } - -+ /* Later on, img->numsamples is multiplied with img->bpc to allocate -+ * memory. Ensure it doesn't overflow. */ -+ if (!img->width || !img->height || -+ G_MAXSIZE / img->width / img->height / CHANNEL_COUNT < img->bpc) -+ { -+ g_warning ("Illegal width/height: %ld/%ld", img->width, img->height); -+ return FALSE; -+ } -+ img->numsamples = img->width * img->height * CHANNEL_COUNT; -+ - return TRUE; - } - -@@ -229,12 +238,24 @@ process (GeglOperation *operation, - if (!ppm_load_read_header (fp, &img)) - goto out; - -- rect.height = img.height; -- rect.width = img.width; -- - /* Allocating Array Size */ -+ -+ /* Should use g_try_malloc(), but this causes crashes elsewhere because the -+ * error signalled by returning FALSE isn't properly acted upon. Therefore -+ * g_malloc() is used here which aborts if the requested memory size can't be -+ * allocated causing a controlled crash. */ - img.data = (guchar*) g_malloc (img.numsamples * img.bpc); - -+ /* No-op without g_try_malloc(), see above. */ -+ if (! img.data) -+ { -+ g_warning ("Couldn't allocate %" G_GSIZE_FORMAT " bytes, giving up.", ((gsize)img.numsamples * img.bpc)); -+ goto out; -+ } -+ -+ rect.height = img.height; -+ rect.width = img.width; -+ - switch (img.bpc) - { - case 1: --- -cgit v0.9.0.2 diff --git a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch b/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch deleted file mode 100644 index f78557f5772a..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 4757cdf73d3675478d645a3ec8250ba02168a230 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Tue, 16 Oct 2012 14:56:40 +0000 -Subject: ppm-load: CVE-2012-4433: add plausibility checks for header fields - -Refuse values that are non-decimal, negative or overflow the target -type. ---- -diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c -index 3d6bce7..465096d 100644 ---- a/operations/external/ppm-load.c -+++ b/operations/external/ppm-load.c -@@ -36,6 +36,7 @@ gegl_chant_file_path (path, _("File"), "", _("Path of file to load.")) - #include "gegl-chant.h" - #include <stdio.h> - #include <stdlib.h> -+#include <errno.h> - - typedef enum { - PIXMAP_ASCII = 51, -@@ -44,8 +45,8 @@ typedef enum { - - typedef struct { - map_type type; -- gint width; -- gint height; -+ glong width; -+ glong height; - gsize numsamples; /* width * height * channels */ - gsize bpc; /* bytes per channel */ - guchar *data; -@@ -82,11 +83,33 @@ ppm_load_read_header(FILE *fp, - } - - /* Get Width and Height */ -- img->width = strtol (header,&ptr,0); -- img->height = atoi (ptr); -+ errno = 0; -+ img->width = strtol (header,&ptr,10); -+ if (errno) -+ { -+ g_warning ("Error reading width: %s", strerror(errno)); -+ return FALSE; -+ } -+ else if (img->width < 0) -+ { -+ g_warning ("Error: width is negative"); -+ return FALSE; -+ } -+ -+ img->height = strtol (ptr,&ptr,10); -+ if (errno) -+ { -+ g_warning ("Error reading height: %s", strerror(errno)); -+ return FALSE; -+ } -+ else if (img->width < 0) -+ { -+ g_warning ("Error: height is negative"); -+ return FALSE; -+ } - - fgets (header,MAX_CHARS_IN_ROW,fp); -- maxval = strtol (header,&ptr,0); -+ maxval = strtol (header,&ptr,10); - - if ((maxval != 255) && (maxval != 65535)) - { --- -cgit v0.9.0.2 diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff deleted file mode 100644 index 8e9a328524c3..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff +++ /dev/null @@ -1,57 +0,0 @@ -From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001 -From: nick black <nick.black@sprezzatech.com> -Date: Fri, 14 Dec 2012 04:11:16 +0000 -Subject: port gegl forward to libav 54 - ---- -diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c -index 442ec5f..75d26e9 100644 ---- a/operations/external/ff-load.c -+++ b/operations/external/ff-load.c -@@ -137,7 +137,7 @@ ff_cleanup (GeglChantO *o) - if (p->enc) - avcodec_close (p->enc); - if (p->ic) -- av_close_input_file (p->ic); -+ avformat_close_input(&p->ic); - if (p->lavc_frame) - av_free (p->lavc_frame); - -@@ -216,9 +216,9 @@ decode_frame (GeglOperation *operation, - { - do - { -- if (av_read_packet (p->ic, &p->pkt) < 0) -+ if (av_read_frame (p->ic, &p->pkt) < 0) - { -- fprintf (stderr, "av_read_packet failed for %s\n", -+ fprintf (stderr, "av_read_frame failed for %s\n", - o->path); - return -1; - } -@@ -271,12 +271,12 @@ prepare (GeglOperation *operation) - gint err; - - ff_cleanup (o); -- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL); -+ err = avformat_open_input(&p->ic, o->path, NULL, 0); - if (err < 0) - { - print_error (o->path, err); - } -- err = av_find_stream_info (p->ic); -+ err = avformat_find_stream_info (p->ic, NULL); - if (err < 0) - { - g_warning ("ff-load: error finding stream info for %s", o->path); -@@ -312,7 +312,7 @@ prepare (GeglOperation *operation) - if (p->codec->capabilities & CODEC_CAP_TRUNCATED) - p->enc->flags |= CODEC_FLAG_TRUNCATED; - -- if (avcodec_open (p->enc, p->codec) < 0) -+ if (avcodec_open2 (p->enc, p->codec, NULL) < 0) - { - g_warning ("error opening codec %s", p->enc->codec->name); - return; --- -cgit v0.9.1 diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch deleted file mode 100644 index 6b8e9792c026..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./operations/external/ff-load.c.org 2018-12-18 09:22:34.467409854 +0100 -+++ ./operations/external/ff-load.c 2018-12-18 09:22:50.921379092 +0100 -@@ -309,8 +309,8 @@ - g_warning ("codec not found"); - } - -- if (p->codec->capabilities & CODEC_CAP_TRUNCATED) -- p->enc->flags |= CODEC_FLAG_TRUNCATED; -+ if (p->codec->capabilities & AV_CODEC_CAP_TRUNCATED) -+ p->enc->flags |= AV_CODEC_FLAG_TRUNCATED; - - if (avcodec_open2 (p->enc, p->codec, NULL) < 0) - { diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch deleted file mode 100644 index 6998a02e75f5..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6e9ac140385d28210afdd2ed2bf9b0533ca0aac1 Mon Sep 17 00:00:00 2001 -From: fafryd <dz1125.bug.tracker@gmail.com> -Date: Sat, 5 Mar 2016 22:11:39 +0100 -Subject: [PATCH] use av_frame_alloc instead of avcodec_alloc_frame - ---- - operations/external/ff-load.c | 2 +- - operations/workshop/external/ff-save.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c -index 442ec5f..0b9d8e8 100644 ---- a/operations/external/ff-load.c -+++ b/operations/external/ff-load.c -@@ -321,7 +321,7 @@ prepare (GeglOperation *operation) - p->width = p->enc->width; - p->height = p->enc->height; - p->frames = 10000000; -- p->lavc_frame = avcodec_alloc_frame (); -+ p->lavc_frame = av_frame_alloc (); - - if (p->fourcc) - g_free (p->fourcc); -diff --git a/operations/workshop/external/ff-save.c b/operations/workshop/external/ff-save.c -index 0f3105d..84d68c5 100644 ---- a/operations/workshop/external/ff-save.c -+++ b/operations/workshop/external/ff-save.c -@@ -537,7 +537,7 @@ alloc_picture (int pix_fmt, int width, int height) - uint8_t *picture_buf; - int size; - -- picture = avcodec_alloc_frame (); -+ picture = av_frame_alloc (); - if (!picture) - return NULL; - size = avpicture_get_size (pix_fmt, width, height); --- -2.7.2 diff --git a/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch b/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch deleted file mode 100644 index 96a4188926df..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c0b4da18e199d1043738c034269f5dd6a4aa7d99 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 10 Jan 2018 22:39:05 +0100 -Subject: [PATCH] Fix ./configure --without-exiv2 - -Variable names were in error - -Bug: https://bugs.gentoo.org/641872 ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 30d306e..146b271 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -977,8 +977,8 @@ AC_SUBST(LIBSPIRO) - - AC_ARG_WITH(exiv2, [ --without-exiv2 build without libexiv2 support]) - --have_libexiv2="no" --if test "x$with_libexiv2" != "xno"; then -+have_exiv2="no" -+if test "x$with_exiv2" != "xno"; then - PKG_CHECK_MODULES(EXIV2, exiv2, - have_exiv2="yes", - have_exiv2="no (exiv2 library not found)") --- -2.16.0.rc0 - diff --git a/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch b/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch deleted file mode 100644 index cdb42b2ca5f2..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch +++ /dev/null @@ -1,25 +0,0 @@ -From deaa974528ac1f4099d091a333214b1a50147243 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 1 May 2013 00:39:42 +0200 -Subject: [PATCH] Prevent double escaping / error "stray ‘\’ in program" - ---- - gegl/Makefile.am | 1 + - 1 file changed, 1 insertion(+), 0 deletion(-) - -diff --git a/gegl/Makefile.am b/gegl/Makefile.am -index 43010ce..fd046d2 100644 ---- a/gegl/Makefile.am -+++ b/gegl/Makefile.am -@@ -119,7 +119,8 @@ INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS) - - Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile - Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1 - Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES) -+INTROSPECTION_SCANNER_ENV = CFLAGS="${CFLAGS} "-D'G_LOG_DOMAIN="GEGL-"__FILE__' # No extra backslashes here! - Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la - Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources) - INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir --- -1.8.1.5 - diff --git a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch b/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch deleted file mode 100644 index 1ac28dc62964..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 35469116fbf0b398d748f8116e4dcc8bdaee12c7 Mon Sep 17 00:00:00 2001 -From: Jon Nordby <jononor@gmail.com> -Date: Thu, 12 Apr 2012 12:10:05 +0000 -Subject: gobject-introspection: Fix build after 0.2.x version bump - -Remove hardcoding of version numbers so that this does -not happen again. ---- -(limited to 'gegl/Makefile.am') - -diff --git a/gegl/Makefile.am b/gegl/Makefile.am -index aef4c33..43010ce 100644 ---- a/gegl/Makefile.am -+++ b/gegl/Makefile.am -@@ -118,10 +118,10 @@ introspection_sources = \ - INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS) - - Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile --Gegl_0_1_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1 --Gegl_0_1_gir_CFLAGS = $(INCLUDES) --Gegl_0_1_gir_LIBS = libgegl-@GEGL_API_VERSION@.la --Gegl_0_1_gir_FILES = $(introspection_sources) -+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1 -+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES) -+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la -+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources) - INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir - - girdir = $(datadir)/gir-1.0 --- -cgit v0.9.1 diff --git a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch deleted file mode 100644 index ec1227039554..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1ad5d7656891f53b76efd6783d75d14b9cbb4daa Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Mon, 4 Dec 2017 21:18:56 +0100 -Subject: [PATCH] Support (and require) libopenraw 0.1.0+ - ---- - configure.ac | 4 ++-- - operations/external/openraw.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 30d306e..febdddb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -47,7 +47,7 @@ m4_define([lensfun_required_version], [0.2.5]) - m4_define([librsvg_required_version], [2.14.0]) - m4_define([lua_required_version], [5.1.0]) - m4_define([openexr_required_version], [0.0.0]) --m4_define([openraw_required_version], [0.0.5]) -+m4_define([openraw_required_version], [0.1.0]) - m4_define([pango_required_version], [0.0.0]) - m4_define([pangocairo_required_version], [0.0.0]) - m4_define([png_required_version], [0.0.0]) -@@ -790,7 +790,7 @@ AC_ARG_WITH(libopenraw, [ --without-libopenraw build without openraw support - - have_libopenraw="no" - if test "x$with_libopenraw" != "xno"; then -- PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= openraw_required_version, -+ PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= openraw_required_version, - have_libopenraw="yes", - have_libopenraw="no (openraw library not found)") - fi -diff --git a/operations/external/openraw.c b/operations/external/openraw.c -index 9fc1e95..b4b4a13 100644 ---- a/operations/external/openraw.c -+++ b/operations/external/openraw.c -@@ -116,7 +116,7 @@ load_buffer (GeglOperation *operation) - goto clean_file; - } - -- if(or_rawdata_format (rawdata) != OR_DATA_TYPE_CFA) -+ if(or_rawdata_format (rawdata) != OR_DATA_TYPE_RAW) - { - goto clean_file; - } --- -2.15.0 - diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch deleted file mode 100644 index 00e936ce68ea..000000000000 --- a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch +++ /dev/null @@ -1,65 +0,0 @@ -From bedd95f5f14524360117209ed6a1a83627523f54 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 10 May 2017 17:33:05 +0200 -Subject: [PATCH] Backport $(MATH_LIB) patch to GEGL 0.2 - -Source: -https://git.gnome.org/browse/gegl/patch/?id=c9bbc815378cb81ba8a48be35f615e7e2d74dffc ---- - bin/Makefile.am | 2 +- - examples/Makefile.am | 2 +- - tools/Makefile.am | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bin/Makefile.am b/bin/Makefile.am -index c85ecbd..08a156b 100644 ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -23,7 +23,7 @@ AM_CFLAGS = \ - - AM_LDFLAGS = \ - $(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \ -- $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) -+ $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) $(MATH_LIB) - - bin_PROGRAMS = gegl - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index c29a1dd..5c4ac3a 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -42,4 +42,4 @@ AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS) - - AM_LDFLAGS = \ - $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \ -- $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) -+ $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(MATH_LIB) -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 8f1077d..4dd3845 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -22,7 +22,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) - - AM_LDFLAGS = \ - $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \ -- $(DEP_LIBS) $(BABL_LIBS) -+ $(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB) - - noinst_PROGRAMS = introspect operation_reference img_cmp - -diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am -index d62ce71..0a4df53 100644 ---- a/tests/buffer/Makefile.am -+++ b/tests/buffer/Makefile.am -@@ -30,7 +30,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) - - buffer_test_LDADD = \ - $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \ -- $(DEP_LIBS) $(BABL_LIBS) -+ $(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB) - - - # Our custom target rules --- -2.12.2 - diff --git a/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch deleted file mode 100644 index c886419925af..000000000000 --- a/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e3ffef75aabd2d078cf341124ba42ce7673419b3 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 22 Mar 2017 19:59:38 +0100 -Subject: [PATCH] Disable failing tests - -https://bugs.gentoo.org/show_bug.cgi?id=595332#c3 ---- - tests/simple/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/simple/Makefile.am b/tests/simple/Makefile.am -index e28680a..aa7efd8 100644 ---- a/tests/simple/Makefile.am -+++ b/tests/simple/Makefile.am -@@ -15,7 +15,6 @@ noinst_PROGRAMS = \ - test-gegl-rectangle \ - test-gegl-color \ - test-gegl-tile \ -- test-image-compare \ - test-license-check \ - test-misc \ - test-node-connections \ -@@ -23,7 +22,6 @@ noinst_PROGRAMS = \ - test-node-properties \ - test-object-forked \ - test-opencl-colors \ -- test-serialize \ - test-path \ - test-proxynop-processing \ - test-scaled-blit \ --- -2.12.0 - diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch deleted file mode 100644 index fc8027f08ae4..000000000000 --- a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8f2545886ce3be8f1b1229bddcfa5af3216110d3 Mon Sep 17 00:00:00 2001 -From: Franz Brausse <brausse@informatik.uni-trier.de> -Date: Sun, 6 May 2018 13:38:09 +0200 -Subject: operations/external/ff-save: ffmpeg-4.0 compat; fixes #795625 - ---- - operations/external/ff-save.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c -index 90b6162..e7edd3e 100644 ---- a/operations/external/ff-save.c -+++ b/operations/external/ff-save.c -@@ -88,6 +88,11 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0) - #include <libavutil/opt.h> - #include <libswscale/swscale.h> - -+/* remove if libavcodec_required_version is changed to > 56.41.100 */ -+#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(56,41,100) -+# define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER -+#endif -+ - typedef struct - { - gdouble frame; -@@ -290,7 +295,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id) - c->codec_type = AVMEDIA_TYPE_AUDIO; - - if (oc->oformat->flags & AVFMT_GLOBALHEADER) -- c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - return st; - } -@@ -699,7 +704,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st) - } - - p->video_outbuf = NULL; -+#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */ - if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) -+#endif - { - /* allocate output buffer, 1 mb / frame, might fail for some codecs on UHD - but works for now */ - p->video_outbuf_size = 1024 * 1024; -@@ -803,6 +810,7 @@ write_video_frame (GeglProperties *o, - picture_ptr = p->picture; - picture_ptr->pts = p->frame_count; - -+ #if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */ - if (oc->oformat->flags & AVFMT_RAWPICTURE) - { - /* raw video case. The API will change slightly in the near -@@ -821,6 +829,7 @@ write_video_frame (GeglProperties *o, - ret = av_write_frame (oc, &pkt); - } - else -+#endif - { - /* encode the image */ - AVPacket pkt2; --- -cgit v0.12 - diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch deleted file mode 100644 index 260ff3b2c1a4..000000000000 --- a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2896800b5e7d0c656710c70fdea57098032f3ccc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org> -Date: Sun, 6 May 2018 15:09:03 +0200 -Subject: ff-save: update another occurance of CODEC_FLAG_GLOBAL_HEADER - ---- - operations/external/ff-save.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c -index 1edac31..f30bf10 100644 ---- a/operations/external/ff-save.c -+++ b/operations/external/ff-save.c -@@ -638,7 +638,7 @@ add_video_stream (GeglProperties *o, AVFormatContext * oc, int codec_id) - #endif - - if (oc->oformat->flags & AVFMT_GLOBALHEADER) -- c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - return st; - } --- -cgit v0.12 - diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild deleted file mode 100644 index 5f3add9b4af4..000000000000 --- a/media-libs/gegl/gegl-0.2.0-r6.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WANT_AUTOMAKE=1.11 # see bug 471990, comment 3 -# vala and introspection support is broken, bug #468208 -#VALA_MIN_API_VERSION=0.14 -#VALA_USE_DEPEND=vapigen - -inherit versionator gnome2-utils eutils autotools #vala - -DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" -SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - -LICENSE="|| ( GPL-3 LGPL-3 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -IUSE="cairo debug ffmpeg jpeg lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala - -RDEPEND=" - >=media-libs/babl-0.1.10 - >=dev-libs/glib-2.28:2 - >=x11-libs/gdk-pixbuf-2.18:2 - x11-libs/pango - sys-libs/zlib - cairo? ( x11-libs/cairo ) - ffmpeg? ( >=media-video/ffmpeg-4:0= ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng:0= ) - raw? ( >=media-libs/libopenraw-0.1:0= ) - sdl? ( media-libs/libsdl ) - svg? ( >=gnome-base/librsvg-2.14:2 ) - umfpack? ( sci-libs/umfpack ) - lensfun? ( >=media-libs/lensfun-0.2.5 ) -" -# >=media-libs/babl-0.1.10[introspection?] -# introspection? ( >=dev-libs/gobject-introspection-0.10 -# >=dev-python/pygobject-2.26:2 ) -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40.1 - dev-lang/perl - virtual/pkgconfig - >=sys-devel/libtool-2.2 -" -# vala? ( $(vala_depend) )" - -DOCS=( ChangeLog INSTALL README NEWS ) - -PATCHES=( - # https://bugs.gentoo.org/show_bug.cgi?id=636780 - "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch" - - # https://bugs.gentoo.org/show_bug.cgi?id=442016 - "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch" - "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch" - - # https://bugs.gentoo.org/show_bug.cgi?id=416587 - "${FILESDIR}/${P}-introspection-version.patch" - - "${FILESDIR}/${P}-ffmpeg-0.11.diff" - "${FILESDIR}"/${P}-g_log_domain.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=605216 - # https://bugs.gentoo.org/show_bug.cgi?id=617430 - "${FILESDIR}"/${P}-underlinking.patch - "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834 - "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872 - - "${FILESDIR}"/${P}-ffmpeg-4-0-compat.patch # bug 673378 -) - -src_prepare() { - default - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die - # don't require Apple's OpenCL on versions of OSX that don't have it - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then - sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die - fi - - eautoreconf - - # https://bugs.gentoo.org/show_bug.cgi?id=468248 - local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps" - [[ -f "${deps_file}" ]] || touch "${deps_file}" - -# use vala && vala_src_prepare -} - -src_configure() { - # never enable altering of CFLAGS via profile option - # libspiro: not in portage main tree - # disable documentation as the generating is bit automagic - # if anyone wants to work on it just create bug with patch - - # Also please note that: - # - # - Some auto-detections are not patched away since the docs are - # not built (--disable-docs, lack of --enable-gtk-doc) and these - # tools affect re-generation of docs, only - # (e.g. ruby, asciidoc, dot (of graphviz), enscript) - # - # - Parameter --with-exiv2 compiles a noinst-app only, no use - # - # - Parameter --disable-workshop disables any use of Lua, effectivly - # - # - v4l support does not work with our media-libs/libv4l-0.8.9, - # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - # - # - There are two checks for dot, one controllable by --with(out)-graphviz - # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - # - # So that's why USE="exif graphviz lua v4l" got resolved. More at: - # https://bugs.gentoo.org/show_bug.cgi?id=451136 - # - econf \ - --disable-profile \ - --without-libspiro \ - --disable-docs --disable-workshop \ - --with-pango --with-gdk-pixbuf \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable debug) \ - $(use_with cairo) \ - $(use_with cairo pangocairo) \ - --without-exiv2 \ - $(use_with ffmpeg libavformat) \ - --without-graphviz \ - $(use_with jpeg libjpeg) \ - --without-jasper \ - --without-lua \ - $(use_with openexr) \ - $(use_with png libpng) \ - $(use_with raw libopenraw) \ - $(use_with sdl) \ - $(use_with svg librsvg) \ - $(use_with umfpack) \ - --without-libv4l \ - $(use_with lensfun) \ - --disable-introspection \ - --without-vala -# $(use_enable introspection) \ -# $(use_with vala) -} - -src_test() { - gnome2_environment_reset # sandbox issues - default -} - -src_compile() { - gnome2_environment_reset # sandbox issues (bug #396687) - default -} - -src_install() { - default - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild deleted file mode 100644 index 8abaed16a8d8..000000000000 --- a/media-libs/gegl/gegl-0.3.34-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -# vala and introspection support is broken, bug #468208 -VALA_USE_DEPEND=vapigen - -inherit gnome2-utils eutils autotools python-any-r1 vala - -SRC_URI="http://download.gimp.org/pub/${PN}/$(ver_cut 1-2)/${P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" - -LICENSE="|| ( GPL-3 LGPL-3 )" -SLOT="0.3" - -IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - svg? ( cairo ) - test? ( introspection ) - vala? ( introspection ) -" - -RESTRICT="!test? ( test )" - -# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE -# so there is no chance to support libav right now (Gentoo bug #567638) -# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! -RDEPEND=" - >=dev-libs/glib-2.44:2 - dev-libs/json-glib - >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] - sys-libs/zlib - >=x11-libs/gdk-pixbuf-2.32:2 - x11-libs/pango - - cairo? ( >=x11-libs/cairo-1.12.2 ) - ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) - virtual/jpeg:0= - lcms? ( >=media-libs/lcms-2.8:2 ) - lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - >=media-libs/libpng-1.6.0:0= - raw? ( >=media-libs/libraw-0.15.4:0= ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - svg? ( >=gnome-base/librsvg-2.40.6:2 ) - tiff? ( >=media-libs/tiff-4:0 ) - umfpack? ( sci-libs/umfpack ) - v4l? ( >=media-libs/libv4l-1.0.1 ) - webp? ( >=media-libs/libwebp-0.5.0:= ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - dev-lang/perl - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - >=sys-devel/libtool-2.2 - virtual/pkgconfig - test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) - vala? ( $(vala_depend) ) -" - -pkg_setup() { - use test && use introspection && python-any-r1_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - "${FILESDIR}"/${PN}-0.3.34-failing-tests.patch # bug 631930, 686202 - "${FILESDIR}"/${PN}-0.3.34-fno-common.patch # bug 719198 - "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172 - "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172 -) - -src_prepare() { - default - - # FIXME: the following should be proper patch sent to upstream - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die - # don't require Apple's OpenCL on versions of OSX that don't have it - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then - sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die - fi - - # commit 7c78497b : tests that use gegl.png are broken on non-amd64 - sed -e '/clones.xml/d' \ - -e '/composite-transform.xml/d' \ - -i tests/compositions/Makefile.am || die - - eautoreconf - - gnome2_environment_reset - - use vala && vala_src_prepare -} - -src_configure() { - # never enable altering of CFLAGS via profile option - # libspiro: not in portage main tree - # disable documentation as the generating is bit automagic - # if anyone wants to work on it just create bug with patch - - # Also please note that: - # - # - Some auto-detections are not patched away since the docs are - # not built (--disable-docs, lack of --enable-gtk-doc) and these - # tools affect re-generation of docs, only - # (e.g. ruby, asciidoc, dot (of graphviz), enscript) - # - # - Parameter --with-exiv2 compiles a noinst-app only, no use - # - # - Parameter --disable-workshop disables any use of Lua, effectivly - # - # - v4l support does not work with our media-libs/libv4l-0.8.9, - # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - # - # - There are two checks for dot, one controllable by --with(out)-graphviz - # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - # - # - mrg is not in tree and gexiv2 support only has effect when mrg support - # is enabled - # - # So that's why USE="exif graphviz lua v4l" got resolved. More at: - # https://bugs.gentoo.org/show_bug.cgi?id=451136 - # - econf \ - --disable-docs \ - --disable-profile \ - --disable-workshop \ - --program-suffix=-${SLOT} \ - --with-gdk-pixbuf \ - --with-pango \ - --without-exiv2 \ - --without-gexiv2 \ - --without-graphviz \ - --without-jasper \ - --without-libspiro \ - --without-lua \ - --without-mrg \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable debug) \ - $(use_with cairo) \ - $(use_with cairo pangocairo) \ - $(use_with ffmpeg libavformat) \ - $(use_with lcms) \ - $(use_with lensfun) \ - $(use_with openexr) \ - $(use_with raw libraw) \ - $(use_with sdl) \ - $(use_with svg librsvg) \ - $(use_with tiff libtiff) \ - $(use_with umfpack) \ - $(use_with v4l libv4l) \ - $(use_with v4l libv4l2) \ - $(use_enable introspection) \ - $(use_with vala) \ - $(use_with webp) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild deleted file mode 100644 index af4e531eaabf..000000000000 --- a/media-libs/gegl/gegl-0.3.34.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -# vala and introspection support is broken, bug #468208 -VALA_USE_DEPEND=vapigen - -inherit versionator gnome2-utils eutils autotools ltprune python-any-r1 vala - -if [[ ${PV} == *9999* ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" - SRC_URI="" -else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" - -LICENSE="|| ( GPL-3 LGPL-3 )" -SLOT="0.3" - -IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - svg? ( cairo ) - vala? ( introspection ) -" - -# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE -# so there is no chance to support libav right now (Gentoo bug #567638) -# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! -RDEPEND=" - >=dev-libs/glib-2.44:2 - dev-libs/json-glib - >=media-libs/babl-0.1.46 - sys-libs/zlib - >=x11-libs/gdk-pixbuf-2.32:2 - x11-libs/pango - - cairo? ( >=x11-libs/cairo-1.12.2 ) - ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) - virtual/jpeg:0= - lcms? ( >=media-libs/lcms-2.8:2 ) - lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - >=media-libs/libpng-1.6.0:0= - raw? ( >=media-libs/libraw-0.15.4:0= ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - svg? ( >=gnome-base/librsvg-2.40.6:2 ) - tiff? ( >=media-libs/tiff-4:0 ) - umfpack? ( sci-libs/umfpack ) - v4l? ( >=media-libs/libv4l-1.0.1 ) - webp? ( >=media-libs/libwebp-0.5.0:= ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - dev-lang/perl - virtual/pkgconfig - >=sys-devel/libtool-2.2 - test? ( introspection? ( - $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) ) - vala? ( $(vala_depend) ) -" - -pkg_setup() { - use test && use introspection && python-any-r1_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch - "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172 - "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172 -) - -src_prepare() { - default - - # FIXME: the following should be proper patch sent to upstream - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die - # don't require Apple's OpenCL on versions of OSX that don't have it - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then - sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die - fi - - # commit 7c78497b : tests that use gegl.png are broken on non-amd64 - sed -e '/clones.xml/d' \ - -e '/composite-transform.xml/d' \ - -i tests/compositions/Makefile.am || die - - eautoreconf - - gnome2_environment_reset - - use vala && vala_src_prepare -} - -src_configure() { - # never enable altering of CFLAGS via profile option - # libspiro: not in portage main tree - # disable documentation as the generating is bit automagic - # if anyone wants to work on it just create bug with patch - - # Also please note that: - # - # - Some auto-detections are not patched away since the docs are - # not built (--disable-docs, lack of --enable-gtk-doc) and these - # tools affect re-generation of docs, only - # (e.g. ruby, asciidoc, dot (of graphviz), enscript) - # - # - Parameter --with-exiv2 compiles a noinst-app only, no use - # - # - Parameter --disable-workshop disables any use of Lua, effectivly - # - # - v4l support does not work with our media-libs/libv4l-0.8.9, - # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - # - # - There are two checks for dot, one controllable by --with(out)-graphviz - # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - # - # - mrg is not in tree and gexiv2 support only has effect when mrg support - # is enabled - # - # So that's why USE="exif graphviz lua v4l" got resolved. More at: - # https://bugs.gentoo.org/show_bug.cgi?id=451136 - # - econf \ - --disable-docs \ - --disable-profile \ - --disable-workshop \ - --program-suffix=-${SLOT} \ - --with-gdk-pixbuf \ - --with-pango \ - --without-libspiro \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable debug) \ - $(use_with cairo) \ - $(use_with cairo pangocairo) \ - --without-exiv2 \ - $(use_with ffmpeg libavformat) \ - --without-gexiv2 \ - --without-graphviz \ - --without-jasper \ - $(use_with lcms) \ - $(use_with lensfun) \ - --without-lua \ - --without-mrg \ - $(use_with openexr) \ - $(use_with raw libraw) \ - $(use_with sdl) \ - $(use_with svg librsvg) \ - $(use_with tiff libtiff) \ - $(use_with umfpack) \ - $(use_with v4l libv4l) \ - $(use_with v4l libv4l2) \ - $(use_enable introspection) \ - $(use_with vala) \ - $(use_with webp) -} - -src_compile() { - default - - [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." -} - -src_install() { - default - prune_libtool_files --all -} diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild deleted file mode 100644 index e690845d68b8..000000000000 --- a/media-libs/gegl/gegl-0.4.16.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -# vala and introspection support is broken, bug #468208 -VALA_USE_DEPEND=vapigen - -inherit autotools gnome2-utils python-any-r1 vala - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" - SRC_URI="" -else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A graph based image processing framework" -HOMEPAGE="http://www.gegl.org/" - -LICENSE="|| ( GPL-3+ LGPL-3 )" -SLOT="0.4" - -IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - svg? ( cairo ) - vala? ( introspection ) -" - -# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE -# so there is no chance to support libav right now (Gentoo bug #567638) -# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! -RDEPEND=" - >=dev-libs/glib-2.44:2 - dev-libs/json-glib - >=media-libs/babl-0.1.62 - >=media-libs/libpng-1.6.0:0= - virtual/jpeg:0= - >=x11-libs/gdk-pixbuf-2.32:2 - x11-libs/pango - cairo? ( >=x11-libs/cairo-1.12.2 ) - ffmpeg? ( media-video/ffmpeg:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) - lcms? ( >=media-libs/lcms-2.8:2 ) - lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-2.2.0:= ) - pdf? ( >=app-text/poppler-0.71.0[cairo] ) - raw? ( >=media-libs/libraw-0.15.4:0= ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - svg? ( >=gnome-base/librsvg-2.40.6:2 ) - tiff? ( >=media-libs/tiff-4:0 ) - umfpack? ( sci-libs/umfpack ) - v4l? ( >=media-libs/libv4l-1.0.1 ) - webp? ( >=media-libs/libwebp-0.5.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0 ) -" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - >=sys-devel/libtool-2.2 - test? ( ffmpeg? ( media-libs/gexiv2 ) - introspection? ( - $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') - ) - ) - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.3.12-failing-tests.patch" -) - -pkg_setup() { - use test && use introspection && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # FIXME: the following should be proper patch sent to upstream - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die - # don't require Apple's OpenCL on versions of OSX that don't have it - if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then - sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die - fi - - # commit 7c78497b : tests that use gegl.png are broken on non-amd64 - sed -e '/clones.xml/d' \ - -e '/composite-transform.xml/d' \ - -i tests/compositions/Makefile.am || die - - eautoreconf - - gnome2_environment_reset - - use vala && vala_src_prepare -} - -src_configure() { - local myeconfargs=( - # disable documentation as the generating is bit automagic - # if anyone wants to work on it just create bug with patch - --disable-docs - # never enable altering of CFLAGS via profile option - --disable-profile - # - Parameter --disable-workshop disables any use of Lua, effectivly - --disable-workshop - --program-suffix=-${SLOT} - --with-gdk-pixbuf - --with-pango - # - There are two checks for dot, one controllable by --with(out)-graphviz - # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - --without-graphviz - # libspiro: not in portage main tree - --without-libspiro - --without-lua - --without-mrg - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable introspection) - $(use_with cairo) - $(use_with cairo pangocairo) - $(use_with ffmpeg libavformat) - --without-jasper - $(use_with lcms) - $(use_with lensfun) - $(use_with openexr) - $(use_with pdf popplerglib) - $(use_with raw libraw) - $(use_with sdl) - $(use_with svg librsvg) - $(use_with tiff libtiff) - $(use_with umfpack) - # - v4l support does not work with our media-libs/libv4l-0.8.9, - # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - $(use_with v4l libv4l) - $(use_with v4l libv4l2) - $(use_with vala) - $(use_with webp) - $(use_with zlib) - ) - - if use test; then - myeconfargs+=( $(use_with ffmpeg gexiv2) ) - else - myeconfargs+=( --without-gexiv2 ) - fi - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/gegl/gegl-0.4.18-r1.ebuild b/media-libs/gegl/gegl-0.4.18-r1.ebuild index cad3f9ebf9b5..799cc107712f 100644 --- a/media-libs/gegl/gegl-0.4.18-r1.ebuild +++ b/media-libs/gegl/gegl-0.4.18-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild index 6d4f3f52d4ca..3aac36f5af6f 100644 --- a/media-libs/gegl/gegl-0.4.18.ebuild +++ b/media-libs/gegl/gegl-0.4.18.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" diff --git a/media-libs/gegl/gegl-0.4.22-r1.ebuild b/media-libs/gegl/gegl-0.4.22-r1.ebuild index f7d5f9dbbd43..da3d78a2c25d 100644 --- a/media-libs/gegl/gegl-0.4.22-r1.ebuild +++ b/media-libs/gegl/gegl-0.4.22-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" diff --git a/media-libs/gegl/gegl-0.4.22.ebuild b/media-libs/gegl/gegl-0.4.22.ebuild index b97e0c511394..026ab0c6bdc0 100644 --- a/media-libs/gegl/gegl-0.4.22.ebuild +++ b/media-libs/gegl/gegl-0.4.22.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" diff --git a/media-libs/gegl/gegl-0.4.16-r1.ebuild b/media-libs/gegl/gegl-0.4.24.ebuild index fe4898d8fc2a..e71bb9f8c80d 100644 --- a/media-libs/gegl/gegl-0.4.16-r1.ebuild +++ b/media-libs/gegl/gegl-0.4.24.ebuild @@ -2,20 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit autotools gnome2-utils python-any-r1 vala +inherit meson gnome2-utils python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" SRC_URI="" else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" @@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/" LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" -IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib" +IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" svg? ( cairo ) test? ( introspection ) @@ -38,18 +38,20 @@ RESTRICT="!test? ( test )" # If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! RDEPEND=" >=dev-libs/glib-2.44:2 - dev-libs/json-glib - >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] + >=dev-libs/json-glib-1.2.6 + >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] + media-libs/libnsgif >=media-libs/libpng-1.6.0:0= + >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 - x11-libs/pango + >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-2.2.0:= ) + openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) @@ -58,7 +60,6 @@ RDEPEND=" umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0 ) " DEPEND="${RDEPEND}" BDEPEND=" @@ -67,26 +68,28 @@ BDEPEND=" >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig - test? ( ffmpeg? ( media-libs/gexiv2 ) - $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') - ) + test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) vala? ( $(vala_depend) ) " +DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) + PATCHES=( - "${FILESDIR}/${PN}-0.3.12-failing-tests.patch" + "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch + "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch ) +python_check_deps() { + has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" +} + pkg_setup() { - use test && use introspection && python-any-r1_pkg_setup + use test && python-any-r1_pkg_setup } src_prepare() { default - # FIXME: the following should be proper patch sent to upstream - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die @@ -95,9 +98,13 @@ src_prepare() { # commit 7c78497b : tests that use gegl.png are broken on non-amd64 sed -e '/clones.xml/d' \ -e '/composite-transform.xml/d' \ - -i tests/compositions/Makefile.am || die + -i tests/compositions/meson.build || die - eautoreconf + # fix skipping mipmap tests due to executable not found + for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do + sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die + sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die + done gnome2_environment_reset @@ -105,66 +112,47 @@ src_prepare() { } src_configure() { - local myeconfargs=( - # disable documentation as the generating is bit automagic + local emesonargs=( + # - Disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch - --disable-docs - # never enable altering of CFLAGS via profile option - --disable-profile - # - Parameter --disable-workshop disables any use of Lua, effectivly - --disable-workshop - --program-suffix=-${SLOT} - --with-gdk-pixbuf - --with-pango + -Ddocs=false + -Dexiv2=disabled + -Dgdk-pixbuf=enabled + -Dgexiv2=disabled # - There are two checks for dot, one controllable by --with(out)-graphviz # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - --without-graphviz - # libspiro: not in portage main tree - --without-libspiro - --without-lua - --without-mrg - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable introspection) - $(use_with cairo) - $(use_with cairo pangocairo) - $(use_with ffmpeg libavformat) - --without-jasper - $(use_with lcms) - $(use_with lensfun) - $(use_with openexr) - $(use_with pdf popplerglib) - $(use_with raw libraw) - $(use_with sdl) - $(use_with svg librsvg) - $(use_with tiff libtiff) - $(use_with umfpack) + -Dgraphviz=disabled + -Djasper=disabled + -Dlibjpeg=enabled + -Dlibpng=enabled + # - libspiro: not in portage main tree + -Dlibspiro=disabled + -Dlua=disabled + -Dmrg=disabled + -Dpango=enabled + -Dsdl2=disabled + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_feature cairo) + $(meson_feature cairo pangocairo) + $(meson_feature ffmpeg libav) + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature openexr) + $(meson_feature pdf poppler) + $(meson_feature raw libraw) + $(meson_feature sdl sdl1) + $(meson_feature svg librsvg) + $(meson_feature test pygobject) + $(meson_feature tiff libtiff) + $(meson_feature umfpack) # - v4l support does not work with our media-libs/libv4l-0.8.9, # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - $(use_with v4l libv4l) - $(use_with v4l libv4l2) - $(use_with vala) - $(use_with webp) - $(use_with zlib) + $(meson_feature v4l libv4l) + $(meson_feature v4l libv4l2) + $(meson_feature vala vapigen) + $(meson_feature webp) + $(meson_use introspection) ) - - if use test; then - myeconfargs+=( $(use_with ffmpeg gexiv2) ) - else - myeconfargs+=( --without-gexiv2 ) - fi - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die + meson_src_configure } diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index c854f48fae02..6fe143f95cde 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" |