- updated to 6.9.11-34; mpeg coder has been renamed to video

- updated link,lt,magick6 patches

diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index aef942d6ac4eb6c17a5f40ee1897b5062d3b7658..0968b2e8fb1136b04bcf60b4b4bc665e52c4fb35 100644 (file)
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- ImageMagick-6.9.11-0/configure.ac.orig     2020-03-07 00:52:18.000000000 +0100
-+++ ImageMagick-6.9.11-0/configure.ac  2020-03-15 19:49:23.692781559 +0100
-@@ -1488,7 +1488,7 @@
+--- ImageMagick-6.9.11-34/configure.ac.orig    2020-10-08 15:25:41.000000000 +0200
++++ ImageMagick-6.9.11-34/configure.ac 2020-10-31 21:59:19.453180549 +0100
+@@ -1512,7 +1512,7 @@
      AC_MSG_CHECKING([for X11])
      AC_MSG_RESULT([])
      LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,16 +9,16 @@
      LIBS="$X11_LIBS $LIBS"
      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
  
-@@ -1515,7 +1515,7 @@
+@@ -1539,7 +1539,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'
-@@ -3860,9 +3860,9 @@
+@@ -3869,9 +3869,9 @@
  #
  
  if test "$build_modules" != 'no'; then
@@ -29,7 +29,7 @@
 +    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            $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_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 f854493aa7f7fd0ba99b3baf13b5d047ee1d2af5..4d40a0a5e615ac9d39e47e98e04206c86a34ca0d 100644 (file)
--- a/ImageMagick-lt.patch
+++ b/ImageMagick-lt.patch
@@ -1,6 +1,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 @@
+--- ImageMagick-6.9.11-34/configure.ac.orig    2020-10-31 22:00:55.255994873 +0100
++++ ImageMagick-6.9.11-34/configure.ac 2020-10-31 22:03:29.635158530 +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 806616116b55d836e2bf11cbe987720ae75f1254..4f29effb0916aa1b5e3b464359184ed243729c42 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -22,7 +22,7 @@
 
 %define                origname        ImageMagick
 %define                ver     6.9.11
-%define                pver    0
+%define                pver    34
 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
@@ -39,7 +39,7 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       https://www.imagemagick.org/download/releases/%{origname}-%{ver}-%{pver}.tar.xz
-# Source0-md5: de247df68cebc0d96cc4947576ea3c0a
+# Source0-md5: fcc7d47c06e9047b1d9383dd624431f3
 Patch0:                config.patch
 Patch1:                %{origname}-link.patch
 Patch2:                %{origname}-libpath.patch
@@ -904,8 +904,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
@@ -990,6 +988,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

diff --git a/magick6.patch b/magick6.patch
index ff0c79148c3973f8e7d4c83135c7ca4700ec05ec..dd4226ec5576e2d6fcf01733f2053f51138a9d8e 100644 (file)
--- a/magick6.patch
+++ b/magick6.patch
@@ -55,31 +55,6 @@
        exit 1
  fi
  
-@@ -38,19 +38,19 @@
-       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
-       ;;
-     --cflags)
--      @PKG_CONFIG@ --cflags MagickCore
-+      @PKG_CONFIG@ --cflags MagickCore6
-       ;;
-     --cxxflags)
--      @PKG_CONFIG@ --cflags MagickCore
-+      @PKG_CONFIG@ --cflags MagickCore6
-       ;;
-     --cppflags)
--      @PKG_CONFIG@ --cflags MagickCore
-+      @PKG_CONFIG@ --cflags MagickCore6
-       ;;
-     --ldflags)
--      @PKG_CONFIG@ --libs MagickCore
-+      @PKG_CONFIG@ --libs MagickCore6
-       ;;
-     --libs)
--      @PKG_CONFIG@ --libs MagickCore
-+      @PKG_CONFIG@ --libs MagickCore6
-       ;;
-     *)
-       echo "${usage}" 1>&2
 --- 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 @@
@@ -96,31 +71,6 @@
        exit 1
  fi
  
-@@ -38,19 +38,19 @@
-       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
-       ;;
-     --cflags)
--      @PKG_CONFIG@ --cflags MagickWand
-+      @PKG_CONFIG@ --cflags MagickWand6
-       ;;
-     --cxxflags)
--      @PKG_CONFIG@ --cflags MagickWand
-+      @PKG_CONFIG@ --cflags MagickWand6
-       ;;
-     --cppflags)
--      @PKG_CONFIG@ --cflags MagickWand
-+      @PKG_CONFIG@ --cflags MagickWand6
-       ;;
-     --ldflags)
--      @PKG_CONFIG@ --libs MagickWand
-+      @PKG_CONFIG@ --libs MagickWand6
-       ;;
-     --libs)
--      @PKG_CONFIG@ --libs MagickWand
-+      @PKG_CONFIG@ --libs MagickWand6
-       ;;
-     *)
-       echo "${usage}" 1>&2
 --- ImageMagick-6.9.7-0/wand/Wand-config.in~   2016-12-18 14:34:45.000000000 +0100
 +++ ImageMagick-6.9.7-0/wand/Wand-config.in    2016-12-27 08:39:14.421666371 +0100
 @@ -8,11 +8,11 @@