commit: f035b3f97ff9147f86186a39e0fe807a49dd3dd9
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Sep 8 06:01:33 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 8 06:37:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f035b3f9
media-libs/gegl: 0.4.32 version bump; update live ebuild
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/gegl/Manifest | 1 +
media-libs/gegl/{gegl-9999.ebuild => gegl-0.4.32.ebuild} | 14 ++++++++++++--
media-libs/gegl/gegl-9999.ebuild | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index da900e34887..8f38bb97db7 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,3 +1,4 @@
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
+DIST gegl-0.4.32.tar.xz 5633796 BLAKE2B
a4ba5d19291a61c6903dcc368e6cc3e1934e8d89b555e81afd22709504fbb8a7ed104890af5f1e7bfbdd5664caef8f5e015341c7882f2171ecb518afe32a65ef
SHA512
68da02b8df0a1d234063958896f3678ead62772e611bddb39a6f21ec58cc744599d0a691224c057f2da4d04f2ccfb155a545deea92e77c728dbaeeb90e68cad6
diff --git a/media-libs/gegl/gegl-9999.ebuild
b/media-libs/gegl/gegl-0.4.32.ebuild
similarity index 92%
copy from media-libs/gegl/gegl-9999.ebuild
copy to media-libs/gegl/gegl-0.4.32.ebuild
index 489b8bd6e25..95d000ce76a 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-0.4.32.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
+# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
inherit meson optfeature python-any-r1 vala
@@ -36,9 +37,9 @@ 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/babl-0.1.88[introspection?,lcms?,vala?]
media-libs/libnsgif
>=media-libs/libpng-1.6.0:0=
>=sys-libs/zlib-1.2.0
@@ -99,6 +100,15 @@ src_prepare() {
-e '/composite-transform.xml/d' \
-i tests/compositions/meson.build || die
+ # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
+ pushd "${S}/opencl/" || die
+ for file in *.cl; do
+ if [[ -f ${file} ]]; then
+ "${EPYTHON}" cltostring.py "${file}" || die
+ fi
+ done
+ popd || die
+
use vala && vala_src_prepare
}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 489b8bd6e25..241f4ce6cfa 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -36,9 +36,9 @@ 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/babl-0.1.88[introspection?,lcms?,vala?]
media-libs/libnsgif
>=media-libs/libpng-1.6.0:0=
>=sys-libs/zlib-1.2.0