commit: c4527963a5181ff83794b1ff501748633f3d2070 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Tue Mar 3 13:08:31 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 3 21:54:55 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4527963
media-libs/gegl: drop 0.4.64-r1 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/205 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/gegl/Manifest | 1 - .../gegl-0.4.64-Fix-implicit-declaration.patch | 24 --- .../gegl/files/gegl-0.4.64-system-libnsgif.patch | 35 ----- media-libs/gegl/gegl-0.4.64-r1.ebuild | 174 --------------------- media-libs/gegl/metadata.xml | 1 - 5 files changed, 235 deletions(-) diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 4b273823d3e2..2f092f681fc6 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -1,2 +1 @@ -DIST gegl-0.4.64.tar.xz 6066976 BLAKE2B ed232187d550ac0af4b7bbfe1f186e5fbf3285a19c3a6b7e3b6b9218f4512df2aa5c912e192d67d2ad7150749937bca2d74fb67b8c7087e871ed1ea49843d1fb SHA512 231cce5545d7a7fd21de309502d560f51080568aa3c95478b8a12d000d67314afcf8fe5e1977d2ff33530ca7bf8c2819b7bbd7b9ca0a2393abc2f26d4c5d94c2 DIST gegl-0.4.66.tar.xz 6078452 BLAKE2B 479ffcdcfc141ebe709cee78c22848d7b2312723500df4b6a090e1cb1cdc211f95c87005071eadb66ead65fee5a11a88dda3f9e662e2e2e945cee60d47dbaeae SHA512 ed1f809aaea8768b1eff2a6adcf66b3ef7c11e03d410ef8952051822017f9a6bcee0e29dd32708dd6937d49416c6db55cd8d34458619022ea750311253899ae9 diff --git a/media-libs/gegl/files/gegl-0.4.64-Fix-implicit-declaration.patch b/media-libs/gegl/files/gegl-0.4.64-Fix-implicit-declaration.patch deleted file mode 100644 index b124c6825e75..000000000000 --- a/media-libs/gegl/files/gegl-0.4.64-Fix-implicit-declaration.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a320f639952d2beee994ab5da96aa925e1823e77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]> -Date: Mon, 6 Oct 2025 23:17:33 -0400 -Subject: [PATCH] gegl-tester: Fix implicit declaration - ---- - tools/gegl-tester.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git ./tools/gegl-tester.c ./tools/gegl-tester.c -index 59aaf8379..9379442f1 100644 ---- ./tools/gegl-tester.c -+++ ./tools/gegl-tester.c -@@ -22,6 +22,7 @@ - #include <gegl.h> - #include <gegl-plugin.h> - #include <glib.h> -+#include <glib/gprintf.h> - #include <gio/gio.h> - - //#define MAX_DIFFERENCE_THRESHOLD 0.5 // not visible --- -2.51.2 - diff --git a/media-libs/gegl/files/gegl-0.4.64-system-libnsgif.patch b/media-libs/gegl/files/gegl-0.4.64-system-libnsgif.patch deleted file mode 100644 index 87ac2a5bf658..000000000000 --- a/media-libs/gegl/files/gegl-0.4.64-system-libnsgif.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/953503 -https://gitlab.gnome.org/GNOME/gegl/-/issues/418 -https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/232 - -From 7f5d9e8ae2ebf0d8b4f4c4209609eb82443a5b5a Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <[email protected]> -Date: Mon, 6 Oct 2025 02:12:08 +0300 -Subject: [PATCH] gif-load: don't embed libnsgif directly - -This means building against system libnsgif is possible. These are all the -changes needed because the subproject was already properly setup, just -partly unused. - -assert.h header was implicitly included from gif.c and lzw.c. - -Fixes: https://gitlab.gnome.org/GNOME/gegl/-/issues/418 -Signed-off-by: Alfred Wingate <[email protected]> ---- a/operations/external/gif-load.c -+++ b/operations/external/gif-load.c -@@ -49,10 +49,8 @@ property_int (frame_delay, _("frame-delay"), 100) - #include <gegl-op.h> - #include <gegl-gio-private.h> - --/* since libnsgif is nice and simple we directly embed it in the .so */ --#include "subprojects/libnsgif/nsgif.h" --#include "subprojects/libnsgif/gif.c" --#include "subprojects/libnsgif/lzw.c" -+#include <assert.h> -+#include <nsgif.h> - - #define IO_BUFFER_SIZE 4096 - --- -2.51.0 - diff --git a/media-libs/gegl/gegl-0.4.64-r1.ebuild b/media-libs/gegl/gegl-0.4.64-r1.ebuild deleted file mode 100644 index e198e8001645..000000000000 --- a/media-libs/gegl/gegl-0.4.64-r1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) -# vala and introspection support is broken, bug #468208 -VALA_USE_DEPEND=vapigen - -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"; -else - SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="A graph based image processing framework" -HOMEPAGE="https://gegl.org/"; - -LICENSE="|| ( GPL-3+ LGPL-3 )" -SLOT="0.4" - -IUSE="cairo debug ffmpeg gtk-doc +introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" -REQUIRED_USE=" - gtk-doc? ( introspection ) - 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.68.2:2 - >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.116[introspection?,lcms?,vala?] - media-libs/libjpeg-turbo:= - >=media-libs/libnsgif-1.0.0:= - >=media-libs/libpng-1.6.0:0= - >=virtual/zlib-1.2.0:= - >=x11-libs/gdk-pixbuf-2.32:2 - >=x11-libs/pango-1.38.0 - cairo? ( >=x11-libs/cairo-1.12.2 ) - ffmpeg? ( media-video/ffmpeg:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= ) - lcms? ( >=media-libs/lcms-2.8:2 ) - lensfun? ( >=media-libs/lensfun-0.2.5 ) - 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 ) - sdl2? ( >=media-libs/libsdl2-2.0.20 ) - svg? ( >=gnome-base/librsvg-2.40.6:2 ) - tiff? ( >=media-libs/tiff-4:= ) - umfpack? ( sci-libs/umfpack ) - v4l? ( >=media-libs/libv4l-1.0.1 ) - webp? ( >=media-libs/libwebp-0.5.0:= ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( dev-util/gi-docgen ) - test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) - vala? ( $(vala_depend) ) -" - -DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc ) - -PATCHES=( - "${FILESDIR}"/gegl-0.4.64-system-libnsgif.patch - "${FILESDIR}"/gegl-0.4.64-Fix-implicit-declaration.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - python-any-r1_pkg_setup -} - -python_check_deps() { - use test || return 0 - python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - # 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.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 - - # 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 - - # 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/html/gegl-0.4 instead of /usr/share/doc/gegl-0.4 - sed -i -e "s#'doc'#'gtk-doc' / 'html'#" docs/reference/meson.build || die -} - -src_configure() { - # Bug #859901 - filter-lto - - use vala && vala_setup - - local emesonargs=( - # - Disable documentation as the generating is bit automagic - # if anyone wants to work on it just create bug with patch - -Ddocs=false # website - -Dgdk-pixbuf=enabled - -Djasper=disabled - # - libspiro: not in portage main tree - -Dlibspiro=disabled - -Dlua=disabled - -Dmrg=disabled - -Dpango=enabled - # - Parameter -Dworkshop=false disables any use of Lua, effectivly - -Dworkshop=false - $(meson_feature cairo) - $(meson_feature cairo pangocairo) - $(meson_feature ffmpeg libav) - $(meson_feature gtk-doc gi-docgen) - $(meson_feature lcms) - $(meson_feature lensfun) - $(meson_feature openexr) - $(meson_feature openmp) - $(meson_feature pdf poppler) - $(meson_feature raw libraw) - $(meson_feature sdl sdl1) - $(meson_feature sdl2 sdl2) - $(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 - $(meson_feature v4l libv4l) - $(meson_feature v4l libv4l2) - $(meson_feature vala vapigen) - $(meson_feature webp) - $(meson_use introspection) - ) - meson_src_configure -} - -pkg_postinst() { - optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz -} diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml index f9e20caf9492..e6028d5a8965 100644 --- a/media-libs/gegl/metadata.xml +++ b/media-libs/gegl/metadata.xml @@ -10,7 +10,6 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag> <flag name="sdl2">Add support for Simple Direct Layer 2.0 (<pkg>media-libs/libsdl2</pkg>)</flag> <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag> </use>
