aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2021-12-31 18:29:24 +0100
committerKhem Raj <raj.khem@gmail.com>2022-01-05 08:17:18 -0800
commit7c385da6ab2a5399cfeea9bf1b3ecfcded4fd3d2 (patch)
tree6f80930789c2b0cb7c4b7dcfef6ec030cb94d822
parentbcd3f4d65b71c4c340da9f6993f7b81cefa62f98 (diff)
downloadmeta-openembedded-contrib-7c385da6ab2a5399cfeea9bf1b3ecfcded4fd3d2.tar.gz
gegl: upgrade 0.4.30 -> 0.4.34
OpenEXR-3 patch was applied upstream Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gimp/gegl/gegl/0001-Fix-build-with-OpenEXR-3.patch28
-rw-r--r--meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb (renamed from meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb)7
2 files changed, 2 insertions, 33 deletions
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.34.bb
index 80faa52aed..2f8928d164 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"