diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest index 26aa8f048ca5f..08d7eace0ad4e 100644 --- a/media-libs/babl/Manifest +++ b/media-libs/babl/Manifest @@ -1,3 +1 @@ -DIST babl-0.1.122.tar.xz 325824 BLAKE2B 37a0286b6979c3f3835d0f3febefdc97d1e8ae324bad6e17fde892b513b7640de4cc67553cee59b81b86f2a6d80d08ac5699b7378e1c042d2c989d616cc782b1 SHA512 061b8d62a618129c9f08fc04ca1e86145873cf15fcde643be60b52393316275ca6d98bb44ac86b7b26264bc3a9b2fd54db39d78b2b56fe069daf678b28ded59f -DIST babl-0.1.124.tar.xz 326268 BLAKE2B e36f12fb313683693a89b813390d9e60d8a57546bee9537a3ac09c79876ae057e58243cf59177742cf7aa0727af397ccc4ea3801d498661a21938444da9345b7 SHA512 8e0199444e375c54e6723a5414a0e75874d11ba778d2c9c833f16b79f0634e900f82c2cf8d01b7e33ca609b6273873acf138d84778ba181b88ca50e1368c5ace DIST babl-0.1.126.tar.xz 326996 BLAKE2B d569df2d6bfe742473634fa4f4039f9f0edd866a0ef27e1bd59688e853cc5fb9029058f2a3dc46ec51366cc0bd1386cb0e1716dd5ce799da043fa5b286d2ffb7 SHA512 953037386e1763b28385f0f1802a657e2b918b5db3932cc62e75aa32c36b36b0513258f1b5548dfebedb51fb6de47412503ea8f8aff4ce79c314e33a28d27166 diff --git a/media-libs/babl/babl-0.1.122.ebuild b/media-libs/babl/babl-0.1.122.ebuild deleted file mode 100644 index eff5acfa8e2ff..0000000000000 --- a/media-libs/babl/babl-0.1.122.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VALA_USE_DEPEND=vapigen - -inherit meson gnome2-utils vala toolchain-funcs - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.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 -sparc x86 ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="A dynamic, any to any, pixel format conversion library" -HOMEPAGE="https://gegl.org/babl/" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="+introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" -REQUIRED_USE="vala? ( introspection )" - -BDEPEND=" - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND=" - introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= ) - lcms? ( >=media-libs/lcms-2.13.1:2 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/babl-0.1.118-respect-NM.patch -) - -src_prepare() { - default - gnome2_environment_reset -} - -src_configure() { - tc-export READELF NM - - use vala && vala_setup - - # Automagic rsvg support is just for website generation we do not call, - # so we don't need to fix it - # w3m is used for dist target thus no issue for us that it is automagically - # detected - local emesonargs=( - -Dwith-docs=false - $(meson_use introspection enable-gir) - $(meson_feature lcms with-lcms) - $(meson_use vala enable-vapi) - $(meson_use cpu_flags_x86_avx2 enable-avx2) - $(meson_use cpu_flags_x86_f16c enable-f16c) - $(meson_use cpu_flags_x86_mmx enable-mmx) - $(meson_use cpu_flags_x86_sse enable-sse) - $(meson_use cpu_flags_x86_sse2 enable-sse2) - $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1) - ) - meson_src_configure -} diff --git a/media-libs/babl/babl-0.1.124.ebuild b/media-libs/babl/babl-0.1.124.ebuild deleted file mode 100644 index 719833463db02..0000000000000 --- a/media-libs/babl/babl-0.1.124.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VALA_USE_DEPEND=vapigen - -inherit meson gnome2-utils toolchain-funcs vala - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.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 -sparc x86 ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="A dynamic, any to any, pixel format conversion library" -HOMEPAGE="https://gegl.org/babl/" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="+introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" -REQUIRED_USE="vala? ( introspection )" - -BDEPEND=" - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND=" - introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= ) - lcms? ( >=media-libs/lcms-2.13.1:2 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/babl-0.1.124-respect-NM.patch -) - -src_prepare() { - default - gnome2_environment_reset -} - -src_configure() { - tc-export READELF NM - - use vala && vala_setup - - # Automagic rsvg support is just for website generation we do not call, - # so we don't need to fix it - # w3m is used for dist target thus no issue for us that it is automagically - # detected - local emesonargs=( - -Dwith-docs=false - $(meson_use introspection enable-gir) - $(meson_feature lcms with-lcms) - $(meson_use vala enable-vapi) - $(meson_use cpu_flags_x86_avx2 enable-avx2) - $(meson_use cpu_flags_x86_f16c enable-f16c) - $(meson_use cpu_flags_x86_mmx enable-mmx) - $(meson_use cpu_flags_x86_sse enable-sse) - $(meson_use cpu_flags_x86_sse2 enable-sse2) - $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1) - ) - meson_src_configure -} diff --git a/media-libs/babl/files/babl-0.1.118-respect-NM.patch b/media-libs/babl/files/babl-0.1.118-respect-NM.patch deleted file mode 100644 index 1baf9d3be2570..0000000000000 --- a/media-libs/babl/files/babl-0.1.118-respect-NM.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/968162 - -diff --git a/tools/defcheck.py b/tools/defcheck.py -index 3103481..30d875f 100644 ---- a/tools/defcheck.py -+++ b/tools/defcheck.py -@@ -31,7 +31,7 @@ Needs the tool "nm" to work - - import sys, subprocess - --from os import path -+from os import getenv, path - - def_files = sys.argv[1:] - -@@ -65,7 +65,7 @@ for df in def_files: - # unsortindex = i+1 - # break; - -- status, nm = subprocess.getstatusoutput ("nm --defined-only --extern-only " + -+ status, nm = subprocess.getstatusoutput (getenv("NM", default="nm") + " --defined-only --extern-only " + - libname) - if status != 0: - print("trouble reading {} - has it been compiled?".format(libname)) - diff --git a/media-libs/babl/files/babl-0.1.124-respect-NM.patch b/media-libs/babl/files/babl-0.1.124-respect-NM.patch deleted file mode 100644 index 7883d6db85822..0000000000000 --- a/media-libs/babl/files/babl-0.1.124-respect-NM.patch +++ /dev/null @@ -1,73 +0,0 @@ -https://bugs.gentoo.org/968162 -https://gitlab.gnome.org/GNOME/babl/-/commit/9263d419231a2c0f36fc89dfb95d723f0ef85d80 -https://gitlab.gnome.org/GNOME/babl/-/commit/e4522a33915a06d6703baa522487716f049e9942 - -From 9263d419231a2c0f36fc89dfb95d723f0ef85d80 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Sun, 15 Mar 2026 21:27:56 +0200 -Subject: [PATCH] tools: allow use of NM env variable - -Fixes: 841ad402d14b8239ae470691edf3012f707325bc -Reverts: e26e11e9bbe600b96d5e21adb4bf5df49d971deb -Signed-off-by: Alfred Wingate ---- a/meson.build -+++ b/meson.build -@@ -575,6 +575,8 @@ endif - subdir('bin') - - if not platform_osx and host_cpu_family != 'x86' -+ nm = find_program('nm', required: false) -+ - # Verify .def files for Windows linking. - # We check this on non-Windows platform on CI, and on Windows itself. - custom_target('check-def-files', -@@ -584,6 +586,7 @@ if not platform_osx and host_cpu_family != 'x86' - depends: [ - babl - ], -+ env: nm.found() ? { 'NM': nm.full_path() } : {}, - output: [ 'check-def-files', ], - command: [ - python, meson.project_source_root() / 'tools' / 'defcheck.py', '@INPUT@', ---- a/tools/defcheck.py -+++ b/tools/defcheck.py -@@ -30,7 +30,7 @@ Needs the tool "nm", "objdump" or "dumpbin" to work - - import os, sys, subprocess, shutil - --from os import path -+from os import getenv, path - - def_files = sys.argv[1:] - -@@ -42,7 +42,7 @@ exclude_symbols = [ - have_errors = 0 - - libextension = ".so" --command = "nm --defined-only --extern-only " -+command = getenv("NM", default="nm") + " --defined-only --extern-only " - libprefix = "lib" - platform_linux = True - --- -GitLab - -From e4522a33915a06d6703baa522487716f049e9942 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Sun, 15 Mar 2026 18:36:35 +0200 -Subject: [PATCH] tools: include error message to ease debugging - -Signed-off-by: Alfred Wingate ---- a/tools/defcheck.py -+++ b/tools/defcheck.py -@@ -85,6 +85,7 @@ for df in def_files: - status, nm = subprocess.getstatusoutput (command + libname) - if status != 0: - print("trouble reading {} - has it been compiled?".format(libname)) -+ print(nm) - have_errors = -1 - continue - --- -GitLab -