- updated to 7.0.10-35

- updated config,link,lt patches
- mpeg coder has been renamed to video
- new coders: ashlar,kernel,ora; two first in main, the last in -coder-ora subpackage

diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 0e07f7fdc1119dcb3412e06bc256943ead44a4bc..70c0dd1b3e5dc631b0ebc84f01e169276f2eafd6 100644 (file)
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- ImageMagick-7.0.8-68/configure.ac.orig     2019-10-06 00:26:07.000000000 +0200
-+++ ImageMagick-7.0.8-68/configure.ac  2019-10-26 20:30:22.370870651 +0200
-@@ -1649,7 +1649,7 @@
+--- ImageMagick-7.0.10-35/configure.ac.orig    2020-10-31 16:49:27.000000000 +0100
++++ ImageMagick-7.0.10-35/configure.ac 2020-11-01 08:44:50.373357144 +0100
+@@ -1520,7 +1520,7 @@
      AC_MSG_CHECKING([for X11])
      AC_MSG_RESULT([])
      LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,27 +9,27 @@
      LIBS="$X11_LIBS $LIBS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
-@@ -1676,7 +1676,7 @@
+@@ -1547,7 +1547,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',,)
+     AC_CHECK_LIB([Xt],[XtSetEventDispatcher],[XT_LIBS='-lXt'],[],[])
 -    LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
 +    LIBS="$XEXT_LIBS $LIBS"
  fi
  if test "$no_x" != 'yes'; then
    have_x='yes'
-@@ -4016,9 +4016,9 @@
+@@ -3910,9 +3910,9 @@
  #
  
  if test "$build_modules" != 'no'; then
--    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_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 $TCMALLOC_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 $TCMALLOC_LIBS"
+-    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZIPLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_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 $TCMALLOC_LIBS"
  else
--    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_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 $TCMALLOC_LIBS"
-+    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_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 $LZMA_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 $TCMALLOC_LIBS"
+-    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_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 $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
++    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_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 $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS            $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS          $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
  fi
  MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
- AC_SUBST(MAGICK_DEP_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 @@

diff --git a/ImageMagick-lt.patch b/ImageMagick-lt.patch
index ce57ad020a56f0f0b2e3abe4ff23b31aac10323e..6f8d36f91bb54820b00889e0e658ab964efcbe82 100644 (file)
--- a/ImageMagick-lt.patch
+++ b/ImageMagick-lt.patch
@@ -1,6 +1,6 @@
---- ImageMagick-7.0.8-19/configure.ac.orig     2018-12-22 17:26:01.383704476 +0100
-+++ ImageMagick-7.0.8-19/configure.ac  2018-12-22 17:26:18.737037609 +0100
-@@ -486,10 +486,6 @@
+--- ImageMagick-7.0.10-35/configure.ac.orig    2020-11-01 08:45:30.469806589 +0100
++++ ImageMagick-7.0.10-35/configure.ac 2020-11-01 09:05:17.360043320 +0100
+@@ -489,10 +489,6 @@
          CFLAGS="$CFLAGS $DEF_THREAD"
          CXXFLAGS="$CXXFLAGS $DEF_THREAD"
          THREAD_LIBS="$PTHREAD_LIBS"
@@ -8,6 +8,6 @@
 -            AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
 -            CC="$PTHREAD_CC"
 -        fi
-         AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
+         AC_DEFINE([THREAD_SUPPORT],[1],[Define if you have POSIX threads libraries and header files.])
      fi
  fi

diff --git a/ImageMagick.spec b/ImageMagick.spec
index f08da8afcfb070b03615079294c4cd5e74eab15e..f6d26dbaa5873e793eb4db7f59caca7090c64aec 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -24,7 +24,7 @@
 %define        libpng_ver 2:1.6.34
 
 %define                ver     7.0.10
-%define                pver    0
+%define                pver    35
 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
@@ -41,14 +41,14 @@ Epoch:              1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       https://www.imagemagick.org/download/releases/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 1ca9a081ebb28a1e7d0daad0fccc747c
+# Source0-md5: abcb07971017f8fe97b44d7c22ba69ae
 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/
+URL:           https://imagemagick.org/
 %{?with_opencl:BuildRequires:  OpenCL-devel}
 %{?with_exr:BuildRequires:     OpenEXR-devel >= 1.0.6}
 BuildRequires: autoconf >= 2.69
@@ -82,6 +82,7 @@ BuildRequires:        libtool >= 2:2.2
 BuildRequires: libwebp-devel >= 0.4.4
 %{?with_wmf:BuildRequires:     libwmf-devel >= 2:0.2.2}
 BuildRequires: libxml2-devel >= 2.0
+BuildRequires: libzip-devel >= 1.0.0
 %{?with_openjpeg:BuildRequires:        openjpeg2-devel >= 2.1.0}
 BuildRequires: pango-devel >= 1:1.28.1
 BuildRequires: perl-devel >= 1:5.8.1
@@ -593,12 +594,26 @@ Language (MSL) files.
 Moduł kodera dla plików Magick Persistent Registry (MPR) i Magick
 Scripting Language (MSL).
 
+%package coder-ora
+Summary:       Coder module to read OpenRaster image format
+Summary(pl.UTF-8):     Moduł kodera do odczytu formatu obrazów OpenRaster
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      libzip >= 1.0.0
+
+%description coder-ora
+Coder module to read OpenRaster image format.
+
+%description coder-ora -l pl.UTF-8
+Moduł kodera do odczytu formatu obrazów OpenRaster.
+
 %package coder-pango
 Summary:       Coder module to read pango markup language format
 Summary(pl.UTF-8):     Moduł kodera do odczytu formatu języka znaczników pango
 Group:         X11/Applications/Graphics
 URL:           http://www.imagemagick.org/Usage/text/#pango
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      pango >= 1:1.28.1
 
 %description coder-pango
 Coder module to read pango markup language format.
@@ -805,6 +820,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/aai.la
 %attr(755,root,root) %{modulesdir}/coders/art.so
 %{modulesdir}/coders/art.la
+%attr(755,root,root) %{modulesdir}/coders/ashlar.so
+%{modulesdir}/coders/ashlar.la
 %attr(755,root,root) %{modulesdir}/coders/avs.so
 %{modulesdir}/coders/avs.la
 %attr(755,root,root) %{modulesdir}/coders/bgr.so
@@ -871,6 +888,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/ipl.la
 %attr(755,root,root) %{modulesdir}/coders/jnx.so
 %{modulesdir}/coders/jnx.la
+%attr(755,root,root) %{modulesdir}/coders/kernel.so
+%{modulesdir}/coders/kernel.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
 %{modulesdir}/coders/label.la
 %attr(755,root,root) %{modulesdir}/coders/mac.so
@@ -891,8 +910,6 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/mono.la
 %attr(755,root,root) %{modulesdir}/coders/mpc.so
 %{modulesdir}/coders/mpc.la
-%attr(755,root,root) %{modulesdir}/coders/mpeg.so
-%{modulesdir}/coders/mpeg.la
 %attr(755,root,root) %{modulesdir}/coders/mtv.so
 %{modulesdir}/coders/mtv.la
 %attr(755,root,root) %{modulesdir}/coders/mvg.so
@@ -977,6 +994,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/vicar.la
 %attr(755,root,root) %{modulesdir}/coders/vid.so
 %{modulesdir}/coders/vid.la
+%attr(755,root,root) %{modulesdir}/coders/video.so
+%{modulesdir}/coders/video.la
 %attr(755,root,root) %{modulesdir}/coders/viff.so
 %{modulesdir}/coders/viff.la
 %attr(755,root,root) %{modulesdir}/coders/vips.so
@@ -1142,6 +1161,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/msl.so
 %{modulesdir}/coders/msl.la
 
+%files coder-ora
+%defattr(644,root,root,755)
+# R: libzip >= 1.0.0
+%attr(755,root,root) %{modulesdir}/coders/ora.so
+%{modulesdir}/coders/ora.la
+
 %files coder-pango
 %defattr(644,root,root,755)
 # R: cairo, pango

diff --git a/config.patch b/config.patch
index aa6d874f1296a171ebb78251d455e71761a1f626..3b56c5360d3569511f1a7cab71e472f71fbb8c50 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
---- ImageMagick-7.0.8-12/config/policy.xml~    2018-09-23 15:06:47.000000000 +0300
-+++ ImageMagick-7.0.8-12/config/policy.xml     2018-09-27 23:34:04.357038809 +0300
-@@ -68,11 +68,22 @@
+--- ImageMagick-7.0.10-35/config/policy.xml.orig       2020-11-01 08:31:56.807547910 +0100
++++ ImageMagick-7.0.10-35/config/policy.xml    2020-11-01 08:38:08.528867456 +0100
+@@ -64,14 +64,25 @@
    <!-- <policy domain="resource" name="thread" value="4"/> -->
    <!-- <policy domain="resource" name="throttle" value="0"/> -->
    <!-- <policy domain="resource" name="time" value="3600"/> -->
@@ -9,8 +9,11 @@
 -  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
 -  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
    <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+   <!-- <policy domain="cache" name="max-memory-request" value="256MiB"/> -->
    <!-- <policy domain="cache" name="synchronize" value="True"/> -->
    <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+   <!-- <policy domain="system" name="shred" value="2"/> -->
+   <!-- <policy domain="system" name="precision" value="6"/> -->
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="URL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />