diff options
| author | Remi Collet <remi@remirepo.net> | 2026-05-18 07:23:44 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-05-18 07:23:44 +0200 |
| commit | aa5a5f692d2408914180aea7551bad300f07c7aa (patch) | |
| tree | b14ed51675a2f54e9732661f802788516b348036 | |
| parent | 8936bb4648ed5774f3b8416978b638c897140c62 (diff) | |
drop patch merged upstream
| -rw-r--r-- | 0001-ignore_sequence_editlist-only-in-libheif-1.21.patch | 29 | ||||
| -rw-r--r-- | ImageMagick7.spec | 12 |
2 files changed, 6 insertions, 35 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 deleted file mode 100644 index 7d33d75..0000000 --- a/0001-ignore_sequence_editlist-only-in-libheif-1.21.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 8866abb..c39c607 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 7.1.2 -%global Patchlevel 22 +%global Patchlevel 23 %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %bcond_without tests @@ -69,7 +69,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-ignore_sequence_editlist-only-in-libheif-1.21.patch BuildRequires: gnupg2 BuildRequires: autoconf automake make @@ -150,8 +149,7 @@ Obsoletes: %{libname}7 <= %{epoch}:%{version}-%{release} %endif # Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/ImageMagick-%{VER}/modules-Q16HDRI/.*$} -%{?filter_setup} +%global __provides_exclude_from ^%{_libdir}/ImageMagick-%{VER}/modules-Q16HDRI/.*$ %description @@ -366,8 +364,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 @@ -624,6 +620,10 @@ fi %changelog +* Mon May 18 2026 Remi Collet <remi@remirepo.net> - 7.1.2-23-1 +- update to version 7.1.2 patch level 23 +- drop patch merged upstream + * 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 |