[gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/

["Sam James" <sam@gentoo.org>]

commit:     17fa824d8516449464d85ac7ce858ae2260053bf
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Tue Mar 18 18:53:56 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 18 19:22:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17fa824d

media-libs/gegl: 0.4.56 version bump

Still affected by ffmpeg-6 upstream issue:
https://gitlab.gnome.org/GNOME/gegl/-/issues/324

Bug: https://bugs.gentoo.org/907412
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 +
 .../gegl/{gegl-9999.ebuild => gegl-0.4.56.ebuild}   | 21 +++++++++++++++------
 media-libs/gegl/gegl-9999.ebuild                    |  7 ++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 9069755d6556..7dae7d96dc30 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -2,3 +2,4 @@ DIST gegl-0.4.48.tar.xz 5805488 BLAKE2B 3a800004f166fdbfbd563688bb71c4579bba1323
 DIST gegl-0.4.50.tar.xz 5987700 BLAKE2B 08d59ec417194b17819c8996efcb4e10cd86e3626bbe2690ca6f22e095a8bc346fac83460896019044978f5577b7ccdf02265487b3d3dfe8e28a7390741d38d7 SHA512 6ba7cc6a1feca518857a6f474fffec4d3ddce81104541d9d8c9d6a6d7464a00ec0d4fce63194ba2d457d606fea3049fbd365b20b70fdbdf275dac61bc35f8205
 DIST gegl-0.4.52.tar.xz 5989340 BLAKE2B bb1c7a0869474347ad2765750967007f0412f38740010525ebb871ab4521b95bb62392e7e5b40e7157050151bb761b8d643229acccfdced6b6cb795ee1f7a916 SHA512 fc6c9306733624eb34774c2707d7628a32fc33d1543c93ee62ac970d36d94f60547f89690651d17feca4d60d0c9decaba9214b95bbd96a7cd0db035af4bfc772
 DIST gegl-0.4.54.tar.xz 6010748 BLAKE2B 282da412f07b80b2d02dc8c1b877590cbfa79d398b90e6579b2c14f7b7f0c3f7418a363642bc629924926c6d992e143a4713afdc18bca0eba28bb07841478fac SHA512 95a6ef4866b90c9ce950af2e8e1e465044bc8f0e0065884b103c7d86d7a56f5b9142a90abc4676675add46e69b811f5b8225eb7676454d5c49d7cd19e4edab7e
+DIST gegl-0.4.56.tar.xz 6020552 BLAKE2B 7f61a339c843e6d1f361e8be0e4f3b13b63b77190452555096978d83deae36c29bff8ee06793011fc5ddf95d57a5ba3f71776a0c0ad4cb734a6b7c0d68fca55c SHA512 2e2f9dd58650008225b5fa7902a32af75fe423ee6eac48cb8d197377efd690c9c93ec6a9827c40aa2f7035591cf3bf42693063d1102244a13c22729daf394e3f

diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.56.ebuild
similarity index 88%
copy from media-libs/gegl/gegl-9999.ebuild
copy to media-libs/gegl/gegl-0.4.56.ebuild
index ff40c2a29cce..5e1b6781bde8 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-0.4.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,9 @@ inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -39,7 +38,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.68.2:2
 	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.110[introspection?,lcms?,vala?]
+	>=media-libs/babl-0.1.112[introspection?,lcms?,vala?]
 	media-libs/libjpeg-turbo
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
@@ -67,9 +66,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
-	>=dev-build/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
-	>=dev-build/libtool-2.2
 	virtual/pkgconfig
 	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )
@@ -105,6 +102,18 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
+
+	# 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
+
+	# Fix QA warning, install docs into /usr/share/gtk-doc/gegl-0.4 instead of /usr/share/doc/gegl-0.4
+	sed -i -e   "s/'doc'/'gtk-doc'/" docs/reference/meson.build || die
 }
 
 src_configure() {

diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index ff40c2a29cce..5183bcfdeddd 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,6 @@ inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
@@ -39,7 +38,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.68.2:2
 	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.110[introspection?,lcms?,vala?]
+	>=media-libs/babl-0.1.112[introspection?,lcms?,vala?]
 	media-libs/libjpeg-turbo
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
@@ -67,9 +66,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
-	>=dev-build/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
-	>=dev-build/libtool-2.2
 	virtual/pkgconfig
 	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )