commit: 126de38a7a4e8a06e5fb8566beb41167db0289f9 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Mon May 19 17:53:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 21 20:58:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126de38a
media-libs/gegl: 0.4.62 version bump Still fail tests against media-video/ffpmeg-7.1.1-r1 Bug: https://bugs.gentoo.org/907412 Close: https://bugs.gentoo.org/956310 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Part-of: https://github.com/gentoo/gentoo/pull/42157 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/gegl/Manifest | 1 + .../gegl/{gegl-9999.ebuild => gegl-0.4.62.ebuild} | 18 +++++++++++++++--- media-libs/gegl/gegl-9999.ebuild | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index e2406627c790..517d4496a52c 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -1,3 +1,4 @@ DIST gegl-0.4.48.tar.xz 5805488 BLAKE2B 3a800004f166fdbfbd563688bb71c4579bba132380f5f45496e8fb813943333b89781320230adf6e0ee49b9bde7db37d81929a8fd42e19e62281e7f8d1ea3bfb SHA512 8f47e6445062894c16d54eeeec4a55cccc32fc49c9fb9be3428a591daaeb21b1a5b8529a68d82613fd75f107bb8c0418c9e5337346bd94da3226e545189c226b DIST gegl-0.4.56.tar.xz 6020552 BLAKE2B 7f61a339c843e6d1f361e8be0e4f3b13b63b77190452555096978d83deae36c29bff8ee06793011fc5ddf95d57a5ba3f71776a0c0ad4cb734a6b7c0d68fca55c SHA512 2e2f9dd58650008225b5fa7902a32af75fe423ee6eac48cb8d197377efd690c9c93ec6a9827c40aa2f7035591cf3bf42693063d1102244a13c22729daf394e3f DIST gegl-0.4.58.tar.xz 6020756 BLAKE2B e15cba71414acaf38ff26fb7efccb2403d419cb45d86e9724cec6fef3310eec331f8dbedaf474d2af3b39ab8c385fdba30e2a9b6a41a1311396ab652d1763afa SHA512 25b740374559992d713119bdf61b13708e796c55102c053bf732099b41275f173d67f75b557dc2fc8cd9f9b7961dbf0b3298eea7ed7aeac07732e5e3cf8ac5dd +DIST gegl-0.4.62.tar.xz 6025372 BLAKE2B c9389b33fba4d6425a616cc6c236e9f05a5bbb81da75021f901d46fac675cf4b9dd4a03a6477ddc4c5047b0a6ff4ce0e37cff64fc7aa68431be93236bf9dafcc SHA512 bf4801588abe8b568ae3d1daafa97af28516bbbdd44d2a0798c87412b49301f621db3cf1c7a3ec33f19d96ab4dbd37d80824f04460116a896dd7415aa0d5229d diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.62.ebuild similarity index 88% copy from media-libs/gegl/gegl-9999.ebuild copy to media-libs/gegl/gegl-0.4.62.ebuild index bdd676d951f5..b989662d5f01 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-0.4.62.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"; 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" @@ -38,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.112[introspection?,lcms?,vala?] + >=media-libs/babl-0.1.114[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= @@ -93,7 +93,7 @@ src_prepare() { # patch executables suffix sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die - sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die + sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.py || die # skip UNEXPECTED PASSED 'matting-levin' test sed -i -e "s/composition_tests += 'matting-levin'//" \ -e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die @@ -102,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 bdd676d951f5..38051d6a5430 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -93,7 +93,7 @@ src_prepare() { # patch executables suffix sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die - sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die + sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.py || die # skip UNEXPECTED PASSED 'matting-levin' test sed -i -e "s/composition_tests += 'matting-levin'//" \ -e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
