X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ImageMagick.spec;h=4617e6dafd0da521877e6dd963d6f1cbb05ec373;hb=09657334554ed5e68703337b85669bd98e4e8b4f;hp=e9d1926a3f183c1b6d16d46f3f373c3b0ebda217;hpb=39a2440d4bdd6761d7df33629b7248d53e0c59c9;p=packages%2FImageMagick.git diff --git a/ImageMagick.spec b/ImageMagick.spec index e9d1926..4617e6d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,12 +1,15 @@ +# TODO +# - create sane default policy file: +# https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801 # # Conditional build: # - features: %bcond_without cxx # Magick++ library -%bcond_without gomp # OpenMP computing support %bcond_without opencl # OpenCL computing support -%bcond_with hdri # HDRI support -%bcond_with gs # PostScript support through ghostscript library -# (warning: breaks jpeg (and possibly tiff) because of symbol clashes!) +%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 @@ -14,12 +17,12 @@ %bcond_without graphviz # dot module (which uses GraphViz libraries) %bcond_without openjpeg # JPEG2000 module (which uses openjpeg 2 library) %bcond_without wmf # WMF module (which uses libwmf library) -# - module feautres: +# - module features: %bcond_without autotrace # Autotrace support in SVG module +%define ver 7.0.7 +%define pver 28 %include /usr/lib/rpm/macros.perl -%define ver 6.9.0 -%define pver 10 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 @@ -31,18 +34,17 @@ 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: 4 +Release: 1 Epoch: 1 License: Apache-like Group: X11/Applications/Graphics Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz -# Source0-md5: 906193d9da1205542a17f77b9541783d -Patch0: %{name}-ac.patch -Patch1: %{name}-link.patch +# Source0-md5: 15907fe499f0377ff28eeafb5905510a +Patch0: config.patch + Patch2: %{name}-libpath.patch Patch3: %{name}-ldflags.patch Patch4: %{name}-lt.patch - URL: http://www.imagemagick.org/ %{?with_opencl:BuildRequires: OpenCL-devel} BuildRequires: OpenEXR-devel >= 1.0.6 @@ -50,22 +52,26 @@ 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_gomp:BuildRequires: gcc-c++ >= 6:4.2} +%{?with_openmp:BuildRequires: gcc-c++ >= 6:4.2} +BuildRequires: gettext-devel %{?with_gs:BuildRequires: ghostscript-devel} %{?with_graphviz:BuildRequires: graphviz-devel >= 2.9.0} BuildRequires: jbigkit-devel BuildRequires: lcms2-devel >= 2.0 +BuildRequires: libde265-devel %{?with_fpx:BuildRequires: libfpx-devel >= 1.2.0.4-3} -%{?with_gomp:BuildRequires: libgomp-devel} +%{?with_openmp:BuildRequires: libgomp-devel} BuildRequires: libjpeg-devel >= 6b BuildRequires: liblqr-devel >= 0.1.0 BuildRequires: libltdl-devel BuildRequires: libpng-devel >= 1.0.8 +%{?with_raqm:BuildRequires: libraqm-devel} BuildRequires: librsvg-devel >= 2.9.0 BuildRequires: libstdc++-devel BuildRequires: libtiff-devel @@ -76,16 +82,17 @@ 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 +# 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 Requires: %{name}-libs = %{epoch}:%{version}-%{release} Suggests: shared-color-profiles Obsoletes: ImageMagick-coder-dps @@ -97,6 +104,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 7 +%define pname ImageMagick-7 %description ImageMagick is an image display, conversion, and manipulation tool. It @@ -169,6 +178,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. @@ -194,7 +204,7 @@ Requires: fftw3-devel >= 3.0 Requires: fontconfig-devel >= 2.1.0 Requires: freetype-devel >= 2.0.2 Requires: lcms2-devel >= 2.0 -%{?with_gomp:Requires: libgomp-devel} +%{?with_openmp:Requires: libgomp-devel} Requires: libjpeg-devel >= 6b Requires: liblqr-devel >= 0.1.0 Requires: libltdl-devel @@ -433,6 +443,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. @@ -466,6 +477,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) @@ -655,7 +678,7 @@ Moduł kodera dla plików WMF. %prep %setup -q -n %{name}-%{ver}-%{pver} %patch0 -p1 -%patch1 -p1 + %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -672,11 +695,12 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html %{__autoheader} %{__automake} %configure \ + --with-gcc-arch=no \ %{!?with_opencl:--disable-opencl} \ - %{!?with_gomp:--disable-openmp} \ + %{!?with_openmp:--disable-openmp} \ --disable-silent-rules \ --enable-fast-install \ - %{?with_hdri:--enable-hdri} \ + %{__enable_disable hdri} \ --enable-shared \ --enable-static \ --with-modules \ @@ -684,19 +708,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 @@ -711,14 +736,15 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version} pkgdocdir=%{_docdir}/%{name}-doc-%{version} # for coders development -install -d $RPM_BUILD_ROOT%{_includedir}/ImageMagick-6/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}/ImageMagick-6/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 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod # packaged as %doc -%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-6/{ChangeLog,LICENSE,NEWS.txt} +%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{mver}/{ChangeLog,LICENSE,NEWS.txt} # obsoleted by pkg-config %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la @@ -736,10 +762,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{modulesdir} %dir %{modulesdir}/coders %dir %{modulesdir}/filters -%dir %{_datadir}/ImageMagick-6 -%{_datadir}/ImageMagick-6/*.xml -%dir %{_sysconfdir}/ImageMagick-6 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ImageMagick-6/*.xml +%dir %{_datadir}/%{pname} +%{_datadir}/%{pname}/*.xml +%dir %{_sysconfdir}/%{pname} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{pname}/*.xml # ========= coders without additional deps %attr(755,root,root) %{modulesdir}/coders/aai.so @@ -782,8 +808,6 @@ rm -rf $RPM_BUILD_ROOT %{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 @@ -794,6 +818,8 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/gray.la %attr(755,root,root) %{modulesdir}/coders/hald.so %{modulesdir}/coders/hald.la +%attr(755,root,root) %{modulesdir}/coders/heic.so +%{modulesdir}/coders/heic.la %attr(755,root,root) %{modulesdir}/coders/hdr.so %{modulesdir}/coders/hdr.la %attr(755,root,root) %{modulesdir}/coders/histogram.so @@ -858,6 +884,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 @@ -866,8 +894,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 @@ -958,6 +984,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 @@ -971,6 +999,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* @@ -982,10 +1012,10 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) %doc ChangeLog LICENSE AUTHORS.txt -%attr(755,root,root) %{_libdir}/libMagickCore-6.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagickCore-6.%{abisuf}.so.2 -%attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagickWand-6.%{abisuf}.so.2 +%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.5 +%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.5 %dir %{_libdir}/ImageMagick-%{ver} %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf} %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml @@ -1003,11 +1033,13 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/djvu.la %endif +%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 @@ -1017,6 +1049,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) @@ -1119,33 +1157,27 @@ 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-6.%{abisuf}.so -%attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so -%dir %{_includedir}/ImageMagick-6 -%{_includedir}/ImageMagick-6/magick -%{_includedir}/ImageMagick-6/private -%{_includedir}/ImageMagick-6/wand -%{_pkgconfigdir}/ImageMagick-6.%{abisuf}.pc +%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so +%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so +%dir %{_includedir}/%{pname} +%{_includedir}/%{pname}/MagickCore +%{_includedir}/%{pname}/MagickWand +%{_includedir}/%{pname}/private +%{_pkgconfigdir}/ImageMagick-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/ImageMagick.pc -%{_pkgconfigdir}/MagickCore-6.%{abisuf}.pc +%{_pkgconfigdir}/MagickCore-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/MagickCore.pc -%{_pkgconfigdir}/MagickWand-6.%{abisuf}.pc +%{_pkgconfigdir}/MagickWand-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/MagickWand.pc -%{_pkgconfigdir}/Wand-6.%{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) -%{_libdir}/libMagickCore-6.%{abisuf}.a -%{_libdir}/libMagickWand-6.%{abisuf}.a +%{_libdir}/libMagickCore-%{mver}.%{abisuf}.a +%{_libdir}/libMagickWand-%{mver}.%{abisuf}.a %files -n perl-%{name} %defattr(644,root,root,755) @@ -1153,8 +1185,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 @@ -1165,22 +1195,20 @@ rm -rf $RPM_BUILD_ROOT %if %{with cxx} %files c++ %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.6 +%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.4 %files c++-devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/Magick++-config -%attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so -%{_includedir}/ImageMagick-6/Magick++ -%{_includedir}/ImageMagick-6/Magick++.h -%{_pkgconfigdir}/ImageMagick++-6.%{abisuf}.pc -%{_pkgconfigdir}/ImageMagick++.pc -%{_pkgconfigdir}/Magick++-6.%{abisuf}.pc +%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so +%{_includedir}/%{pname}/Magick++ +%{_includedir}/%{pname}/Magick++.h +%{_pkgconfigdir}/Magick++-%{mver}.%{abisuf}.pc %{_pkgconfigdir}/Magick++.pc %{_mandir}/man1/Magick++-config.1* %files c++-static %defattr(644,root,root,755) -%{_libdir}/libMagick++-6.%{abisuf}.a +%{_libdir}/libMagick++-%{mver}.%{abisuf}.a %endif