summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-fix-error-libraw_data_t-has-no-member-named-rawparam.patch25
-rw-r--r--ImageMagick7.spec15
2 files changed, 10 insertions, 30 deletions
diff --git a/0001-fix-error-libraw_data_t-has-no-member-named-rawparam.patch b/0001-fix-error-libraw_data_t-has-no-member-named-rawparam.patch
deleted file mode 100644
index 7f1148c..0000000
--- a/0001-fix-error-libraw_data_t-has-no-member-named-rawparam.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4ae634345cb91e0a016b0cc8e502fcb69c02bf8a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 1 Jan 2024 09:00:14 +0100
-Subject: [PATCH] fix error: 'libraw_data_t' has no member named 'rawparams'
-
----
- coders/dng.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/coders/dng.c b/coders/dng.c
-index 2078936e6..3c6db83c7 100644
---- a/coders/dng.c
-+++ b/coders/dng.c
-@@ -333,7 +333,7 @@ static void SetLibRawParams(const ImageInfo *image_info,Image *image,
- const char
- *option;
-
--#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,20)
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,21)
- raw_info->rawparams.max_raw_memory_mb=8192;
- option=GetImageOption(image_info,"dng:max-raw-memory");
- if (option != (const char *) NULL)
---
-2.43.0
-
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index ab674cb..ea1acad 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 7.1.1
-%global Patchlevel 25
+%global Patchlevel 26
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
%bcond_without tests
@@ -68,8 +68,6 @@ Source0: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Pat
Source1: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz.asc
Source2: ImageMagick.keyring
-Patch0: 0001-fix-error-libraw_data_t-has-no-member-named-rawparam.patch
-
BuildRequires: gnupg2
BuildRequires: autoconf automake make
BuildRequires: gcc
@@ -292,6 +290,10 @@ BuildRequires: pkgconfig(libheif) >= 1.4.0
# ensure we use our on EL-7
Requires: libheif%{?_isa} >= 1.4.0
%endif
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 9
+# x265 HEVC encoder from RPMFusion
+Recommends: libheif-freeworld%{?_isa}
+%endif
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" == "%{libname}"
Obsoletes: %{libname}7-heic <= %{epoch}:%{version}-%{release}
@@ -394,8 +396,6 @@ however.
%{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}}
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch -P0 -p1
-
# for %%doc
mkdir Magick++/examples
cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@@ -653,6 +653,11 @@ fi
%changelog
+* Mon Jan 8 2024 Remi Collet <remi@remirepo.net> - 7.1.1.26-1
+- update to version 7.1.1 patch level 26
+- add weak dependency on libheif-freeworld from RPMFusion (Fedora and EL-9)
+- drop patch merged upstream
+
* Mon Jan 1 2024 Remi Collet <remi@remirepo.net> - 7.1.1.25-1
- update to version 7.1.1 patch level 25
- add build patch from https://github.com/ImageMagick/ImageMagick/pull/6989