summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ImageMagick7.spec10
-rw-r--r--b143619b68df3962b4bb542561f7448aa6d40915.patch26
2 files changed, 5 insertions, 31 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index dc19de9..9160aa5 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 7.0.10
-%global Patchlevel 34
+%global Patchlevel 35
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
%ifarch x86_64
@@ -69,7 +69,7 @@ Name: %{libname}
Name: %{libname}7
%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/
@@ -77,8 +77,6 @@ Url: http://www.imagemagick.org/
#Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
-Patch0: https://github.com/ImageMagick/ImageMagick/commit/b143619b68df3962b4bb542561f7448aa6d40915.patch
-
BuildRequires: gcc
BuildRequires: gcc-c++
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -377,7 +375,6 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch0 -p1 -b .up
# for %%doc
mkdir Magick++/examples
@@ -628,6 +625,9 @@ fi
%changelog
+* Mon Nov 2 2020 Remi Collet <remi@remirepo.net> - 7.0.10.35-1
+- update to version 7.0.10 patch level 35
+
* Mon Oct 19 2020 Remi Collet <remi@remirepo.net> - 7.0.10.34-2
- add upstream patch for old libheif (EL-7)
diff --git a/b143619b68df3962b4bb542561f7448aa6d40915.patch b/b143619b68df3962b4bb542561f7448aa6d40915.patch
deleted file mode 100644
index 40e63db..0000000
--- a/b143619b68df3962b4bb542561f7448aa6d40915.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b143619b68df3962b4bb542561f7448aa6d40915 Mon Sep 17 00:00:00 2001
-From: Dirk Lemstra <dirk@lemstra.org>
-Date: Fri, 16 Oct 2020 11:05:01 +0200
-Subject: [PATCH] Added version check for
- heif_image_handle_get_luma_bits_per_pixel (#2729).
-
----
- coders/heic.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/coders/heic.c b/coders/heic.c
-index ce7742cac0..cc38a4ffc2 100644
---- a/coders/heic.c
-+++ b/coders/heic.c
-@@ -305,7 +305,11 @@ static MagickBooleanType ReadHEICImageByID(const ImageInfo *image_info,
- */
- 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
- if (heif_image_handle_has_alpha_channel(image_handle))
- image->alpha_trait=BlendPixelTrait;
- preserve_orientation=IsStringTrue(GetImageOption(image_info,