- updated to 6.9.8-9 (note: new sonames)

- updated config,magick6 patches
- package modules: pgx (in base), flif (in subpackage)
- handle raqm support in annotate utility

diff --git a/ImageMagick.spec b/ImageMagick.spec
index a2cd8632be8c4c6a021ea38d9ee0e94ea324113d..6d524c439484c407cf26dc7a495ea4117d6b2962 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,6 +1,4 @@
 # TODO
-# - flif (flif.h, flif_create_decoder in libflif)
-# - raqm (raqm.pc)
 # - create sane default policy file:
 #   https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801
 #
@@ -11,6 +9,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
@@ -22,8 +21,8 @@
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %define                origname        ImageMagick
-%define                ver     6.9.7
-%define                pver    0
+%define                ver     6.9.8
+%define                pver    9
 %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
@@ -41,7 +40,7 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.imagemagick.org/pub/ImageMagick/%{origname}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 98358e387587e102e7ecc5d3c465865a
+# Source0-md5: 08905a13d33101f349ad34837ff8d5a7
 Patch0:                config.patch
 Patch1:                %{origname}-link.patch
 Patch2:                %{origname}-libpath.patch
@@ -59,6 +58,7 @@ BuildRequires:        bzip2-devel >= 1.0.1
 %{?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}
@@ -72,6 +72,7 @@ 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
@@ -87,10 +88,9 @@ 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
 #BuildRequires:        txt2html
-BuildRequires: xorg-lib-libX11
-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 >= 1.0.0
@@ -478,6 +478,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)
@@ -700,19 +712,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
@@ -888,6 +901,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
@@ -1013,9 +1028,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.3
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.4
 %attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.3
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.4
 %dir %{_libdir}/ImageMagick-%{ver}
 %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
 %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1047,6 +1062,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)

diff --git a/config.patch b/config.patch
index 2856cf0d81e469c375cc8e39f7becd7ba284034c..bdfa9df73a92609120a6a5260bd87d4777d1eb26 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,12 +1,13 @@
---- ImageMagick-6.9.5-2/config/policy.xml.orig 2016-07-11 01:22:33.000000000 +0200
-+++ ImageMagick-6.9.5-2/config/policy.xml      2016-07-18 14:04:44.370795642 +0200
-@@ -61,8 +61,19 @@
+--- ImageMagick-6.9.8-9/config/policy.xml.orig 2017-06-03 21:42:26.347928053 +0200
++++ ImageMagick-6.9.8-9/config/policy.xml      2017-06-03 21:46:36.687925194 +0200
+@@ -69,10 +69,20 @@
+   <!-- <policy domain="resource" name="thread" value="4"/> -->
    <!-- <policy domain="resource" name="throttle" value="0"/> -->
    <!-- <policy domain="resource" name="time" value="3600"/> -->
-   <!-- <policy domain="system" name="precision" value="6"/> -->
+-  <!-- <policy domain="resource" name="time" value="3600"/> -->
 -  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
 -  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
--  <!-- <policy domain="path" rights="none" pattern="@*"/>  -->
+-  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="URL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
@@ -21,5 +22,6 @@
 +  <policy domain="coder" rights="none" pattern="PLT" />
 +  <policy domain="path" rights="none" pattern="|*"/>
 +  <policy domain="path" rights="none" pattern="@*"/>  <!-- indirect reads not permitted -->
+   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+   <!-- <policy domain="cache" name="synchronize" value="True"/> -->
    <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
- </policymap>

diff --git a/magick6.patch b/magick6.patch
index 4b9a90baeffaec16158253f7cce3bede521dca97..fe737058e0d7544cc0f8a9c234f1cbc05bab2f94 100644 (file)
--- a/magick6.patch
+++ b/magick6.patch
@@ -80,8 +80,8 @@
        ;;
      *)
        echo "${usage}" 1>&2
---- ImageMagick-6.9.7-0/wand/MagickWand-config.in~     2016-12-18 14:34:45.000000000 +0100
-+++ ImageMagick-6.9.7-0/wand/MagickWand-config.in      2016-12-27 08:38:34.223917467 +0100
+--- ImageMagick-6.9.8-9/wand/MagickWand-config.in.orig 2017-06-03 02:38:04.000000000 +0200
++++ ImageMagick-6.9.8-9/wand/MagickWand-config.in      2017-06-03 21:50:38.584589096 +0200
 @@ -8,11 +8,11 @@
  exec_prefix=@exec_prefix@
  
@@ -100,24 +100,24 @@
        echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
        ;;
      --cflags)
--      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
-+      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand6
+-      pkg-config --cflags MagickWand
++      pkg-config --cflags MagickWand6
        ;;
      --cxxflags)
--      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
-+      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand6
+-      pkg-config --cflags MagickWand
++      pkg-config --cflags MagickWand6
        ;;
      --cppflags)
--      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
-+      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand6
+-      pkg-config --cflags MagickWand
++      pkg-config --cflags MagickWand6
        ;;
      --ldflags)
--      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand
-+      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand6
+-      pkg-config --libs MagickWand
++      pkg-config --libs MagickWand6
        ;;
      --libs)
--      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand
-+      PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand6
+-      pkg-config --libs MagickWand
++      pkg-config --libs MagickWand6
        ;;
      *)
        echo "${usage}" 1>&2