X-Git-Url: http://git.pld-linux.org/?p=packages%2FImageMagick.git;a=blobdiff_plain;f=ImageMagick.spec;h=2dae9501bb2ba13248ff2c0bff07cdc4f91b4293;hp=5b86779179354125c76859d16d03b706a99c0929;hb=HEAD;hpb=46f935434d38cebaff5ada7844cfc2e8b84e501b

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 5b86779..f5cfa33 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -3,6 +3,7 @@
 #   https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801
 #
 # Conditional build:
+%bcond_without  tests
 # - features:
 %bcond_without	cxx		# Magick++ library
 %bcond_without	opencl		# OpenCL computing support
@@ -14,7 +15,10 @@
 %bcond_without	djvu		# DJVU module
 %bcond_without	exr		# OpenEXR module
 %bcond_without	fpx		# FlashPIX module (which uses fpx library)
+%bcond_without	flif		# FLIF (Free Lossless Image Format) module (which uses flif library)
 %bcond_without	graphviz	# dot module (which uses GraphViz libraries)
+%bcond_without	heif		# HEIC module (which uses libheif library)
+%bcond_without	libjxl		# JPEG-XL module
 %bcond_without	openjpeg	# JPEG2000 module (which uses openjpeg 2 library)
 %bcond_without	wmf		# WMF module (which uses libwmf library)
 # - module features:
@@ -22,9 +26,8 @@
 
 %define	libpng_ver 2:1.6.34
 
-%define		ver	7.0.8
-%define		pver	32
-%include	/usr/lib/rpm/macros.perl
+%define		ver	7.1.1
+%define		pver	31
 Summary:	Image display, conversion, and manipulation under X
 Summary(de.UTF-8):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
 Summary(es.UTF-8):	Exhibidor, convertidor y manipulador de imágenes bajo X
@@ -40,27 +43,27 @@ Release:	1
 Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
-Source0:	https://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5:	ef04a7ab79665f8b66991a1859c328bf
-Patch0:		config.patch
+Source0:	https://download.imagemagick.org/archive/releases/%{name}-%{ver}-%{pver}.tar.lz
+# Source0-md5:	70ca8d5bed3e99dd9b828571b78825d8
+Patch0:		%{name}-perl.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-libpath.patch
 Patch3:		%{name}-ldflags.patch
 Patch4:		%{name}-lt.patch
 Patch5:		%{name}-OpenCL.patch
-URL:		http://www.imagemagick.org/
+URL:		https://imagemagick.org/
 %{?with_opencl:BuildRequires:	OpenCL-devel}
-BuildRequires:	OpenEXR-devel >= 1.0.6
+%{?with_exr:BuildRequires:	OpenEXR-devel >= 1.0.6}
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.12
-%{?with_autotrace:BuildRequires:	autotrace-devel >= 0.31.1}
+%{?with_autotrace:BuildRequires:	autotrace-devel >= 0.31.2}
 BuildRequires:	bzip2-devel >= 1.0.1
 %{?with_djvu:BuildRequires:	djvulibre-devel >= 3.5.0}
 BuildRequires:	expat-devel >= 1.95.7
 BuildRequires:	fftw3-devel >= 3.0
-BuildRequires:	flif-devel
+%{?with_flif:BuildRequires:	flif-devel}
 BuildRequires:	fontconfig-devel >= 2.1.0
-BuildRequires:	freetype-devel >= 2.0.2-2
+BuildRequires:	freetype-devel >= 1:2.8.0
 %{?with_openmp:BuildRequires:	gcc-c++ >= 6:4.2}
 %{?with_gs:BuildRequires:	ghostscript-devel}
 %{?with_graphviz:BuildRequires:	graphviz-devel >= 2.9.0}
@@ -68,8 +71,9 @@ BuildRequires:	jbigkit-devel
 BuildRequires:	lcms2-devel >= 2.0
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
 %{?with_openmp:BuildRequires:	libgomp-devel}
-BuildRequires:	libheif-devel
+%{?with_heif:BuildRequires:	libheif-devel >= 1.4.0}
 BuildRequires:	libjpeg-devel >= 6b
+%{?with_libjxl:BuildRequires:	libjxl-devel >= 0.7.0}
 BuildRequires:	liblqr-devel >= 0.1.0
 BuildRequires:	libltdl-devel
 BuildRequires:	libpng-devel >= %{libpng_ver}
@@ -79,28 +83,33 @@ BuildRequires:	librsvg-devel >= 2.9.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:2.2
-BuildRequires:	libwebp-devel >= 0.4.4
+BuildRequires:	libwebp-devel >= 0.5.0
 %{?with_wmf:BuildRequires:	libwmf-devel >= 2:0.2.2}
 BuildRequires:	libxml2-devel >= 2.0
+BuildRequires:	libzip-devel >= 1.0.0
+BuildRequires:	lzip
 %{?with_openjpeg:BuildRequires:	openjpeg2-devel >= 2.1.0}
 BuildRequires:	pango-devel >= 1:1.28.1
 BuildRequires:	perl-devel >= 1:5.8.1
 BuildRequires:	pkgconfig >= 1:0.20
 BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	rpmbuild(macros) >= 1.315
+BuildRequires:	rpmbuild(macros) >= 1.745
 BuildRequires:	tar >= 1:1.22
 # just checked for, actually supplied scripts/txt2html is used
 #BuildRequires:	txt2html
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xz
 BuildRequires:	xz-devel >= 2.9.0
 BuildRequires:	zlib-devel >= 1.0.0
 BuildRequires:	zstd-devel >= 1.0.0
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Suggests:	shared-color-profiles
-Obsoletes:	ImageMagick-coder-dps
-Obsoletes:	ImageMagick-coder-mpeg
+Obsoletes:	ImageMagick-coder-braille < 1:6.4.1.3-2
+Obsoletes:	ImageMagick-coder-dds < 1:6.4.1.3-2
+Obsoletes:	ImageMagick-coder-dps < 1:6.2.6.0-3
+Obsoletes:	ImageMagick-coder-hdf < 1:5.5.2.5
+Obsoletes:	ImageMagick-coder-xps < 1:6.4.1.3-2
+Obsoletes:	ImageMagick-coder-mpeg < 1:5.5.2.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{!?QuantumDepth:1}%{?QuantumDepth:0}
@@ -206,7 +215,7 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	bzip2-devel >= 1.0.1
 Requires:	fftw3-devel >= 3.0
 Requires:	fontconfig-devel >= 2.1.0
-Requires:	freetype-devel >= 2.0.2
+Requires:	freetype-devel >= 1:2.8.0
 Requires:	lcms2-devel >= 2.0
 %{?with_openmp:Requires:	libgomp-devel}
 Requires:	liblqr-devel >= 0.1.0
@@ -298,7 +307,7 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	perl-dirs
 Provides:	ImageMagick-perl = %{epoch}:%{version}-%{release}
-Obsoletes:	ImageMagick-perl
+Obsoletes:	ImageMagick-perl < 1:6.6.1.1-4
 
 %description -n perl-%{name}
 This is the ImageMagick Perl support package. It perl modules and
@@ -523,6 +532,7 @@ Summary:	Coder module for HEIC files
 Summary(pl.UTF-8):	Moduł kodera dla plików HEIC
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	libheif >= 1.4.0
 
 %description coder-heic
 Coder module for HEIC files.
@@ -567,6 +577,19 @@ Coder module for JPEG-2000 (JP2/JPC) files using JasPer library.
 Moduł kodera dla plików JPEG-2000 (JP2/JPC) używajacy biblioteki
 JasPer.
 
+%package coder-jxl
+Summary:	Coder module for JPEG-XL files
+Summary(pl.UTF-8):	Moduł kodera dla plików JPEG-XL
+Group:		X11/Applications/Graphics
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	libjxl >= 0.7.0
+
+%description coder-jxl
+Coder module for JPEG-XL files.
+
+%description coder-jxl -l pl.UTF-8
+Moduł kodera dla plików JPEG-XL.
+
 %package coder-miff
 Summary:	Coder module for MIFF files
 Summary(pl.UTF-8):	Moduł kodera dla plików MIFF
@@ -593,12 +616,26 @@ Language (MSL) files.
 Moduł kodera dla plików Magick Persistent Registry (MPR) i Magick
 Scripting Language (MSL).
 
+%package coder-ora
+Summary:	Coder module to read OpenRaster image format
+Summary(pl.UTF-8):	Moduł kodera do odczytu formatu obrazów OpenRaster
+Group:		X11/Applications/Graphics
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	libzip >= 1.0.0
+
+%description coder-ora
+Coder module to read OpenRaster image format.
+
+%description coder-ora -l pl.UTF-8
+Moduł kodera do odczytu formatu obrazów OpenRaster.
+
 %package coder-pango
 Summary:	Coder module to read pango markup language format
 Summary(pl.UTF-8):	Moduł kodera do odczytu formatu języka znaczników pango
 Group:		X11/Applications/Graphics
 URL:		http://www.imagemagick.org/Usage/text/#pango
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pango >= 1:1.28.1
 
 %description coder-pango
 Coder module to read pango markup language format.
@@ -686,7 +723,7 @@ Summary:	Coder module for WebP files
 Summary(pl.UTF-8):	Moduł kodera dla plików WebP
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	libwebp >= 0.4.4
+Requires:	libwebp >= 0.5.0
 
 %description coder-webp
 Coder module for WebP files.
@@ -740,10 +777,14 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
 	--with-autotrace%{!?with_autotrace:=no} \
 	--with-djvu%{!?with_djvu:=no} \
 	--with-dps=no \
+	--with-fftw \
 	--with-fpx%{!?with_fpx:=no} \
+	--with-flif%{!?with_flif:=no} \
 	--with-gs-font-dir=%{_fontsdir}/Type1 \
 	--with-gslib%{!?with_gs:=no} \
 	--with-gvc%{!?with_graphviz:=no} \
+	--with-heic%{!?with_heif:=no} \
+	--with-jxl%{!?with_libjxl:=no} \
 	--with-magick_plus_plus%{!?with_cxx:=no} \
 	--with-openexr%{!?with_exr:=no} \
 	--with-openjp2%{!?with_openjpeg:=no} \
@@ -760,6 +801,8 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
 %{__make} -j1
 %{__sed} -i -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
@@ -777,7 +820,7 @@ cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 # packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{mver}/{ChangeLog,LICENSE,NEWS.txt}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{mver}/LICENSE
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -805,6 +848,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/aai.la
 %attr(755,root,root) %{modulesdir}/coders/art.so
 %{modulesdir}/coders/art.la
+%attr(755,root,root) %{modulesdir}/coders/ashlar.so
+%{modulesdir}/coders/ashlar.la
 %attr(755,root,root) %{modulesdir}/coders/avs.so
 %{modulesdir}/coders/avs.la
 %attr(755,root,root) %{modulesdir}/coders/bgr.so
@@ -839,10 +884,14 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/dpx.la
 %attr(755,root,root) %{modulesdir}/coders/ept.so
 %{modulesdir}/coders/ept.la
+%attr(755,root,root) %{modulesdir}/coders/farbfeld.so
+%{modulesdir}/coders/farbfeld.la
 %attr(755,root,root) %{modulesdir}/coders/fax.so
 %{modulesdir}/coders/fax.la
 %attr(755,root,root) %{modulesdir}/coders/fits.so
 %{modulesdir}/coders/fits.la
+%attr(755,root,root) %{modulesdir}/coders/fl32.so
+%{modulesdir}/coders/fl32.la
 %attr(755,root,root) %{modulesdir}/coders/gif.so
 %{modulesdir}/coders/gif.la
 %attr(755,root,root) %{modulesdir}/coders/gradient.so
@@ -871,6 +920,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/ipl.la
 %attr(755,root,root) %{modulesdir}/coders/jnx.so
 %{modulesdir}/coders/jnx.la
+%attr(755,root,root) %{modulesdir}/coders/kernel.so
+%{modulesdir}/coders/kernel.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
 %{modulesdir}/coders/label.la
 %attr(755,root,root) %{modulesdir}/coders/mac.so
@@ -891,8 +942,6 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/mono.la
 %attr(755,root,root) %{modulesdir}/coders/mpc.so
 %{modulesdir}/coders/mpc.la
-%attr(755,root,root) %{modulesdir}/coders/mpeg.so
-%{modulesdir}/coders/mpeg.la
 %attr(755,root,root) %{modulesdir}/coders/mtv.so
 %{modulesdir}/coders/mtv.la
 %attr(755,root,root) %{modulesdir}/coders/mvg.so
@@ -963,6 +1012,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/tile.la
 %attr(755,root,root) %{modulesdir}/coders/tim.so
 %{modulesdir}/coders/tim.la
+%attr(755,root,root) %{modulesdir}/coders/tim2.so
+%{modulesdir}/coders/tim2.la
 %attr(755,root,root) %{modulesdir}/coders/ttf.so
 %{modulesdir}/coders/ttf.la
 %attr(755,root,root) %{modulesdir}/coders/txt.so
@@ -975,6 +1026,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/vicar.la
 %attr(755,root,root) %{modulesdir}/coders/vid.so
 %{modulesdir}/coders/vid.la
+%attr(755,root,root) %{modulesdir}/coders/video.so
+%{modulesdir}/coders/video.la
 %attr(755,root,root) %{modulesdir}/coders/viff.so
 %{modulesdir}/coders/viff.la
 %attr(755,root,root) %{modulesdir}/coders/vips.so
@@ -995,31 +1048,43 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/xps.la
 %attr(755,root,root) %{modulesdir}/coders/x.so
 %{modulesdir}/coders/x.la
-%attr(755,root,root) %{modulesdir}/coders/xtrn.so
-%{modulesdir}/coders/xtrn.la
 %attr(755,root,root) %{modulesdir}/coders/xwd.so
 %{modulesdir}/coders/xwd.la
+%attr(755,root,root) %{modulesdir}/coders/yaml.so
+%{modulesdir}/coders/yaml.la
 %attr(755,root,root) %{modulesdir}/coders/ycbcr.so
 %{modulesdir}/coders/ycbcr.la
 %attr(755,root,root) %{modulesdir}/coders/yuv.so
 %{modulesdir}/coders/yuv.la
 
+# new modules in 7.1.x
+%attr(755,root,root) %{modulesdir}/coders/bayer.so
+%{modulesdir}/coders/bayer.la
+%attr(755,root,root) %{modulesdir}/coders/ftxt.so
+%{modulesdir}/coders/ftxt.la
+%attr(755,root,root) %{modulesdir}/coders/qoi.so
+%{modulesdir}/coders/qoi.la
+%attr(755,root,root) %{modulesdir}/coders/strimg.so
+%{modulesdir}/coders/strimg.la
+
 %attr(755,root,root) %{modulesdir}/filters/analyze.so
 %{modulesdir}/filters/analyze.la
 
-%attr(755,root,root) %{_bindir}/animate
-%attr(755,root,root) %{_bindir}/compare
-%attr(755,root,root) %{_bindir}/composite
-%attr(755,root,root) %{_bindir}/conjure
-%attr(755,root,root) %{_bindir}/convert
-%attr(755,root,root) %{_bindir}/display
-%attr(755,root,root) %{_bindir}/identify
-%attr(755,root,root) %{_bindir}/import
 %attr(755,root,root) %{_bindir}/magick
-%attr(755,root,root) %{_bindir}/magick-script
-%attr(755,root,root) %{_bindir}/mogrify
-%attr(755,root,root) %{_bindir}/montage
-%attr(755,root,root) %{_bindir}/stream
+
+# Symlinks, no %attr
+%{_bindir}/animate
+%{_bindir}/compare
+%{_bindir}/composite
+%{_bindir}/conjure
+%{_bindir}/convert
+%{_bindir}/display
+%{_bindir}/identify
+%{_bindir}/import
+%{_bindir}/magick-script
+%{_bindir}/mogrify
+%{_bindir}/montage
+%{_bindir}/stream
 
 %{_mandir}/man1/ImageMagick.1*
 %{_mandir}/man1/animate.1*
@@ -1042,11 +1107,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc ChangeLog LICENSE AUTHORS.txt
+%doc LICENSE AUTHORS.txt
 %attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.6
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.10
 %attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.6
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.10
 %dir %{_libdir}/ImageMagick-%{ver}
 %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
 %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1086,11 +1151,13 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/exr.la
 %endif
 
+%if %{with flif}
 %files coder-flif
 %defattr(644,root,root,755)
 # R: flif
 %attr(755,root,root) %{modulesdir}/coders/flif.so
 %{modulesdir}/coders/flif.la
+%endif
 
 %if %{with fpx}
 %files coder-fpx
@@ -1100,11 +1167,13 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/fpx.la
 %endif
 
+%if %{with heif}
 %files coder-heic
 %defattr(644,root,root,755)
 # R: libheif
 %attr(755,root,root) %{modulesdir}/coders/heic.so
 %{modulesdir}/coders/heic.la
+%endif
 
 %files coder-jbig
 %defattr(644,root,root,755)
@@ -1126,6 +1195,14 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/jp2.la
 %endif
 
+%if %{with libjxl}
+%files coder-jxl
+%defattr(644,root,root,755)
+# R: libjxl
+%attr(755,root,root) %{modulesdir}/coders/jxl.so
+%{modulesdir}/coders/jxl.la
+%endif
+
 %files coder-miff
 %defattr(644,root,root,755)
 # R: libjpeg, zlib, libbz2
@@ -1140,6 +1217,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/msl.so
 %{modulesdir}/coders/msl.la
 
+%files coder-ora
+%defattr(644,root,root,755)
+# R: libzip >= 1.0.0
+%attr(755,root,root) %{modulesdir}/coders/ora.so
+%{modulesdir}/coders/ora.la
+
 %files coder-pango
 %defattr(644,root,root,755)
 # R: cairo, pango
@@ -1239,7 +1322,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.4
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.5
 
 %files c++-devel
 %defattr(644,root,root,755)