Update ImageMagick to 6.9.12.50 (#2087046)

Don't use the eln macro, you should use rhel recommended by Stephen Gallagher
add support libzst
This commit is contained in:
Sérgio M. Basto 2022-05-30 01:57:43 +01:00
parent 23e24e14be
commit 8421f80f97
3 changed files with 12 additions and 34 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/ImageMagick-6.9.12-43.tar.xz
/ImageMagick-6.9.12-44.tar.xz
/ImageMagick-6.9.12-48.tar.xz
/ImageMagick-6.9.12-50.tar.xz

View File

@ -1,28 +0,0 @@
diff -Nur ImageMagick-6.9.9-3.orig/wand/MagickWand-config.in ImageMagick-6.9.9-3/wand/MagickWand-config.in
--- ImageMagick-6.9.9-3.orig/wand/MagickWand-config.in 2017-07-24 06:37:55.000000000 -0700
+++ ImageMagick-6.9.9-3/wand/MagickWand-config.in 2017-07-27 15:17:55.343675457 -0700
@@ -38,19 +38,19 @@
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
- @PKG_CONFIG@ --cflags MagickWand
+ pkg-config --cflags MagickWand
;;
--cxxflags)
- @PKG_CONFIG@ --cflags MagickWand
+ pkg-config --cflags MagickWand
;;
--cppflags)
- @PKG_CONFIG@ --cflags MagickWand
+ pkg-config --cflags MagickWand
;;
--ldflags)
- @PKG_CONFIG@ --libs MagickWand
+ pkg-config --libs MagickWand
;;
--libs)
- @PKG_CONFIG@ --libs MagickWand
+ pkg-config --libs MagickWand
;;
*)
echo "${usage}" 1>&2

View File

@ -9,8 +9,8 @@ Epoch: 1
%else
Epoch: 0
%endif
Version: 6.9.12.48
Release: 3%{?dist}
Version: 6.9.12.50
Release: 1%{?dist}
Summary: An X application for displaying and manipulating images
%global VER %(foo=%{version}; echo ${foo:0:6})
@ -22,7 +22,7 @@ Source0: https://www.imagemagick.org/download/releases/%{name}-%{VER}-%{P
BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng)
BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1
BuildRequires: perl-generators
%if 0%{?fedora} > 27
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
BuildRequires: libgs-devel, ghostscript-x11
%else
BuildRequires: ghostscript-devel
@ -31,7 +31,7 @@ BuildRequires: pkgconfig(ddjvuapi)
BuildRequires: pkgconfig(libwmf), pkgconfig(jasper), libtool-ltdl-devel
BuildRequires: pkgconfig(x11), pkgconfig(xext), pkgconfig(xt)
BuildRequires: pkgconfig(lcms2), pkgconfig(libxml-2.0), pkgconfig(librsvg-2.0)
%if 0%{?fedora} > 34 || 0%{?epel} > 8
%if 0%{?fedora} > 34 || 0%{?rhel} > 8
BuildRequires: pkgconfig(OpenEXR)
%else
BuildRequires: pkgconfig(IlmBase), pkgconfig(OpenEXR) < 2.5.6
@ -42,6 +42,7 @@ BuildRequires: pkgconfig(libopenjp2) >= 2.1.0
BuildRequires: pkgconfig(libcgraph) >= 2.9.0
BuildRequires: pkgconfig(raqm)
BuildRequires: pkgconfig(libraw) >= 0.14.8
BuildRequires: pkgconfig(libzstd)
BuildRequires: autoconf automake gcc gcc-c++
BuildRequires: make
@ -187,9 +188,7 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
--without-gcc-arch \
--with-jbig \
--with-openjp2 \
%ifnarch s390x
--with-raw \
%endif
--with-gvc \
--with-raqm
@ -330,6 +329,12 @@ rm PerlMagick/demo/Generic.ttf
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
* Sun May 29 2022 Sérgio Basto <sergio@serjux.com> - 1:6.9.12.50-1
- Update ImageMagick to 6.9.12.50 (#2087046)
- Don't use the %{?eln} macro, you should use %{?rhel} recommended by Stephen
Gallagher
- add support libzst
* Thu May 12 2022 Steve Traylen <steve.traylen@crn.ch> - 1:6.9.12.48-3
- libraw-epel now available for aarch64 and s390
- allow smooth upgrade for 3rd party repository providing latest version/soname as ImageMagick6