OpenEXR-3 patch was applied upstream

Signed-off-by: Andreas Müller <[email protected]>
---
 .../gegl/0001-Fix-build-with-OpenEXR-3.patch  | 28 -------------------
 .../gegl/{gegl_0.4.30.bb => gegl_0.4.34.bb}   |  7 ++---
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 
meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch
 rename meta-gnome/recipes-gimp/gegl/{gegl_0.4.30.bb => gegl_0.4.34.bb} (91%)

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 b2f13afd5..000000000
--- 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 <[email protected]>
-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 <[email protected]>
----
- 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.34.bb
similarity index 91%
rename from meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
rename to meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb
index 80faa52ae..2f8928d16 100644
--- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb
+++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb
@@ -21,11 +21,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 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] = 
"ef63f0bca5b431c6119addd834ca7fbb507c900c4861c57b3667b6f4ccfcaaaa"
 
 PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2"
 PACKAGECONFIG:class-native = "libpng librsvg"
-- 
2.31.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#94589): 
https://lists.openembedded.org/g/openembedded-devel/message/94589
Mute This Topic: https://lists.openembedded.org/mt/88058491/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to