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

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 1dd24ac..72e6c51 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -1,16 +1,16 @@
 #
 # Conditional build:
-%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	cxx		# Magick++ library
-%bcond_without	openmp		# OpenMP support
+%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
-%include	/usr/lib/rpm/macros.perl
 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
@@ -21,12 +21,12 @@ 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.3.25
-Release:	3
+Version:	1.3.43
+Release:	1
 License:	MIT
 Group:		X11/Applications/Graphics
-Source0:	http://downloads.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.xz
-# Source0-md5:	6eed966b22588fb068442319a8aa17f6
+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/
@@ -40,9 +40,12 @@ BuildRequires:	freetype-devel >= 2.0.2-2
 %{?with_jasper:BuildRequires:	jasper-devel >= 1.900.1}
 BuildRequires:	jbigkit-devel >= 1.6
 BuildRequires:	lcms2-devel >= 2.0
+%{?with_libjxl:BuildRequires:	libbrotli-devel}
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
 %{?with_openmp:BuildRequires:	libgomp-devel}
-BuildRequires:	libjpeg-devel >= 6b
+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
@@ -52,16 +55,19 @@ 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}
@@ -247,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
@@ -284,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
@@ -552,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.
@@ -581,6 +612,7 @@ find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/p
 	--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} \
@@ -602,6 +634,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 
 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
 
@@ -635,6 +670,8 @@ rm -rf $RPM_BUILD_ROOT
 %{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
@@ -809,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
@@ -833,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
@@ -927,7 +976,6 @@ rm -rf $RPM_BUILD_ROOT
 %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