!17 Fix make compatible with LibRaw 0.21.0

From: @lyn1001 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2023-05-08 02:55:16 +00:00 committed by Gitee
commit c8a7ae11fe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From e2bc7a1fe46c0dcee708584555d445c9e066b6a1 Mon Sep 17 00:00:00 2001
From: Chris Mayo <aklhfex@gmail.com>
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
sync from https://github.com/GNOME/gegl/commit/e2bc7a1fe46c0dcee708584555d445c9e066b6a1
---
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;

View File

@ -2,7 +2,7 @@
Name: gegl04 Name: gegl04
Version: 0.4.34 Version: 0.4.34
Release: 2 Release: 3
Summary: Generic Graphics Library Summary: Generic Graphics Library
License: GPL-3.0-or-later AND LGPL-3.0-or-later License: GPL-3.0-or-later AND LGPL-3.0-or-later
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
@ -11,6 +11,7 @@ Source0: https://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
Patch0: Include-opencl_dep-as-a-dependency-in-gegl_lib-targe.patch Patch0: Include-opencl_dep-as-a-dependency-in-gegl_lib-targe.patch
Patch1: Fix-make-compatible-with-LibRaw-0.21.0.patch
BuildRequires: ImageMagick BuildRequires: ImageMagick
BuildRequires: asciidoc BuildRequires: asciidoc
@ -150,6 +151,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_datadir}/vala/vapi/gegl-0.4.vapi %{_datadir}/vala/vapi/gegl-0.4.vapi
%changelog %changelog
* Sat May 6 2023 liyanan <thistleslyn@163.com> - 0.4.34-3
- Fix make compatible with LibRaw 0.21.0
* Fri Jan 13 2023 yaoxin <yaoxin30@h-partners.com> - 0.4.34-2 * Fri Jan 13 2023 yaoxin <yaoxin30@h-partners.com> - 0.4.34-2
- Fix build error - Fix build error