Import from AlmaLinux stable repository

This commit is contained in:
eabdullin 2024-05-15 07:22:05 +00:00
parent ae461a7cc9
commit ae96dbdf7d
2 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,30 @@
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
---
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 13eb661c2f8b..7de2e232df46 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;
--
2.41.0

View File

@ -2,7 +2,7 @@
Name: gegl04
Version: 0.4.34
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Graph based image processing framework
# The binary is under the GPL, while the libs are under LGPL.
@ -15,6 +15,7 @@ Patch0: gegl04-openexr.patch
Patch1: gegl04-gtk.patch
# https://gitlab.gnome.org/GNOME/gegl/-/commit/54f760de6a0e14487ccfb033e270aa6a80ee66e2
Patch2: gegl04-meson.patch
Patch3: gegl04-raw-load-LibRaw-0.21.0.patch
BuildRequires: chrpath
BuildRequires: enscript
@ -38,7 +39,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.44.0
BuildRequires: pkgconfig(jasper) >= 1.900.1
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(lcms2) >= 2.8
BuildRequires: pkgconfig(libraw) >= 0.15.4
BuildRequires: pkgconfig(libraw) >= 0.21.1
BuildRequires: pkgconfig(libpng) >= 1.6.0
BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.6
BuildRequires: pkgconfig(libv4l2) >= 1.0.1
@ -175,6 +176,10 @@ chrpath --delete %{buildroot}%{_libdir}/gegl-%{apiver}/*.so
%changelog
* Tue Oct 03 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.4.34-3
- Rebuild against new LibRaw soname
Resolves: RHEL-770
* Fri Nov 04 2022 Tomas Popela <tpopela@redhat.com> - 0.4.34-2
- Fix FTBFS for a possible Meson rebase
- Resolves: rhbz#2140107