summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-05-13 07:25:18 +0200
committerRemi Collet <remi@php.net>2026-05-13 07:25:18 +0200
commit8936bb4648ed5774f3b8416978b638c897140c62 (patch)
tree85a27622cb47e51a14b6897adba96f750576cc08
parent2d1b7584d5c233fcd8257e3758a304de31d06ef1 (diff)
update to version 7.1.2 patch level 22HEADmaster
report https://github.com/ImageMagick/ImageMagick/issues/8728 build error with libheif 1.20 fix build with libheif 1.20 using patch from https://github.com/ImageMagick/ImageMagick/pull/8729
-rw-r--r--0001-ignore_sequence_editlist-only-in-libheif-1.21.patch29
-rw-r--r--ImageMagick7.spec13
2 files changed, 41 insertions, 1 deletions
diff --git a/0001-ignore_sequence_editlist-only-in-libheif-1.21.patch b/0001-ignore_sequence_editlist-only-in-libheif-1.21.patch
new file mode 100644
index 0000000..7d33d75
--- /dev/null
+++ b/0001-ignore_sequence_editlist-only-in-libheif-1.21.patch
@@ -0,0 +1,29 @@
+From 276841f65a6fdbc725e18040e383491684a00413 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 13 May 2026 07:15:23 +0200
+Subject: [PATCH] ignore_sequence_editlist only in libheif 1.21
+
+---
+ coders/heic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/coders/heic.c b/coders/heic.c
+index e8e3211f2..1d69e7921 100644
+--- a/coders/heic.c
++++ b/coders/heic.c
+@@ -696,11 +696,11 @@ static MagickBooleanType ReadHEICSequenceFrames(const ImageInfo *image_info,
+ if (timescale == 0)
+ timescale=1;
+ decode_options=heif_decoding_options_alloc();
++#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,21,0)
+ decode_options->ignore_sequence_editlist=1;
+ /*
+ Detect alpha from the track and set up chroma format.
+ */
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,21,0)
+ has_alpha=heif_track_has_alpha_channel(track);
+ image->alpha_trait=UndefinedPixelTrait;
+ if (has_alpha != 0)
+--
+2.54.0
+
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index df7a8c9..8866abb 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 7.1.2
-%global Patchlevel 21
+%global Patchlevel 22
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
%bcond_without tests
@@ -69,6 +69,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-ignore_sequence_editlist-only-in-libheif-1.21.patch
+
BuildRequires: gnupg2
BuildRequires: autoconf automake make
BuildRequires: gcc
@@ -364,6 +366,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
@@ -620,6 +624,13 @@ fi
%changelog
+* Wed May 13 2026 Remi Collet <remi@remirepo.net> - 7.1.2-22-1
+- update to version 7.1.2 patch level 22
+- report https://github.com/ImageMagick/ImageMagick/issues/8728
+ build error with libheif 1.20
+- fix build with libheif 1.20 using patch from
+ https://github.com/ImageMagick/ImageMagick/pull/8729
+
* Wed Apr 22 2026 Remi Collet <remi@remirepo.net> - 7.1.2-21-1
- update to version 7.1.2 patch level 21