- updated to 6.9.10-19 (note: new soname)

- updated ldflags,link,lt,config,magick6 patches
- added OpenCL patch (adjust dlopen name to libOpenCL.so.1)
- new coder (heic) as subpackage
- moved dng coder to subpackage (depends on libraw)

diff --git a/ImageMagick-OpenCL.patch b/ImageMagick-OpenCL.patch
new file mode 100644 (file)
index 0000000..be2b1f7
--- /dev/null
+++ b/ImageMagick-OpenCL.patch
@@ -0,0 +1,11 @@
+--- ImageMagick-6.9.10-19/magick/opencl.c.orig 2018-12-20 00:48:40.000000000 +0100
++++ ImageMagick-6.9.10-19/magick/opencl.c      2018-12-22 14:07:30.767173808 +0100
+@@ -474,7 +474,7 @@
+ #ifdef MAGICKCORE_WINDOWS_SUPPORT
+       library = OsLibraryLoad("OpenCL.dll");
+ #else
+-      library = OsLibraryLoad("libOpenCL.so");
++      library = OsLibraryLoad("libOpenCL.so.1");
+ #endif
+       if (library)
+         status = bindOpenCLFunctions(library);

diff --git a/ImageMagick-ldflags.patch b/ImageMagick-ldflags.patch
index 021e2788c107c313d3a2d8ed57b3946d63f6098b..c8d05680ffd6b8666125ca2d26455a5510a3c45d 100644 (file)
--- a/ImageMagick-ldflags.patch
+++ b/ImageMagick-ldflags.patch
@@ -1,6 +1,6 @@
---- ImageMagick-6.8.4-8/configure.ac.orig      2013-04-09 15:47:16.713625903 +0200
-+++ ImageMagick-6.8.4-8/configure.ac   2013-04-09 15:49:29.416956473 +0200
-@@ -3903,7 +3903,23 @@
+--- ImageMagick-6.9.10-19/configure.ac.orig    2018-12-21 07:11:13.258445539 +0100
++++ ImageMagick-6.9.10-19/configure.ac 2018-12-21 07:12:20.068444776 +0100
+@@ -3937,7 +3937,23 @@
  MAGICK_CXXFLAGS="$CXXFLAGS"
  MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
  MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
@@ -22,6 +22,6 @@
 +  esac
 +done
 +LDFLAGS="$new_LDFLAGS"
- MAGICK_LIBS="$MAGICK_DEP_LIBS"
+ MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
  
  AC_SUBST(MAGICK_CFLAGS)

diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 56094e6c95759606b6e0f16c24a700f5ef911806..8fb30e64467f04735f909630c2e0a7d93cf52de5 100644 (file)
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- ImageMagick-6.9.9-26/configure.ac~ 2017-12-14 19:35:05.000000000 +0200
-+++ ImageMagick-6.9.9-26/configure.ac  2017-12-14 19:40:54.689637300 +0200
-@@ -1587,7 +1587,7 @@
+--- ImageMagick-6.9.10-19/configure.ac.orig    2018-12-20 00:48:40.000000000 +0100
++++ ImageMagick-6.9.10-19/configure.ac 2018-12-21 07:10:46.138445850 +0100
+@@ -1605,7 +1605,7 @@
      AC_MSG_CHECKING([for X11])
      AC_MSG_RESULT([])
      LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,7 +9,7 @@
      LIBS="$X11_LIBS $LIBS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
-@@ -1614,7 +1614,7 @@
+@@ -1632,7 +1632,7 @@
      #
      AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[])
      AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
@@ -18,15 +18,96 @@
  fi
  if test "$no_x" != 'yes'; then
    have_x='yes'
-@@ -3879,9 +3879,9 @@
+@@ -3915,9 +3915,9 @@
  #
  
  if test "$build_modules" != 'no'; then
--    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
-+    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS                     $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+-    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_LIBS $XML_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
++    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS            $XML_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS                     $BZLIB_LIBS $ZLIB_LIBS            $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS          $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
  else
--    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBPMUX_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
-+    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS               $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS          $IPC_LIBS $X11_LIBS            $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS             $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS            $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+-    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIF_LIBS $WEBPMUX_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
++    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIF_LIBS               $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS          $IPC_LIBS $X11_LIBS            $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZSTD_LIBS            $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS          $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
  fi
+ MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
  AC_SUBST(MAGICK_DEP_LIBS)
+--- ImageMagick-6.9.10-19/coders/Makefile.am.orig      2018-12-20 00:48:40.000000000 +0100
++++ ImageMagick-6.9.10-19/coders/Makefile.am   2018-12-22 10:26:05.633992165 +0100
+@@ -468,7 +468,7 @@
+ coders_djvu_la_SOURCES     = coders/djvu.c
+ coders_djvu_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
+ coders_djvu_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+-coders_djvu_la_LIBADD      = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
++coders_djvu_la_LIBADD      = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
  
+ # DNG coder module
+ coders_dng_la_SOURCES      = coders/dng.c
+@@ -678,7 +678,7 @@
+ coders_mat_la_SOURCES      = coders/mat.c
+ coders_mat_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+ coders_mat_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_mat_la_LIBADD       = $(MAGICKCORE_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
++coders_mat_la_LIBADD       = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
+ 
+ # MATTE coder module
+ coders_matte_la_SOURCES    = coders/matte.c
+@@ -726,7 +726,7 @@
+ coders_msl_la_SOURCES      = coders/msl.c
+ coders_msl_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+ coders_msl_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_msl_la_LIBADD       = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
++coders_msl_la_LIBADD       = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
+ 
+ # MTV coder module
+ coders_mtv_la_SOURCES      = coders/mtv.c
+@@ -798,7 +798,7 @@
+ coders_pdf_la_SOURCES      = coders/pdf.c
+ coders_pdf_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+ coders_pdf_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_pdf_la_LIBADD       = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS)
++coders_pdf_la_LIBADD       = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS)
+ 
+ # PES coder module
+ coders_pes_la_SOURCES      = coders/pes.c
+@@ -828,7 +828,7 @@
+ coders_png_la_SOURCES      = coders/png.c
+ coders_png_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+ coders_png_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_png_la_LIBADD       = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
++coders_png_la_LIBADD       = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
+ 
+ # PLASMA coder module
+ coders_plasma_la_SOURCES   = coders/plasma.c
+@@ -858,13 +858,13 @@
+ coders_ps2_la_SOURCES      = coders/ps2.c
+ coders_ps2_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+ coders_ps2_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_ps2_la_LIBADD       = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
++coders_ps2_la_LIBADD       = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
+ 
+ # PS3 coder module
+ coders_ps3_la_SOURCES      = coders/ps3.c
+ coders_ps3_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+ coders_ps3_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_ps3_la_LIBADD       = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
++coders_ps3_la_LIBADD       = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
+ 
+ # PSD coder module
+ coders_psd_la_SOURCES      = coders/psd.c coders/psd-private.h
+@@ -954,7 +954,7 @@
+ coders_svg_la_SOURCES      = coders/svg.c
+ coders_svg_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS) $(RSVG_CFLAGS) $(CAIRO_SVG_CFLAGS)
+ coders_svg_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_svg_la_LIBADD       = $(MAGICKCORE_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
++coders_svg_la_LIBADD       = $(MAGICKCORE_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
+ 
+ # TGA coder module
+ coders_tga_la_SOURCES      = coders/tga.c
+@@ -1008,7 +1008,7 @@
+ coders_url_la_SOURCES      = coders/url.c
+ coders_url_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+ coders_url_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+-coders_url_la_LIBADD       = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
++coders_url_la_LIBADD       = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
+ 
+ # UYVY coder module
+ coders_uyvy_la_SOURCES     = coders/uyvy.c

diff --git a/ImageMagick-lt.patch b/ImageMagick-lt.patch
index 9a6f30929ee3785b52616ab460662e03bac1d3eb..f854493aa7f7fd0ba99b3baf13b5d047ee1d2af5 100644 (file)
--- a/ImageMagick-lt.patch
+++ b/ImageMagick-lt.patch
@@ -1,9 +1,9 @@
---- ImageMagick-6.9.3-6/configure.ac.orig      2016-03-06 18:30:04.449575381 +0100
-+++ ImageMagick-6.9.3-6/configure.ac   2016-03-06 18:35:39.416227990 +0100
-@@ -489,10 +489,6 @@
+--- ImageMagick-6.9.10-19/configure.ac.orig    2018-12-21 07:12:50.451777763 +0100
++++ ImageMagick-6.9.10-19/configure.ac 2018-12-21 07:16:16.398442079 +0100
+@@ -488,10 +488,6 @@
          CFLAGS="$CFLAGS $DEF_THREAD"
          CXXFLAGS="$CXXFLAGS $DEF_THREAD"
-       THREAD_LIBS="$PTHREAD_LIBS"
+         THREAD_LIBS="$PTHREAD_LIBS"
 -        if test "$CC" != "$PTHREAD_CC"; then
 -            AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
 -            CC="$PTHREAD_CC"

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 5588d209372cbecaaac9f7c2c9446e597d8c570a..ea731f3f9893dd3bf1e7b0fdf235a2125c1fffba 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -21,8 +21,8 @@
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %define                origname        ImageMagick
-%define                ver     6.9.9
-%define                pver    26
+%define                ver     6.9.10
+%define                pver    19
 %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
@@ -35,12 +35,12 @@ Summary(tr.UTF-8):  X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):     Перегляд, конвертування та обробка зображень під X Window
 Name:          ImageMagick6
 Version:       %{ver}%{?pver:.%{pver}}
-Release:       2
+Release:       1
 Epoch:         1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.imagemagick.org/pub/ImageMagick/%{origname}-%{ver}-%{pver}.tar.xz
-# Source0-md5: af553c3dfad841748a6b49f44e354ba7
+# Source0-md5: e23416ba38ac78f8482f74648590544f
 Patch0:                config.patch
 Patch1:                %{origname}-link.patch
 Patch2:                %{origname}-libpath.patch
@@ -48,6 +48,7 @@ Patch3:               %{origname}-ldflags.patch
 Patch4:                %{origname}-lt.patch
 Patch5:                perlmagick.patch
 Patch6:                magick6.patch
+Patch7:                %{origname}-OpenCL.patch
 URL:           https://legacy.imagemagick.org/
 %{?with_opencl:BuildRequires:  OpenCL-devel}
 BuildRequires: OpenEXR-devel >= 1.0.6
@@ -68,16 +69,18 @@ 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
 %{?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}
@@ -93,6 +96,7 @@ BuildRequires:        xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xz
 BuildRequires: xz-devel >= 2.9.0
+BuildRequires: zstd-devel >= 1.0.0
 BuildRequires: zlib-devel >= 1.0.0
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Suggests:      shared-color-profiles
@@ -206,10 +210,10 @@ 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 >= 1.0.0
 
@@ -452,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
@@ -502,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
@@ -634,6 +663,7 @@ Summary:    Coder module for TIFF files
 Summary(pl.UTF-8):     Moduł kodera dla plików TIFF
 Group:         X11/Applications/Graphics
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      zstd >= 1.0.0
 
 %description coder-tiff
 Coder module for TIFF files.
@@ -658,6 +688,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.
@@ -686,6 +717,7 @@ Moduł kodera dla plików WMF.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
 
@@ -817,16 +849,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
@@ -1028,9 +1056,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.5
+%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.5
+%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
@@ -1048,6 +1076,12 @@ 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
+
 %files coder-dot
 %defattr(644,root,root,755)
 # R: graphviz, gd
@@ -1076,6 +1110,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)
@@ -1138,7 +1178,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
 

diff --git a/config.patch b/config.patch
index 53760b8c79ac65320634029309963b1775db96dc..214a93358f1969c22b384a7e06462586b72a9976 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,10 +1,11 @@
---- ImageMagick-6.9.9-26/config/policy.xml~    2017-12-06 03:32:01.000000000 +0200
-+++ ImageMagick-6.9.9-26/config/policy.xml     2017-12-14 19:34:37.097613554 +0200
-@@ -71,10 +71,21 @@
+--- ImageMagick-6.9.10-19/config/policy.xml.orig       2018-12-21 06:58:42.388454113 +0100
++++ ImageMagick-6.9.10-19/config/policy.xml    2018-12-21 07:02:29.218451524 +0100
+@@ -68,11 +68,22 @@
    <!-- <policy domain="resource" name="thread" value="4"/> -->
    <!-- <policy domain="resource" name="throttle" value="0"/> -->
    <!-- <policy domain="resource" name="time" value="3600"/> -->
 -  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
+   <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
 -  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
 -  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
    <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->

diff --git a/magick6.patch b/magick6.patch
index e5b2958dcba3fc317e51a6e63634c372116e890e..829fd793f3a662a584e70d62a5f5d577592391c6 100644 (file)
--- a/magick6.patch
+++ b/magick6.patch
@@ -39,8 +39,8 @@
        ;;
      *)
        echo "${usage}" 1>&2
---- ImageMagick-6.9.9-26/magick/MagickCore-config.in~  2017-12-14 19:53:01.000000000 +0200
-+++ ImageMagick-6.9.9-26/magick/MagickCore-config.in   2017-12-14 19:53:39.770926527 +0200
+--- ImageMagick-6.9.10-19/magick/MagickCore-config.in.orig     2018-12-20 00:48:40.000000000 +0100
++++ ImageMagick-6.9.10-19/magick/MagickCore-config.in  2018-12-21 07:18:02.941774194 +0100
 @@ -8,11 +8,11 @@
  exec_prefix=@exec_prefix@
  
@@ -59,8 +59,8 @@
        echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
        ;;
      --cflags)
--      @PKG_CONFIG@ -config --cflags MagickCore
-+      @PKG_CONFIG@ -config --cflags MagickCore6
+-      @PKG_CONFIG@ --cflags MagickCore
++      @PKG_CONFIG@ --cflags MagickCore6
        ;;
      --cxxflags)
 -      @PKG_CONFIG@ --cflags MagickCore