!18 Update to 0.4.46
From: @starlet-dx Reviewed-by: @wang--ge Signed-off-by: @wang--ge
This commit is contained in:
commit
18f9ecd359
@ -1,28 +0,0 @@
|
||||
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;
|
||||
@ -1,34 +0,0 @@
|
||||
From 16f9716bb9232fb9dc983bea7056c6cfaed25523 Mon Sep 17 00:00:00 2001
|
||||
From: starlet-dx <15929766099@163.com>
|
||||
Date: Fri, 13 Jan 2023 11:34:09 +0800
|
||||
Subject: [PATCH 1/1] Include opencl_dep as a dependency in gegl_lib target
|
||||
|
||||
---
|
||||
gegl/meson.build | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gegl/meson.build b/gegl/meson.build
|
||||
index 86c7a6f..5f45949 100644
|
||||
--- a/gegl/meson.build
|
||||
+++ b/gegl/meson.build
|
||||
@@ -92,8 +92,7 @@ install_headers(gegl_headers,
|
||||
gegl_ldflags = os_osx ? ['-framework', 'OpenCL'] : []
|
||||
|
||||
opencl_dep = declare_dependency(
|
||||
- sources : [opencl_headers],
|
||||
- link_with : [gegl_sources],
|
||||
+ sources : [opencl_headers],
|
||||
)
|
||||
|
||||
gegl_lib = library(api_name,
|
||||
@@ -105,6 +104,7 @@ gegl_lib = library(api_name,
|
||||
gio,
|
||||
math,
|
||||
gmodule,
|
||||
+ opencl_dep,
|
||||
],
|
||||
c_args: gegl_cflags,
|
||||
link_args: gegl_ldflags,
|
||||
--
|
||||
2.30.0
|
||||
|
||||
Binary file not shown.
10
gegl04.spec
10
gegl04.spec
@ -1,8 +1,8 @@
|
||||
%define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
|
||||
|
||||
Name: gegl04
|
||||
Version: 0.4.34
|
||||
Release: 3
|
||||
Version: 0.4.46
|
||||
Release: 1
|
||||
Summary: Generic Graphics Library
|
||||
License: GPL-3.0-or-later AND LGPL-3.0-or-later
|
||||
Group: Productivity/Graphics/Other
|
||||
@ -10,9 +10,6 @@ URL: http://gegl.org/
|
||||
Source0: https://download.gimp.org/pub/gegl/0.4/gegl-%{version}.tar.xz
|
||||
Source99: baselibs.conf
|
||||
|
||||
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: asciidoc
|
||||
BuildRequires: gcc-c++
|
||||
@ -151,6 +148,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%{_datadir}/vala/vapi/gegl-0.4.vapi
|
||||
|
||||
%changelog
|
||||
* Wed Jul 12 2023 yaoxin <yao_xin001@hoperun.com> - 0.4.46-1
|
||||
- Update to 0.4.46
|
||||
|
||||
* Sat May 6 2023 liyanan <thistleslyn@163.com> - 0.4.34-3
|
||||
- Fix make compatible with LibRaw 0.21.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user