From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- media-libs/gegl/Manifest | 8 +++++--- .../files/gegl-0.4.26-fix-build-glib-2.67.3.patch | 24 ++++++++++++++++++++++ .../files/gegl-0.4.30-fix-build-openexr-3.patch | 22 ++++++++++++++++++++ media-libs/gegl/gegl-0.4.26-r1.ebuild | 4 +++- media-libs/gegl/gegl-0.4.28.ebuild | 6 ++++-- media-libs/gegl/gegl-0.4.30.ebuild | 6 +++++- 6 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch create mode 100644 media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch (limited to 'media-libs/gegl') diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 58ef53593801..3c2d5617d3e5 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -1,10 +1,12 @@ AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5 AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417 +AUX gegl-0.4.26-fix-build-glib-2.67.3.patch 765 BLAKE2B cd9a629e1dc6aa8751b06c950ee0340464e8110c042663c3f94ae6ba347047bd5bef3d39db590d3c3d0e8d0388b7e86e2e4478226c4e85e01faa91e7eec9fcb9 SHA512 9b7bccc4f7b555e95c8e2858879c5056278b439c79b586aadf0ad343f3fc210afcfee766b9902c8f6868bf9e246cb61ee66e828e50ed44d64a1c51cbf61e28f5 +AUX gegl-0.4.30-fix-build-openexr-3.patch 694 BLAKE2B 45bfdc9ebb8bb651e84a5e7038e878fbd022083de1a92adc020212e6903faced42a12c68ba0643e2699795a71fa9a703871af4d1a280e612dfda74b50c216179 SHA512 4ccad50d0789a95f599b62b4e8801e417214615775cd44f201bd101635316ed7d763f8a84365dc09d62503859558791d0c0d4871866fde84ed42ecdb091d013e DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24 DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7 DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378 -EBUILD gegl-0.4.26-r1.ebuild 4918 BLAKE2B fed1558637b7204e42276acce1686e082c30872da393ceb587fb65fa5799868e6a3e547fd053cdfdb4d03944e13e739f6e7d0f612b145a20275a94c851fa3330 SHA512 be8f2fc4138d83fe1d302ae195a31d5da438be83daad88c729bf1bdec28a31c8677a469143e1a8f59de8ad48a8032405c04396ff6b05f2b9e5a726232752c395 -EBUILD gegl-0.4.28.ebuild 4922 BLAKE2B d8ea7a1ca2ed1370330ec03d1cb8650ad45a7b7172322c567ec50aec302b453f434aecfc30bfe6242096d92d9eeaa6a53223c79b2fbe894840be8f3582026d5a SHA512 0d195fb4b3dc1b9d496a7701d26c7f508c3177eaa5ce9d180777b89bb99e1dea79289ef8deacd9cbb3de62c98b7e83b3b21068adbca7a228e1dca83008cbebf4 -EBUILD gegl-0.4.30.ebuild 4762 BLAKE2B 340be5f6e2bd80c2b683f414521c9c158d238e5457e85f841f58de3011874d1901b4cd1918bb6c1a4afe5b1cc753af1c4a0a587d9728e22f24f91a5576da6584 SHA512 779fb12362ad509f8f91042e031937a5e82fd35d582a9f424b6795d2216c6bc42a00aa4c877a07ec20902d0793e33e50aa4a5286d7307cf53273b37a9b96ad24 +EBUILD gegl-0.4.26-r1.ebuild 5022 BLAKE2B d76955b962ac995d1648152318607f4ebc4f74680e95e357eaf2ff0391800212c9cf0ba2bb7445ce89031ff0d0fc1c5c14046903de32bb4e49a6adc3267fb49e SHA512 14bf294c9c1b073d7c3dce07b61b0b02d298ed3fe9d53825c91c4ed6b10d28fdfebc73dcb63fff9dbd272d0278b688a64236ca0ddce5ca15722af2b17d009912 +EBUILD gegl-0.4.28.ebuild 5034 BLAKE2B aa7b52183ed7cf1047dc19be3343fd06efda464eb03aecd93959bbecde260a4d7aaf172bb91194d672fa8ae2512ef698e0b77492a8bc6307eda9c4f093271f73 SHA512 bb2ab17cfbab58b420bad3b957a2b84563d7294631a7b188fef6a5dc530b742da96b6dee5d0fc8103ee419e9ef2b587ee1011e02cb96bac372df7f68404fab8d +EBUILD gegl-0.4.30.ebuild 4823 BLAKE2B 785a20a11914410fe117ea409a66c6d030651eaf96a4b5e0aa272d0986ce8b163761567e54d3bdd3e3092d2a5025767a21ad3aed4b395ba282be8524e5c39239 SHA512 baf13b20f7b3404321d700d4d9a3edfb4f60aacbddf7ed0906403769dd72c4eae4af0d1f761bd61d77fc15554bb53c4b866b1bb2f403615b85fa6e01b7165e54 EBUILD gegl-9999.ebuild 4493 BLAKE2B ef40bd142f0f50c7a762a68071ceaadaa0eadb0d15ff2da97a7b42b72aa9782bd37b6bc5b1162f1cd986b08cb24169000c4db69fdfcced450dcb281f3714ff0b SHA512 b33c2c4cfb749a836e53802f96e9000dbb6b68a6fb3f4863737f5d4e3550cefd17ef8a4610c04014fa7d696b0efc637b3437e145961bd567c1393f3be7caee4a MISC metadata.xml 580 BLAKE2B 604088ef1ce307cb04f44e6c204355569136168f6f574a3b58a5ce374b9e9d4e41476107f11cd5990d0ae39ace5db5420e372c7c88d409b38930cc8b6030b3c0 SHA512 a59cd50a65117f265616e2b595ec3cc95a59f9caac46218fb137af2f62067c5563a4dc53930188b6adf13b0548f02b637bb8312863ee1976ace90ec509e4a2f1 diff --git a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch new file mode 100644 index 000000000000..00e1b8ab4845 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch @@ -0,0 +1,24 @@ +From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001 +From: Olivier Tilloy +Date: Fri, 5 Mar 2021 12:58:18 +0100 +Subject: [PATCH] Fix build with glib 2.67.3 (see + https://gitlab.gnome.org/GNOME/glib/-/issues/2331). + +--- + operations/external/exr-load.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp +index e864f7e3e..28403639c 100644 +--- a/operations/external/exr-load.cpp ++++ b/operations/external/exr-load.cpp +@@ -29,9 +29,7 @@ property_file_path (path, "File", "") + #define GEGL_OP_NAME exr_load + #define GEGL_OP_C_FILE "exr-load.cpp" + +-extern "C" { + #include "gegl-op.h" +-} + + #include + #include diff --git a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch new file mode 100644 index 000000000000..e0e938acc22e --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch @@ -0,0 +1,22 @@ +From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Sat, 24 Apr 2021 10:51:09 +0000 +Subject: [PATCH] Fix build with OpenEXR 3 + +Add a header that is no longer transitively included +--- + operations/external/exr-save.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc +index 1e8c09d96..87abed511 100644 +--- a/operations/external/exr-save.cc ++++ b/operations/external/exr-save.cc +@@ -45,6 +45,7 @@ extern "C" { + #include + #include + #include ++#include + #include "ImathRandom.h" + + diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild index 5185fcb9f8e9..71107e34e87e 100644 --- a/media-libs/gegl/gegl-0.4.26-r1.ebuild +++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild @@ -37,7 +37,7 @@ RESTRICT="!test? ( test )" # 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/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] media-libs/libnsgif @@ -78,6 +78,8 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) PATCHES=( "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch + "${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch + "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch ) python_check_deps() { diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild index 6efb79792de8..6952d3f4fa8c 100644 --- a/media-libs/gegl/gegl-0.4.28.ebuild +++ b/media-libs/gegl/gegl-0.4.28.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,7 @@ RESTRICT="!test? ( test )" # 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/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.84[introspection?,lcms?,vala?] media-libs/libnsgif @@ -78,6 +78,8 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) PATCHES=( "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch + "${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch + "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch ) python_check_deps() { diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild index db958e5516ed..0f6d0b738252 100644 --- a/media-libs/gegl/gegl-0.4.30.ebuild +++ b/media-libs/gegl/gegl-0.4.30.ebuild @@ -37,7 +37,7 @@ RESTRICT="!test? ( test )" # 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/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.84[introspection?,lcms?,vala?] media-libs/libnsgif @@ -75,6 +75,10 @@ BDEPEND=" DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) +PATCHES=( + "${FILESDIR}"/${P}-fix-build-openexr-3.patch +) + python_check_deps() { use test || return 0 has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" -- cgit v1.2.3