From 63767946f888a72ee65f14933d9e6614caefbc695c52c62ca4c201099c68f564 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 11 Jan 2023 10:33:03 +0000 Subject: [PATCH] Accepting request 1057738 from home:dimstar:Factory - Add 133.patch: Fix build against libraw 0.21.0. OBS-URL: https://build.opensuse.org/request/show/1057738 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=134 --- 133.patch | 30 ++++++++++++++++++++++++++++++ gegl.changes | 5 +++++ gegl.spec | 4 +++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 133.patch diff --git a/133.patch b/133.patch new file mode 100644 index 0000000..803af2b --- /dev/null +++ b/133.patch @@ -0,0 +1,30 @@ +From 8e40c930de5317e4ba5e9cd135b6c510570e7edb Mon Sep 17 00:00:00 2001 +From: Chris Mayo +Date: Wed, 21 Dec 2022 19:32:02 +0000 +Subject: [PATCH] raw-load: make compatible with LibRaw 0.21.0 + +imgdata.params.shot_select moved to imgdata.rawparams.shot_select +https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L182 +--- + operations/external/raw-load.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/operations/external/raw-load.c b/operations/external/raw-load.c +index 13eb661c2..7de2e232d 100644 +--- a/operations/external/raw-load.c ++++ b/operations/external/raw-load.c +@@ -114,7 +114,11 @@ prepare (GeglOperation *operation) + g_warning ("raw-load: Error Initializing raw library"); + else + { ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) ++ p->LibRaw->rawparams.shot_select = o->image_num; ++#else + p->LibRaw->params.shot_select = o->image_num; ++#endif + + p->LibRaw->params.aber[0] = 1.0; + p->LibRaw->params.aber[2] = 1.0; +-- +GitLab + diff --git a/gegl.changes b/gegl.changes index 56827a6..a31cd7f 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 11 09:05:00 UTC 2023 - Dominique Leuenberger + +- Add 133.patch: Fix build against libraw 0.21.0. + ------------------------------------------------------------------- Wed Nov 23 11:13:07 UTC 2022 - Marcus Rueckert diff --git a/gegl.spec b/gegl.spec index 3c7f275..a981ecb 100644 --- a/gegl.spec +++ b/gegl.spec @@ -1,7 +1,7 @@ # # spec file for package gegl # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,8 @@ License: GPL-3.0-or-later AND LGPL-3.0-or-later Group: Productivity/Graphics/Other URL: http://gegl.org/ Source0: https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 133.patch dimstar@opensuse.org -- Fix build against libraw 0.21.0 +Patch0: https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133.patch Source99: baselibs.conf BuildRequires: ImageMagick BuildRequires: asciidoc