summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--0001-Fix-8819-revert-soname-change.patch65
-rw-r--r--ImageMagick7.spec15
-rw-r--r--heif.patch117
3 files changed, 128 insertions, 69 deletions
diff --git a/0001-Fix-8819-revert-soname-change.patch b/0001-Fix-8819-revert-soname-change.patch
deleted file mode 100644
index 7c43831..0000000
--- a/0001-Fix-8819-revert-soname-change.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7d783a9914bd845a49a6639b44d73a5f51c7f054 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 24 Jun 2026 07:30:59 +0200
-Subject: [PATCH] Fix #8819 revert soname change
-
----
- MagickCore/libMagickCore.map | 2 +-
- MagickWand/libMagickWand.map | 2 +-
- configure | 4 ++--
- m4/version.m4 | 4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map
-index b638dd10d..7437b0499 100644
---- a/MagickCore/libMagickCore.map
-+++ b/MagickCore/libMagickCore.map
-@@ -1,4 +1,4 @@
-- VERS_11.0 {
-+ VERS_10.0 {
- global:
- *;
- };
-diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map
-index b638dd10d..7437b0499 100644
---- a/MagickWand/libMagickWand.map
-+++ b/MagickWand/libMagickWand.map
-@@ -1,4 +1,4 @@
-- VERS_11.0 {
-+ VERS_10.0 {
- global:
- *;
- };
-diff --git a/configure b/configure
-index a8fe1ba10..cac91541f 100755
---- a/configure
-+++ b/configure
-@@ -5393,8 +5393,8 @@ MAGICK_GIT_REVISION=38ba210c5:20260621
-
-
- # Substitute library versioning
--MAGICK_LIBRARY_CURRENT=11
--MAGICK_LIBRARY_REVISION=2
-+MAGICK_LIBRARY_CURRENT=10
-+MAGICK_LIBRARY_REVISION=3
- MAGICK_LIBRARY_AGE=0
- MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
-
-diff --git a/m4/version.m4 b/m4/version.m4
-index bfc0db994..833ddc205 100644
---- a/m4/version.m4
-+++ b/m4/version.m4
-@@ -48,8 +48,8 @@ m4_define([magick_tarname], [ImageMagick])
- # files if you raise these versions.
- #
- # Bump the minor release # whenever there is an SOVersion bump.
--m4_define([magick_library_current], [11])
--m4_define([magick_library_revision], [2])
-+m4_define([magick_library_current], [10])
-+m4_define([magick_library_revision], [3])
- m4_define([magick_library_age], [0])
-
- m4_define([magickpp_library_current], [5])
---
-2.54.0
-
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 12c46c4..ee3cc1d 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 7.1.2
-%global Patchlevel 26
+%global Patchlevel 27
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
%bcond_without tests
@@ -76,8 +76,8 @@ Url: https://imagemagick.org/
%forgemeta
Source0: %{forgesource}
-# to revert
-Patch0: 0001-Fix-8819-revert-soname-change.patch
+# revert changes requiring libheif 1.11.0 for EL-8
+Patch0: heif.patch
BuildRequires: gnupg2
BuildRequires: autoconf automake make
@@ -373,7 +373,10 @@ however.
# %{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}}
%forgesetup
-%patch -P0 -p1 -b .soname
+%if 0%{?rhel} == 8
+%patch -P0 -p1 -R
+sed -e 's/1.11.0/1.4.0/' -i configure
+%endif
# for %%doc
mkdir Magick++/examples
@@ -631,6 +634,10 @@ fi
%changelog
+* Mon Jul 6 2026 Remi Collet <remi@remirepo.net> - 7.1.2-27-1
+- update to version 7.1.2 patch level 27
+- drop patch merged upstream
+
* Wed Jun 24 2026 Remi Collet <remi@remirepo.net> - 7.1.2-26-1
- update to version 7.1.2 patch level 26
- sources from github
diff --git a/heif.patch b/heif.patch
new file mode 100644
index 0000000..0812295
--- /dev/null
+++ b/heif.patch
@@ -0,0 +1,117 @@
+From c893eb2386365afce7b43179c622b62fe88302d4 Mon Sep 17 00:00:00 2001
+From: Dirk Lemstra <dirk@lemstra.org>
+Date: Sat, 4 Jul 2026 10:06:57 +0200
+Subject: [PATCH] Require at least version 1.11.0 of the libheif library.
+
+---
+ coders/heic.c | 17 ++---------------
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/coders/heic.c b/coders/heic.c
+index 449f0e1ff5d..d7cae5b29fc 100644
+--- a/coders/heic.c
++++ b/coders/heic.c
+@@ -87,7 +87,8 @@
+ #include <libheif/heif_sequences.h>
+ #endif
+ #endif
+-
++
++
+ #if defined(MAGICKCORE_HEIC_DELEGATE)
+ /*
+ Forward declarations.
+@@ -1034,10 +1035,8 @@ static Image *ReadHEICImage(const ImageInfo *image_info,ExceptionInfo *exception
+ #endif
+ ThrowReaderException(CoderError,"ImageTypeNotSupported");
+ (void) CloseBlob(image);
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,11,0)
+ if (heif_has_compatible_brand(magic,sizeof(magic), "avif") == 1)
+ (void) CopyMagickString(image->magick,"AVIF",MagickPathExtent);
+-#endif
+ /*
+ Decode HEIF image.
+ */
+@@ -1250,7 +1249,6 @@ ModuleExport size_t RegisterHEICImage(void)
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags^=CoderBlobSupportFlag;
+ (void) RegisterMagickInfo(entry);
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,7,0)
+ entry=AcquireMagickInfo("HEIC","AVCI","AVC Image File Format");
+ #if defined(MAGICKCORE_HEIC_DELEGATE)
+ if (heif_have_decoder_for_format(heif_compression_AVC))
+@@ -1266,8 +1264,6 @@ ModuleExport size_t RegisterHEICImage(void)
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags^=CoderBlobSupportFlag;
+ (void) RegisterMagickInfo(entry);
+-#endif
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,7,0)
+ entry=AcquireMagickInfo("HEIC","AVIF","AV1 Image File Format");
+ #if defined(MAGICKCORE_HEIC_DELEGATE)
+ if (heif_have_decoder_for_format(heif_compression_AV1))
+@@ -1283,7 +1279,6 @@ ModuleExport size_t RegisterHEICImage(void)
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags^=CoderBlobSupportFlag;
+ (void) RegisterMagickInfo(entry);
+-#endif
+ return(MagickImageCoderSignature);
+ }
+
+@@ -1308,9 +1303,7 @@ ModuleExport size_t RegisterHEICImage(void)
+ */
+ ModuleExport void UnregisterHEICImage(void)
+ {
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,7,0)
+ (void) UnregisterMagickInfo("AVIF");
+-#endif
+ (void) UnregisterMagickInfo("HEIC");
+ (void) UnregisterMagickInfo("HEIF");
+ #if defined(MAGICKCORE_HEIC_DELEGATE)
+@@ -2357,9 +2350,7 @@ static MagickBooleanType WriteHEICImage(const ImageInfo *image_info,
+ Image *image,ExceptionInfo *exception)
+ {
+ MagickBooleanType
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,7,0)
+ encode_avif,
+-#endif
+ status;
+
+ MagickOffsetType
+@@ -2391,10 +2382,8 @@ static MagickBooleanType WriteHEICImage(const ImageInfo *image_info,
+ return(status);
+ scene=0;
+ heif_context=heif_context_alloc();
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,7,0)
+ encode_avif=(LocaleCompare(image_info->magick,"AVIF") == 0) ? MagickTrue :
+ MagickFalse;
+-#endif
+ #if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,20,0)
+ if ((encode_avif != MagickFalse) && (image_info->adjoin != MagickFalse) &&
+ (GetNextImageInList(image) != (Image *) NULL))
+@@ -2457,12 +2446,10 @@ static MagickBooleanType WriteHEICImage(const ImageInfo *image_info,
+ /*
+ Get encoder for the specified format.
+ */
+-#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,7,0)
+ if (encode_avif != MagickFalse)
+ error=heif_context_get_encoder_for_format(heif_context,
+ heif_compression_AV1,&heif_encoder);
+ else
+-#endif
+ error=heif_context_get_encoder_for_format(heif_context,
+ heif_compression_HEVC,&heif_encoder);
+ if (IsHEIFSuccess(image,&error,exception) == MagickFalse)
+diff --git a/configure.ac b/configure.ac
+index 548268ea02e..3776989ef04 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2386,7 +2386,7 @@ HEIF_LIBS=""
+ HEIF_PKG=""
+ if test "x$with_heic" = "xyes"; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+- PKG_CHECK_MODULES([HEIF],[libheif >= 1.4.0],[have_heic=yes],[have_heic=no])
++ PKG_CHECK_MODULES([HEIF],[libheif >= 1.11.0],[have_heic=yes],[have_heic=no])
+ AC_MSG_RESULT([])
+ fi
+
generated by cgit (git 2.34.1) at 2026-07-07 20:08:55 +0000