X-Git-Url: http://git.pld-linux.org/?p=packages%2FGraphicsMagick.git;a=blobdiff_plain;f=GraphicsMagick.spec;h=1dd24ac059f82f92f2c5bc4beb3978bdfe48b7d3;hp=4f4293698045bb645515c0849d2e1d4a909d8b06;hb=HEAD;hpb=9d74e9cbea4a91e68e8d7b64e733c12326dbca23

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 4f42936..72e6c51 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -1,14 +1,16 @@
 #
 # Conditional build:
-%bcond_without	fpx		# without FlashPIX module (which uses fpx library)
-%bcond_with	gs		# with PostScript support through ghostscript library (warning: breaks jpeg!)
-%bcond_without	jasper		# without JPEG2000 module (which uses jasper library)
-%bcond_without	cxx		# without Magick++
-#
-%include	/usr/lib/rpm/macros.perl
-%define		QuantumDepth	16
+%bcond_with	broken	# broken/dangerous coders (currently PSD)
+%bcond_without	fpx	# FlashPIX module (which uses fpx library)
+%bcond_with	gs	# PostScript support through ghostscript library (warning: breaks jpeg!)
+%bcond_without	jasper	# JPEG2000 module (which uses jasper library)
+%bcond_without	libjxl	# JPEG-XL module (which uses libjxl library)
+%bcond_without	cxx	# Magick++ library
+%bcond_without	openmp	# OpenMP support
+
 %define	pdir	Graphics
 %define	pnam	Magick
+%define	QuantumDepth	16
 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
@@ -19,42 +21,53 @@ Summary(ru.UTF-8):	Просмотр, конвертирование, обраб
 Summary(tr.UTF-8):	X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):	Перегляд, конвертування та обробка зображень під X Window
 Name:		GraphicsMagick
-Version:	1.2.4
+Version:	1.3.43
 Release:	1
 License:	MIT
 Group:		X11/Applications/Graphics
-Source0:	http://dl.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.lzma
-# Source0-md5:	abb32425c2a52f983cc3d73aa06c072c
-Patch0:		%{name}-libpath.patch
-Patch1:		%{name}-link.patch
-Patch2:		%{name}-ldflags.patch
+Source0:	https://downloads.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.xz
+# Source0-md5:	ffcd558899aff408b9073c2d48539e22
+Patch0:		%{name}-link.patch
+Patch1:		%{name}-ldflags.patch
 URL:		http://www.graphicsmagick.org/
-BuildRequires:	autoconf >= 2.61
-BuildRequires:	automake >= 1:1.10.1
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	expat-devel >= 1.95.7
 BuildRequires:	freetype-devel >= 2.0.2-2
+%{?with_openmp:BuildRequires:	gcc >= 6:4.2}
 %{?with_gs:BuildRequires:	ghostscript-devel}
 %{?with_jasper:BuildRequires:	jasper-devel >= 1.900.1}
 BuildRequires:	jbigkit-devel >= 1.6
-BuildRequires:	lcms-devel >= 1.16
+BuildRequires:	lcms2-devel >= 2.0
+%{?with_libjxl:BuildRequires:	libbrotli-devel}
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
-BuildRequires:	libjpeg-devel
-BuildRequires:	libltdl-devel
-BuildRequires:	libpng-devel >= 1.2.18
+%{?with_openmp:BuildRequires:	libgomp-devel}
+BuildRequires:	libheif-devel
+BuildRequires:	libjpeg-turbo-devel >= 3.0
+%{?with_libjxl:BuildRequires:	libjxl-devel >= 0.8.0}
+BuildRequires:	libltdl-devel >= 2:2.2
+BuildRequires:	libpng-devel >= 2:1.2.18
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel >= 3.8.2
 BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libwebp-devel
 BuildRequires:	libwmf-devel >= 2:0.2.2
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	perl-devel >= 1:5.8.0
+BuildRequires:	pkgconfig
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	rpmbuild(macros) >= 1.315
+BuildRequires:	rpmbuild(macros) >= 1.745
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xz-devel
+BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
 # only checked for, but only supplied scripts/txt2html is used
 #BuildRequires:	txt2html
 Requires:	%{name}-libs = %{version}-%{release}
-Obsoletes:	GraphicsMagick-coder-dps
+Obsoletes:	GraphicsMagick-coder-dps < 1.1.7-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		modulesdir	%{_libdir}/GraphicsMagick-%{version}/modules-Q%{QuantumDepth}
@@ -138,9 +151,10 @@ Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	bzip2-devel
 Requires:	freetype-devel
-Requires:	lcms-devel
+Requires:	lcms2-devel >= 2.0
 Requires:	libltdl-devel
 Requires:	xorg-lib-libXext-devel
+Requires:	xz-devel
 Requires:	zlib-devel
 
 %description devel
@@ -239,6 +253,18 @@ Coder module for FlashPIX (FPX) files.
 %description coder-fpx -l pl.UTF-8
 Moduł kodera dla plików FlashPIX (FPX).
 
+%package coder-heif
+Summary:	Coder module for HEIF/HEIC files
+Summary(pl.UTF-8):	Moduł kodera dla plików HEIF/HEIC
+Group:		X11/Applications/Graphics
+Requires:	%{name} = %{version}-%{release}
+
+%description coder-heif
+Coder module for HEIF/HEIC files.
+
+%description coder-heif -l pl.UTF-8
+Moduł kodera dla plików HEIF/HEIC.
+
 %package coder-jbig
 Summary:	Coder module for JBIG files
 Summary(pl.UTF-8):	Moduł kodera dla plików JBIG
@@ -276,6 +302,18 @@ 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 (JXL) files using libjxl library
+Summary(pl.UTF-8):	Moduł kodera dla plików JPEG-XL (JXL) używający biblioteki libjxl
+Group:		X11/Applications/Graphics
+Requires:	%{name} = %{version}-%{release}
+
+%description coder-jxl
+Coder module for JPEG-XL (JXL) files using libjxl library.
+
+%description coder-jxl -l pl.UTF-8
+Moduł kodera dla plików JPEG-XL (JXL) używajacy biblioteki libjxl.
+
 %package coder-miff
 Summary:	Coder module for MIFF files
 Summary(pl.UTF-8):	Moduł kodera dla plików MIFF
@@ -374,6 +412,18 @@ Coder module for retrieving files via URL.
 %description coder-url -l pl.UTF-8
 Moduł kodera ściągający pliki o podanym URL.
 
+%package coder-webp
+Summary:	Coder module for WebP files
+Summary(pl.UTF-8):	Moduł kodera dla plików WebP
+Group:		X11/Applications/Graphics
+Requires:	%{name} = %{version}-%{release}
+
+%description coder-webp
+Coder module for WebP files.
+
+%description coder-webp -l pl.UTF-8
+Moduł kodera dla plików WebP.
+
 %package coder-wmf
 Summary:	Coder module for WMF files
 Summary(pl.UTF-8):	Moduł kodera dla plików WMF
@@ -532,6 +582,7 @@ GraphicsMagick em scripts Perl.
 Summary:	GraphicsMagick documentation
 Summary(pl.UTF-8):	Dokumentacja do GraphicsMagick
 Group:		Documentation
+BuildArch:	noarch
 
 %description doc
 Documentation for GraphicsMagick.
@@ -540,11 +591,9 @@ Documentation for GraphicsMagick.
 Dokumentacja do GraphicsMagick.
 
 %prep
-%setup -q -c -T
-lzma -dc %{SOURCE0} | tar xf - -C ..
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/perl=!%{__perl}=' {} \;
 
@@ -554,15 +603,17 @@ find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/p
 %{__autoconf}
 %{__automake}
 %configure \
+	%{?with_broken:--enable-broken-coders} \
 	--enable-fast-install \
 	--enable-shared \
-	--disable-ltdl-install \
+	%{!?with_openmp:--disable-openmp} \
 	--without-dps \
-	--with%{!?with_fpx:out}-fpx \
-	--with%{!?with_gs:out}-gslib \
-	--with%{!?with_jasper:out}-jp2 \
-	--with%{!?with_cxx:out}-magick_plus_plus \
+	--with-fpx%{!?with_fpx:=no} \
 	--with-gs-font-dir=%{_fontsdir}/Type1 \
+	--with-gslib%{!?with_gs:=no} \
+	--with-jp2%{!?with_jasper:=no} \
+	%{!?with_libjxl:--without-jxl} \
+	--with-magick_plus_plus%{!?with_cxx:=no} \
 	--with-modules \
 	--with-perl=%{__perl} \
 	--with-perl-options="INSTALLDIRS=vendor" \
@@ -577,14 +628,14 @@ find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/p
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgdocdir=%{_docdir}/%{name}-devel-%{version}
 
-install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/Copyright.txt
-rm -f $RPM_BUILD_ROOT%{modulesdir}/coders/dps.*
+cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libGraphicsMagick*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -615,12 +666,14 @@ rm -rf $RPM_BUILD_ROOT
 # ========= coders without additional deps
 %attr(755,root,root) %{modulesdir}/coders/art.so
 %{modulesdir}/coders/art.la
-%attr(755,root,root) %{modulesdir}/coders/avi.so
-%{modulesdir}/coders/avi.la
 %attr(755,root,root) %{modulesdir}/coders/avs.so
 %{modulesdir}/coders/avs.la
 %attr(755,root,root) %{modulesdir}/coders/bmp.so
 %{modulesdir}/coders/bmp.la
+%attr(755,root,root) %{modulesdir}/coders/braille.so
+%{modulesdir}/coders/braille.la
+%attr(755,root,root) %{modulesdir}/coders/cals.so
+%{modulesdir}/coders/cals.la
 %attr(755,root,root) %{modulesdir}/coders/caption.so
 %{modulesdir}/coders/caption.la
 %attr(755,root,root) %{modulesdir}/coders/cineon.so
@@ -631,6 +684,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/cut.la
 %attr(755,root,root) %{modulesdir}/coders/dcm.so
 %{modulesdir}/coders/dcm.la
+%attr(755,root,root) %{modulesdir}/coders/dcraw.so
+%{modulesdir}/coders/dcraw.la
 %attr(755,root,root) %{modulesdir}/coders/dib.so
 %{modulesdir}/coders/dib.la
 %attr(755,root,root) %{modulesdir}/coders/dpx.so
@@ -649,16 +704,26 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/gray.la
 %attr(755,root,root) %{modulesdir}/coders/histogram.so
 %{modulesdir}/coders/histogram.la
+%attr(755,root,root) %{modulesdir}/coders/hrz.so
+%{modulesdir}/coders/hrz.la
 %attr(755,root,root) %{modulesdir}/coders/html.so
 %{modulesdir}/coders/html.la
 %attr(755,root,root) %{modulesdir}/coders/icon.so
 %{modulesdir}/coders/icon.la
+%attr(755,root,root) %{modulesdir}/coders/identity.so
+%{modulesdir}/coders/identity.la
+%attr(755,root,root) %{modulesdir}/coders/info.so
+%{modulesdir}/coders/info.la
+%attr(755,root,root) %{modulesdir}/coders/jnx.so
+%{modulesdir}/coders/jnx.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
 %{modulesdir}/coders/label.la
 %attr(755,root,root) %{modulesdir}/coders/locale.so
 %{modulesdir}/coders/locale.la
 %attr(755,root,root) %{modulesdir}/coders/logo.so
 %{modulesdir}/coders/logo.la
+%attr(755,root,root) %{modulesdir}/coders/mac.so
+%{modulesdir}/coders/mac.la
 %attr(755,root,root) %{modulesdir}/coders/map.so
 %{modulesdir}/coders/map.la
 %attr(755,root,root) %{modulesdir}/coders/mat.so
@@ -701,8 +766,10 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/pnm.la
 %attr(755,root,root) %{modulesdir}/coders/preview.so
 %{modulesdir}/coders/preview.la
+%if %{with broken}
 %attr(755,root,root) %{modulesdir}/coders/psd.so
 %{modulesdir}/coders/psd.la
+%endif
 %attr(755,root,root) %{modulesdir}/coders/ps.so
 %{modulesdir}/coders/ps.la
 %attr(755,root,root) %{modulesdir}/coders/pwp.so
@@ -766,11 +833,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc AUTHORS.txt ChangeLog Copyright.txt NEWS.txt README.txt TODO.txt
+%doc ChangeLog Copyright.txt NEWS.txt README.txt TODO.txt
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick.so.2
+%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick.so.3
 %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagickWand.so.1
+%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagickWand.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -779,8 +846,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/GraphicsMagickWand-config
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so
 %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so
-%{_libdir}/libGraphicsMagick.la
-%{_libdir}/libGraphicsMagickWand.la
 %dir %{_includedir}/GraphicsMagick
 %{_includedir}/GraphicsMagick/magick
 %{_includedir}/GraphicsMagick/wand
@@ -803,12 +868,26 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/fpx.la
 %endif
 
+%files coder-heif
+%defattr(644,root,root,755)
+# R: libheif
+%attr(755,root,root) %{modulesdir}/coders/heif.so
+%{modulesdir}/coders/heif.la
+
 %files coder-jbig
 %defattr(644,root,root,755)
 # R: jbigkit (libjbig.so)
 %attr(755,root,root) %{modulesdir}/coders/jbig.so
 %{modulesdir}/coders/jbig.la
 
+%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-jpeg
 %defattr(644,root,root,755)
 # R: libjpeg
@@ -875,6 +954,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/url.so
 %{modulesdir}/coders/url.la
 
+%files coder-webp
+%defattr(644,root,root,755)
+# R: libwebp
+%attr(755,root,root) %{modulesdir}/coders/webp.so
+%{modulesdir}/coders/webp.la
+
 %files coder-wmf
 %defattr(644,root,root,755)
 # R: libwmf, expat, libjpeg, libpng
@@ -885,13 +970,12 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libGraphicsMagick++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick++.so.2
+%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick++.so.12
 
 %files c++-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/GraphicsMagick++-config
 %attr(755,root,root) %{_libdir}/libGraphicsMagick++.so
-%{_libdir}/libGraphicsMagick++.la
 %{_includedir}/GraphicsMagick/Magick++
 %{_includedir}/GraphicsMagick/Magick++.h
 %{_pkgconfigdir}/GraphicsMagick++.pc
@@ -904,13 +988,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files perl
 %defattr(644,root,root,755)
-%{perl_vendorarch}/Graphics
-%dir %{perl_vendorarch}/auto/Graphics
-%dir %{perl_vendorarch}/auto/Graphics/Magick
-%{perl_vendorarch}/auto/Graphics/Magick/autosplit.ix
-%{perl_vendorarch}/auto/Graphics/Magick/Magick.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/Graphics/Magick/Magick.so
-%{_mandir}/man3/Graphics::Magick.3*
 %{_examplesdir}/%{name}-perl-%{version}
 
 %files doc