- up to 7.0.7.14; new codec HEIC

diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
deleted file mode 100644 (file)
index 126afbd..0000000
--- a/ImageMagick-link.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ImageMagick-7.0.6-9/configure.ac~  2017-08-23 15:30:42.000000000 +0300
-+++ ImageMagick-7.0.6-9/configure.ac   2017-08-23 15:52:29.056654862 +0300
-@@ -1587,7 +1587,7 @@
-     AC_MSG_CHECKING([for X11])
-     AC_MSG_RESULT([])
-     LDFLAGS="$LDFLAGS $X_LIBS"
--    X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+    X11_LIBS="-lX11 $X_EXTRA_LIBS"
-     LIBS="$X11_LIBS $LIBS"
-     CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- 
-@@ -1614,7 +1614,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',,)
--    LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
-+    LIBS="$XEXT_LIBS $LIBS"
- fi
- if test "$no_x" != 'yes'; then
-   have_x='yes'
-@@ -3800,9 +3800,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"
- 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 $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 $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 $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
- fi
- AC_SUBST(MAGICK_DEP_LIBS)
- 

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 90db7dba518f5c07e5f4ae0d3f722dd0d2cb5cd9..036b7920a3c3f69bd107f45d021c66791d35e0d3 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -21,7 +21,7 @@
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %define                ver     7.0.7
-%define                pver    10
+%define                pver    14
 %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
@@ -39,9 +39,9 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 2cc8726fe38e1ba0677f6b9d607de7d1
+# Source0-md5: 9dec772013f8f488acaa21434de5bf74
 Patch0:                config.patch
-Patch1:                %{name}-link.patch
+
 Patch2:                %{name}-libpath.patch
 Patch3:                %{name}-ldflags.patch
 Patch4:                %{name}-lt.patch
@@ -677,7 +677,7 @@ Moduł kodera dla plików WMF.
 %prep
 %setup -q -n %{name}-%{ver}-%{pver}
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -819,6 +819,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/gray.la
 %attr(755,root,root) %{modulesdir}/coders/hald.so
 %{modulesdir}/coders/hald.la
+%attr(755,root,root) %{modulesdir}/coders/heic.so
+%{modulesdir}/coders/heic.la
 %attr(755,root,root) %{modulesdir}/coders/hdr.so
 %{modulesdir}/coders/hdr.la
 %attr(755,root,root) %{modulesdir}/coders/histogram.so
@@ -1012,9 +1014,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.4
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.5
 %attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.4
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.5
 %dir %{_libdir}/ImageMagick-%{ver}
 %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
 %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1193,7 +1195,7 @@ rm -rf $RPM_BUILD_ROOT
 %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.3
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.4
 
 %files c++-devel
 %defattr(644,root,root,755)