X-Git-Url: http://git.pld-linux.org/?p=packages%2FImageMagick.git;a=blobdiff_plain;f=ImageMagick.spec;h=63fd16b4d760002741f1937b35f7c449b002ab71;hp=91aaeba4af84e6c3270c311bdfe1724cdf82021e;hb=335073c8712e8d81b0fc8f39408eb18edb3ef2ed;hpb=a525b288a15009727993a377457a78bc18d260c9 diff --git a/ImageMagick.spec b/ImageMagick.spec index 91aaeba..63fd16b 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,4 +1,5 @@ # TODO +# - jxl delegate, BR: brunsli https://github.com/google/brunsli # - create sane default policy file: # https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801 # @@ -9,6 +10,7 @@ %bcond_without openmp # OpenMP computing support %bcond_with hdri # HDRI support (accurately represent the wide range of intensity levels found in real scenes) %bcond_with gs # PostScript support through ghostscript library (warning: breaks jpeg (and possibly tiff) because of symbol clashes!) +%bcond_without raqm # RAQM support in annotate # - modules: %bcond_without djvu # DJVU module %bcond_without exr # OpenEXR module @@ -19,8 +21,10 @@ # - module features: %bcond_without autotrace # Autotrace support in SVG module -%define ver 6.9.5 -%define pver 2 +%define libpng_ver 2:1.6.34 + +%define ver 7.0.8 +%define pver 68 %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 @@ -33,17 +37,18 @@ Summary(tr.UTF-8): X altında resim gösterme, çevirme ve değişiklik yapma Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window Name: ImageMagick Version: %{ver}%{?pver:.%{pver}} -Release: 1 +Release: 4 Epoch: 1 License: Apache-like Group: X11/Applications/Graphics -Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz -# Source0-md5: 60727655acec7c3e766f9ba2c744419b +Source0: https://www.imagemagick.org/download/releases/%{name}-%{ver}-%{pver}.tar.xz +# Source0-md5: f97e8c077cdc335fc66cf925e64576f9 Patch0: config.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/ %{?with_opencl:BuildRequires: OpenCL-devel} BuildRequires: OpenEXR-devel >= 1.0.6 @@ -51,9 +56,10 @@ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.12 %{?with_autotrace:BuildRequires: autotrace-devel >= 0.31.1} BuildRequires: bzip2-devel >= 1.0.1 -%{?with_djvu:BuildRequires: djvulibre-devel} +%{?with_djvu:BuildRequires: djvulibre-devel >= 3.5.0} BuildRequires: expat-devel >= 1.95.7 BuildRequires: fftw3-devel >= 3.0 +BuildRequires: flif-devel BuildRequires: fontconfig-devel >= 2.1.0 BuildRequires: freetype-devel >= 2.0.2-2 %{?with_openmp:BuildRequires: gcc-c++ >= 6:4.2} @@ -63,31 +69,35 @@ 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 BuildRequires: libjpeg-devel >= 6b BuildRequires: liblqr-devel >= 0.1.0 BuildRequires: libltdl-devel -BuildRequires: libpng-devel >= 1.0.8 +BuildRequires: libpng-devel >= %{libpng_ver} +%{?with_raqm:BuildRequires: libraqm-devel} +BuildRequires: libraw-devel >= 0.14.8 BuildRequires: librsvg-devel >= 2.9.0 BuildRequires: libstdc++-devel BuildRequires: libtiff-devel BuildRequires: libtool >= 2:2.2 -BuildRequires: libwebp-devel +BuildRequires: libwebp-devel >= 0.4.4 %{?with_wmf:BuildRequires: libwmf-devel >= 2:0.2.2} BuildRequires: libxml2-devel >= 2.0 %{?with_openjpeg:BuildRequires: openjpeg2-devel >= 2.1.0} BuildRequires: pango-devel >= 1:1.28.1 BuildRequires: perl-devel >= 1:5.8.1 -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 1:0.20 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.315 BuildRequires: tar >= 1:1.22 -# only checked for, but only supplied scripts/txt2html is used -BuildRequires: tar >= 1:1.22 +# just checked for, actually supplied scripts/txt2html is used #BuildRequires: txt2html -BuildRequires: xorg-lib-libXext +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXext-devel BuildRequires: xz BuildRequires: xz-devel >= 2.9.0 -BuildRequires: zlib-devel +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 @@ -99,8 +109,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %endif %define abisuf Q%{QuantumDepth}%{?with_hdri:HDRI} %define modulesdir %{_libdir}/ImageMagick-%{ver}/modules-%{abisuf} -%define mver 6 -%define pname ImageMagick-6 +%define mver 7 +%define pname ImageMagick-7 %description ImageMagick is an image display, conversion, and manipulation tool. It @@ -173,6 +183,7 @@ Summary(pt_BR.UTF-8): Bibliotecas dinâmicas do ImageMagick Group: X11/Libraries Requires: fontconfig-libs >= 2.1.0 Requires: liblqr >= 0.1.0 +Requires: zlib >= 1.0.0 %description libs ImageMagick libraries. @@ -199,12 +210,12 @@ Requires: fontconfig-devel >= 2.1.0 Requires: freetype-devel >= 2.0.2 Requires: lcms2-devel >= 2.0 %{?with_openmp:Requires: libgomp-devel} -Requires: libjpeg-devel >= 6b Requires: liblqr-devel >= 0.1.0 Requires: libltdl-devel -Requires: libtiff-devel +%{?with_raqm:Requires: libraqm-devel} +Requires: xorg-lib-libX11-devel Requires: xorg-lib-libXext-devel -Requires: zlib-devel +Requires: zlib-devel >= 1.0.0 %description devel This is the ImageMagick development package. It includes header files @@ -437,6 +448,7 @@ Summary: Coder module for DJVU files Summary(pl.UTF-8): Moduł kodera dla plików DJVU Group: X11/Applications/Graphics Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: djvulibre >= 3.5.0 %description coder-djvu Coder module for DJVU files. @@ -444,6 +456,19 @@ Coder module for DJVU files. %description coder-djvu -l pl.UTF-8 Moduł kodera dla plików DJVU. +%package coder-dng +Summary: Coder module for DNG files +Summary(pl.UTF-8): Moduł kodera dla plików DNG +Group: X11/Applications/Graphics +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: libraw >= 0.14.8 + +%description coder-dng +Coder module for DNG (Digital Negative) files. + +%description coder-dng -l pl.UTF-8 +Moduł kodera dla plików DNG (Digital Negative). + %package coder-dot Summary: Coder module for GraphViz DOT files Summary(pl.UTF-8): Moduł kodera dla plików GraphViz DOT @@ -470,6 +495,18 @@ Coder module for ILM EXR files. %description coder-exr -l pl.UTF-8 Moduł kodera dla plików EXR ILM. +%package coder-flif +Summary: Coder module for FLIF (Free Lossless Image Format) files +Summary(pl.UTF-8): Moduł kodera dla plików FLIF (Free Lossless Image Format) +Group: X11/Applications/Graphics +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description coder-flif +Coder module for FLIF (Free Lossless Image Format) files. + +%description coder-flif -l pl.UTF-8 +Moduł kodera dla plików FLIF (Free Lossless Image Format). + %package coder-fpx Summary: Coder module for FlashPIX (FPX) files Summary(pl.UTF-8): Moduł kodera dla plików FlashPIX (FPX) @@ -482,6 +519,18 @@ Coder module for FlashPIX (FPX) files. %description coder-fpx -l pl.UTF-8 Moduł kodera dla plików FlashPIX (FPX). +%package coder-heic +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} + +%description coder-heic +Coder module for HEIC files. + +%description coder-heic -l pl.UTF-8 +Moduł kodera dla plików HEIC. + %package coder-jbig Summary: Coder module for JBIG files Summary(pl.UTF-8): Moduł kodera dla plików JBIG @@ -576,6 +625,7 @@ Summary: Coder module for PNG files Summary(pl.UTF-8): Modul kodera dla plików PNG Group: X11/Applications/Graphics Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: libpng >= %{libpng_ver} %description coder-png Coder module for PNG files. @@ -637,6 +687,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 %description coder-webp Coder module for WebP files. @@ -649,6 +700,7 @@ Summary: Coder module for WMF files Summary(pl.UTF-8): Moduł kodera dla plików WMF Group: X11/Applications/Graphics Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: libpng >= %{libpng_ver} %description coder-wmf Coder module for WMF files. @@ -663,6 +715,7 @@ Moduł kodera dla plików WMF. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}=' @@ -689,19 +742,20 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html --with-djvu%{!?with_djvu:=no} \ --with-dps=no \ --with-fpx%{!?with_fpx:=no} \ + --with-gs-font-dir=%{_fontsdir}/Type1 \ --with-gslib%{!?with_gs:=no} \ --with-gvc%{!?with_graphviz:=no} \ --with-magick_plus_plus%{!?with_cxx:=no} \ --with-openexr%{!?with_exr:=no} \ --with-openjp2%{!?with_openjpeg:=no} \ - --with-wmf%{!?with_wmf:=no} \ - --with-gs-font-dir=%{_fontsdir}/Type1 \ --with-perl=%{__perl} \ --with-perl-options="INSTALLDIRS=vendor" \ --with-quantum-depth=%{QuantumDepth} \ + --with-raqm%{!?with_raqm:=no} \ --with-rsvg \ --with-threads \ --with-webp \ + --with-wmf%{!?with_wmf:=no} \ --with-x %{__make} -j1 @@ -716,9 +770,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version} pkgdocdir=%{_docdir}/%{name}-doc-%{version} # for coders development -install -d $RPM_BUILD_ROOT%{_includedir}/%{pname}/private/magick -cp -p magick/{blob,blob-private,delegate-private,exception-private,image-private,monitor-private,nt-base-private,quantum-private,static,studio}.h \ - $RPM_BUILD_ROOT%{_includedir}/%{pname}/private/magick +install -d $RPM_BUILD_ROOT%{_includedir}/%{pname}/private/MagickCore +cp -p MagickCore/{blob,blob-private,delegate-private,exception-private,image-private,monitor-private,nt-base-private,quantum-private,static,studio}.h \ + $RPM_BUILD_ROOT%{_includedir}/%{pname}/private/MagickCore cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version} %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist @@ -770,6 +824,8 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/clip.la %attr(755,root,root) %{modulesdir}/coders/cmyk.so %{modulesdir}/coders/cmyk.la +%attr(755,root,root) %{modulesdir}/coders/cube.so +%{modulesdir}/coders/cube.la %attr(755,root,root) %{modulesdir}/coders/cut.so %{modulesdir}/coders/cut.la %attr(755,root,root) %{modulesdir}/coders/dcm.so @@ -780,16 +836,12 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/debug.la %attr(755,root,root) %{modulesdir}/coders/dib.so %{modulesdir}/coders/dib.la -%attr(755,root,root) %{modulesdir}/coders/dng.so -%{modulesdir}/coders/dng.la %attr(755,root,root) %{modulesdir}/coders/dpx.so %{modulesdir}/coders/dpx.la %attr(755,root,root) %{modulesdir}/coders/ept.so %{modulesdir}/coders/ept.la %attr(755,root,root) %{modulesdir}/coders/fax.so %{modulesdir}/coders/fax.la -%attr(755,root,root) %{modulesdir}/coders/fd.so -%{modulesdir}/coders/fd.la %attr(755,root,root) %{modulesdir}/coders/fits.so %{modulesdir}/coders/fits.la %attr(755,root,root) %{modulesdir}/coders/gif.so @@ -864,6 +916,8 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/pes.la %attr(755,root,root) %{modulesdir}/coders/pdb.so %{modulesdir}/coders/pdb.la +%attr(755,root,root) %{modulesdir}/coders/pgx.so +%{modulesdir}/coders/pgx.la %attr(755,root,root) %{modulesdir}/coders/pict.so %{modulesdir}/coders/pict.la %attr(755,root,root) %{modulesdir}/coders/pix.so @@ -872,8 +926,6 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/plasma.la %attr(755,root,root) %{modulesdir}/coders/pnm.so %{modulesdir}/coders/pnm.la -%attr(755,root,root) %{modulesdir}/coders/preview.so -%{modulesdir}/coders/preview.la %attr(755,root,root) %{modulesdir}/coders/psd.so %{modulesdir}/coders/psd.la %attr(755,root,root) %{modulesdir}/coders/ps.so @@ -912,6 +964,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 @@ -964,6 +1018,8 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -977,6 +1033,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/display.1* %{_mandir}/man1/identify.1* %{_mandir}/man1/import.1* +%{_mandir}/man1/magick.1* +%{_mandir}/man1/magick-script.1* %{_mandir}/man1/mogrify.1* %{_mandir}/man1/montage.1* %{_mandir}/man1/stream.1* @@ -989,9 +1047,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc ChangeLog LICENSE AUTHORS.txt %attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.2 +%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.6 %attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.2 +%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.6 %dir %{_libdir}/ImageMagick-%{ver} %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf} %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml @@ -1009,11 +1067,19 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/djvu.la %endif +%files coder-dng +%defattr(644,root,root,755) +# R: libraw +%attr(755,root,root) %{modulesdir}/coders/dng.so +%{modulesdir}/coders/dng.la + +%if %{with graphviz} %files coder-dot %defattr(644,root,root,755) # R: graphviz, gd %attr(755,root,root) %{modulesdir}/coders/dot.so %{modulesdir}/coders/dot.la +%endif %if %{with exr} %files coder-exr @@ -1023,6 +1089,12 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/exr.la %endif +%files coder-flif +%defattr(644,root,root,755) +# R: flif +%attr(755,root,root) %{modulesdir}/coders/flif.so +%{modulesdir}/coders/flif.la + %if %{with fpx} %files coder-fpx %defattr(644,root,root,755) @@ -1031,6 +1103,12 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/fpx.la %endif +%files coder-heic +%defattr(644,root,root,755) +# R: libheif +%attr(755,root,root) %{modulesdir}/coders/heic.so +%{modulesdir}/coders/heic.la + %files coder-jbig %defattr(644,root,root,755) # R: jbigkit (libjbig.so) @@ -1093,7 +1171,7 @@ rm -rf $RPM_BUILD_ROOT %files coder-svg %defattr(644,root,root,755) -# R: libxml2, librsvg, %{?with_autotrace:autotrace} +# R: cairo, libxml2, librsvg, %{?with_autotrace:autotrace} %attr(755,root,root) %{modulesdir}/coders/svg.so %{modulesdir}/coders/svg.la @@ -1125,28 +1203,22 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/Magick-config %attr(755,root,root) %{_bindir}/MagickCore-config %attr(755,root,root) %{_bindir}/MagickWand-config -%attr(755,root,root) %{_bindir}/Wand-config %attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so %attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so %dir %{_includedir}/%{pname} -%{_includedir}/%{pname}/magick -%{_includedir}/%{pname}/wand +%{_includedir}/%{pname}/MagickCore +%{_includedir}/%{pname}/MagickWand %{_includedir}/%{pname}/private -%{_pkgconfigdir}/%{pname}.%{abisuf}.pc +%{_pkgconfigdir}/ImageMagick-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/ImageMagick.pc %{_pkgconfigdir}/MagickCore-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/MagickCore.pc %{_pkgconfigdir}/MagickWand-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/MagickWand.pc -%{_pkgconfigdir}/Wand-%{mver}.%{abisuf}.pc -%{_pkgconfigdir}/Wand.pc -%{_mandir}/man1/Magick-config.1* %{_mandir}/man1/MagickCore-config.1* %{_mandir}/man1/MagickWand-config.1* -%{_mandir}/man1/Wand-config.1* %files static %defattr(644,root,root,755) @@ -1159,8 +1231,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{perl_vendorarch}/Image/Magick %{perl_vendorarch}/Image/Magick/%{abisuf}.pm %dir %{perl_vendorarch}/auto/Image/Magick -%{perl_vendorarch}/auto/Image/Magick/autosplit.ix -%attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/Magick.so %dir %{perl_vendorarch}/auto/Image/Magick/%{abisuf} %{perl_vendorarch}/auto/Image/Magick/%{abisuf}/autosplit.ix %attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.so @@ -1172,7 +1242,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.6 +%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.4 %files c++-devel %defattr(644,root,root,755) @@ -1180,8 +1250,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so %{_includedir}/%{pname}/Magick++ %{_includedir}/%{pname}/Magick++.h -%{_pkgconfigdir}/ImageMagick++-%{mver}.%{abisuf}.pc -%{_pkgconfigdir}/ImageMagick++.pc %{_pkgconfigdir}/Magick++-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/Magick++.pc %{_mandir}/man1/Magick++-config.1*