diff options
| author | Remi Collet <remi@remirepo.net> | 2024-01-01 09:16:45 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-01-01 09:16:45 +0100 |
| commit | 320e3b83d648e0f2dd18d0a03a450b254bacf6d5 (patch) | |
| tree | 930537b239060ef42f8021c85268eec7c11fc331 | |
| parent | 72fcffbd8adef357cc45f2d07d1086e2d5fb891e (diff) | |
update to version 7.1.1 patch level 25
add build patch from https://github.com/ImageMagick/ImageMagick/pull/6989
| -rw-r--r-- | 0001-fix-error-libraw_data_t-has-no-member-named-rawparam.patch | 25 | ||||
| -rw-r--r-- | ImageMagick7.spec | 10 |
2 files changed, 34 insertions, 1 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 new file mode 100644 index 0000000..7f1148c --- /dev/null +++ b/0001-fix-error-libraw_data_t-has-no-member-named-rawparam.patch @@ -0,0 +1,25 @@ +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 4aaae44..ab674cb 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 7.1.1 -%global Patchlevel 23 +%global Patchlevel 25 %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %bcond_without tests @@ -68,6 +68,8 @@ 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 @@ -392,6 +394,8 @@ 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 @@ -649,6 +653,10 @@ fi %changelog +* 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 + * Mon Dec 11 2023 Remi Collet <remi@remirepo.net> - 7.1.1.23-1 - update to version 7.1.1 patch level 23 |