%bcond_without cxx # Magick++ library
%bcond_without opencl # OpenCL computing support
%bcond_without openmp # OpenMP 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_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
# - module features:
%bcond_without autotrace # Autotrace support in SVG module
-%define ver 6.9.4
-%define pver 1
+%define ver 7.0.5
+%define pver 10
%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(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: 430d33915b19f38012b55f98904c4f37
+# Source0-md5: d5e87f7297a9ffc7b146bab4bbe8cc35
+Patch0: config.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
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}
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
%{?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
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Suggests: shared-color-profiles
Obsoletes: ImageMagick-coder-dps
%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
Group: X11/Libraries
Requires: fontconfig-libs >= 2.1.0
Requires: liblqr >= 0.1.0
+Requires: zlib >= 1.0.0
%description libs
ImageMagick libraries.
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.
%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)
%prep
%setup -q -n %{name}-%{ver}-%{pver}
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
--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
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
%{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
%{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
%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
%{_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*
%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.2
%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.0
%dir %{_libdir}/ImageMagick-%{ver}
%dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
%{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
%{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)
%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)
%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
%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.2
%files c++-devel
%defattr(644,root,root,755)
%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*