From 57baca4bc1b681482bc014508d28f7def5949c33 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 1 May 2021 08:29:44 -0700 Subject: [PATCH] gegl: Update to 0.4.30 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix build on build hosts with OpenEXR 3.0 Drop SDL2 patch, its upstream in this version Signed-off-by: Khem Raj Cc: Andreas Müller --- .../gegl/0001-Fix-build-with-OpenEXR-3.patch | 28 ++++++++++++++++ ...on.build-Give-note-if-sdl2-was-found.patch | 32 ------------------- .../gegl/{gegl_0.4.28.bb => gegl_0.4.30.bb} | 4 +-- 3 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch delete mode 100644 meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch rename meta-gnome/recipes-gimp/gegl/{gegl_0.4.28.bb => gegl_0.4.30.bb} (93%) 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 new file mode 100644 index 0000000000..b2f13afd5d --- /dev/null +++ b/meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch @@ -0,0 +1,28 @@ +From 073d622fbf8564271cd9be87c2f619ea00498578 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + #include + #include ++#include + #include "ImathRandom.h" + + +-- +2.31.1 + diff --git a/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch deleted file mode 100644 index 6a49f1d7ce..0000000000 --- a/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 8 Feb 2020 14:29:52 +0100 -Subject: [PATCH] meson.build: Give note if sdl2 was found -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Configure output confused me a bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 9d5b484..296b5f3 100644 ---- a/meson.build -+++ b/meson.build -@@ -374,6 +374,7 @@ message('\n'.join(['', - ' OpenEXR: @0@'.format(openexr.found()), - ' rsvg: @0@'.format(librsvg.found()), - ' SDL: @0@'.format(sdl1.found()), -+' SDL2: @0@'.format(sdl2.found()), - ' libraw: @0@'.format(libraw.found()), - ' Jasper: @0@'.format(jasper.found()), - ' av libs: @0@'.format(avlibs_found), --- -2.21.0 - diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb similarity index 93% rename from meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb rename to meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb index 810036162c..d08a3a3c9a 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb @@ -24,9 +24,9 @@ SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ - file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ + file://0001-Fix-build-with-OpenEXR-3.patch \ " -SRC_URI[sha256sum] = "1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900" +SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg"