diff options
Diffstat (limited to 'meta-gnome/recipes-gimp')
-rw-r--r-- | meta-gnome/recipes-gimp/babl/babl_0.1.108.bb (renamed from meta-gnome/recipes-gimp/babl/babl_0.1.88.bb) | 13 | ||||
-rw-r--r-- | meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch | 28 | ||||
-rw-r--r-- | meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb (renamed from meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb) | 23 | ||||
-rw-r--r-- | meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch | 30 | ||||
-rw-r--r-- | meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch | 24 | ||||
-rw-r--r-- | meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch | 34 | ||||
-rw-r--r-- | meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch | 22 | ||||
-rw-r--r-- | meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb (renamed from meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb) | 15 |
8 files changed, 137 insertions, 52 deletions
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb index 8a09fdf0e5..e0685f781d 100644 --- a/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb +++ b/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb @@ -1,20 +1,17 @@ SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" -LICENSE = "LGPL-3.0" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" -GNOMEBASEBUILDCLASS = "meson" - GIR_MESON_OPTION = "enable-gir" +VALA_MESON_OPTION = "enable-vapi" inherit setuptools3 gnomebase gobject-introspection vala DEPENDS += "lcms" -# https://bugs.llvm.org/show_bug.cgi?id=45555 -CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " -CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " - SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "4f0d7f4aaa0bb2e725f349adf7b351a957d9fb26d555d9895a7af816b4167039" +SRC_URI[sha256sum] = "26defe9deaab7ac4d0e076cab49c2a0d6ebd0df0c31fd209925a5f07edee1475" + +FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch b/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch deleted file mode 100644 index b2f13afd5d..0000000000 --- a/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 073d622fbf8564271cd9be87c2f619ea00498578 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 1 May 2021 08:25:24 -0700 -Subject: [PATCH] Fix build with OpenEXR 3 - -Add a header that is no longer transitively included - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/96] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - operations/external/exr-save.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc -index 1e8c09d..87abed5 100644 ---- a/operations/external/exr-save.cc -+++ b/operations/external/exr-save.cc -@@ -45,6 +45,7 @@ extern "C" { - #include <ImfChromaticities.h> - #include <ImfStandardAttributes.h> - #include <ImfArray.h> -+#include <ImfFrameBuffer.h> - #include "ImathRandom.h" - - --- -2.31.1 - diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb index 80faa52aed..34e001a5f7 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb @@ -1,5 +1,5 @@ SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f1a8bfcbc85304df454b65d378b299c7" DEPENDS = " \ @@ -13,19 +13,20 @@ DEPENDS = " \ json-glib \ " -GNOMEBASEBUILDCLASS = "meson" +DEPENDS:append:toolchain-clang = " openmp" +DEPENDS:remove:toolchain-clang:riscv32 = "openmp" +DEPENDS:remove:toolchain-clang:powerpc = "openmp" -inherit features_check gnomebase vala gobject-introspection +VALA_MESON_OPTION = "" -REQUIRED_DISTRO_FEATURES = "x11" +inherit features_check gnomebase gobject-introspection vala + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = " \ - https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ - file://0001-Fix-build-with-OpenEXR-3.patch \ -" -SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd" +SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "418c26d94be8805d7d98f6de0c6825ca26bd74fcacb6c188da47533d9ee28247" PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2" PACKAGECONFIG:class-native = "libpng librsvg" @@ -41,8 +42,8 @@ PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw" PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" PACKAGECONFIG[pango] = "-Dpango=enabled -Dpangocairo=enabled,-Dpango=disabled -Dpangocairo=disabled,pango" PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" -PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" -PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,libsdl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,libsdl2" PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch new file mode 100644 index 0000000000..618b4cc7a7 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch @@ -0,0 +1,30 @@ +From 5711ccfab40e304ced7f5be39a4083e3fcecff91 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 22:22:41 -0700 +Subject: [PATCH] configure: Keep first line of compiler version string + +Full output of cc -v may contain additional information which could +contain build path information, which is unnessasary + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/926] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c25415d..68707a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -599,7 +599,7 @@ fi + for CC_VERSION_OPT in $CC_VERSION_OPTS; do + # We run $CC, and escape and format its output, in a single step, + # since some shells expand escape sequences in "echo" arguments. +- CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" ++ CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | head -1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" + if test $? -eq 0; then + break + fi +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch new file mode 100644 index 0000000000..13b3dda144 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch @@ -0,0 +1,24 @@ +From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 18:40:41 +0200 +Subject: [PATCH] file-tiff-load: fix mismatching variable type + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/a2458f1528e5733574bb26ff5452b1329116e6db] +Signed-off-by: Khem Raj <raj.khem@gmai.com> +--- + plug-ins/file-tiff/file-tiff-load.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/plug-ins/file-tiff/file-tiff-load.c ++++ b/plug-ins/file-tiff/file-tiff-load.c +@@ -1301,8 +1301,8 @@ load_image (GFile *file, + + /* any resolution info in the file? */ + { +- gfloat xres = 72.0; +- gfloat yres = 72.0; ++ gdouble xres = 72.0; ++ gdouble yres = 72.0; + gushort read_unit; + GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */ + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch new file mode 100644 index 0000000000..cec0055284 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch @@ -0,0 +1,34 @@ +From c720df90dfe3a3e92e34bfb36a04cc792064a501 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 22:39:02 -0700 +Subject: [PATCH] libtool: Do not add build time library paths to + LD_LIBRARY_PATH + +This does not serve much purpose on cross builds as it will add build +time paths which are only useful when trying to run these tools from +build area but when they are cross built this is not possible to run +them like this. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 134902c..068d74a 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5748,7 +5748,7 @@ func_exec_program () + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var +- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ $shlibpath_var=\"$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch new file mode 100644 index 0000000000..4f04ac8250 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch @@ -0,0 +1,22 @@ +From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 22:25:40 +0200 +Subject: [PATCH] metadata: shut up a weird warning + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/51311f913d9f417d121f59b83d560c7b4b853d1c] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plug-ins/metadata/metadata-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/plug-ins/metadata/metadata-editor.c ++++ b/plug-ins/metadata/metadata-editor.c +@@ -2140,7 +2140,7 @@ metadata_dialog_editor_set_metadata (GEx + } + else + { +- if (! g_strv_contains (values, equiv_values[evi])) ++ if (! g_strv_contains ((const gchar * const *) values, equiv_values[evi])) + { + gchar *tmpvalue; + diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb index 4b0f43b14a..833341f850 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb @@ -1,7 +1,7 @@ SUMMARY = "The GIMP is the GNU Image Manipulation Program" HOMEPAGE = "http://www.gimp.org" SECTION = "x11/graphics" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" DEPENDS = " \ @@ -37,22 +37,27 @@ DEPENDS = " \ " DEPENDS:append:libc-musl = " libexecinfo" +GNOMEBASEBUILDCLASS = "autotools" inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[sha256sum] = "bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ + file://0001-configure-Keep-first-line-of-compiler-version-string.patch \ + file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch \ + file://0001-file-tiff-load-fix-mismatching-variable-type.patch \ + file://0001-metadata-shut-up-a-weird-warning.patch \ + " +SRC_URI[sha256sum] = "50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e" EXTRA_OECONF = "--disable-python \ --without-webkit \ --disable-check-update \ --without-wmf" -EXTRA_OECONF:append:toolchain-clang:riscv32 = " --disable-vector-icons" -EXTRA_OECONF:append:toolchain-clang:mips = " --disable-vector-icons" +EXTRA_OECONF += "${@oe.utils.conditional('SITEINFO_BITS', '32', ' --disable-vector-icons', '', d)}" do_configure:append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g |