diff options
| -rw-r--r-- | ImageMagick6.spec | 10 | ||||
| -rw-r--r-- | b506f7716c8e43e13707a394cc088e4d9d4c4098.patch | 29 |
2 files changed, 5 insertions, 34 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 76cf8dd..d656e4e 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.11 -%global Patchlevel 34 +%global Patchlevel 35 %global incsuffixe -6 %global libsuffixe -6.Q16 %bcond_without tests @@ -71,15 +71,13 @@ Name: %{libname}6 %global move 1 %endif Version: %{VER}.%{Patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick Url: http://www.imagemagick.org/ #Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz -Patch0: https://github.com/ImageMagick/ImageMagick6/commit/b506f7716c8e43e13707a394cc088e4d9d4c4098.patch - BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -381,7 +379,6 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} -%patch0 -p1 -b .up # for %%doc mkdir Magick++/examples @@ -640,6 +637,9 @@ fi %changelog +* Mon Nov 2 2020 Remi Collet <remi@remirepo.net> - 6.9.11.35-1 +- update to version 6.9.11 patch level 35 + * Mon Oct 19 2020 Remi Collet <remi@remirepo.net> - 6.9.11.34-2 - add upstream patch for old libheif (EL-7) diff --git a/b506f7716c8e43e13707a394cc088e4d9d4c4098.patch b/b506f7716c8e43e13707a394cc088e4d9d4c4098.patch deleted file mode 100644 index b85bcdd..0000000 --- a/b506f7716c8e43e13707a394cc088e4d9d4c4098.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b506f7716c8e43e13707a394cc088e4d9d4c4098 Mon Sep 17 00:00:00 2001 -From: Dirk Lemstra <dirk@lemstra.org> -Date: Fri, 16 Oct 2020 11:05:28 +0200 -Subject: [PATCH] Added version check for - heif_image_handle_get_luma_bits_per_pixel. - ---- - coders/heic.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/coders/heic.c b/coders/heic.c -index d8ca048e8..3ba368b15 100644 ---- a/coders/heic.c -+++ b/coders/heic.c -@@ -303,10 +303,13 @@ static Image *ReadHEICImage(const ImageInfo *image_info, - /* - Set image size. - */ -- image->depth=8; - image->columns=(size_t) heif_image_handle_get_width(image_handle); - image->rows=(size_t) heif_image_handle_get_height(image_handle); -+#if LIBHEIF_NUMERIC_VERSION > 0x01040000 - image->depth=(size_t) heif_image_handle_get_luma_bits_per_pixel(image_handle); -+#else -+ image->depth=8; -+#endif - preserve_orientation=IsStringTrue(GetImageOption(image_info, - "heic:preserve-orientation")); - if (preserve_orientation == MagickFalse) |