[packages/ImageMagick] - updated to 7.0.8-19 - updated ldflags,lt patches - restored link patch - added OpenCL patch (adjus

qboosh qboosh at pld-linux.org
Sat Dec 22 18:46:52 CET 2018 

commit e984c4b52bbe62ea8e326debac53a1b066521962
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 22 18:51:26 2018 +0100

    - updated to 7.0.8-19
    - updated ldflags,lt patches
    - restored link patch
    - added OpenCL patch (adjust dlopen name to libOpenCL.so.1)
    - moved dng and heic coders to subpackages (depend on libraw and libheif resp.)
    - libde265 is libheif dependency, gettext-devel seems no longer valid

 ImageMagick-OpenCL.patch  |  11 +++++
 ImageMagick-ldflags.patch |   8 ++--
 ImageMagick-link.patch    | 113 ++++++++++++++++++++++++++++++++++++++++++++++
 ImageMagick-lt.patch      |   8 ++--
 ImageMagick.spec          |  68 ++++++++++++++++++++++------
 5 files changed, 185 insertions(+), 23 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index a2a4c20..cf12f1d 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -23,7 +23,7 @@
 %define	libpng_ver 2:1.6.34
 
 %define		ver	7.0.8
-%define		pver	14
+%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
@@ -41,12 +41,13 @@ Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
 Source0:	https://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5:	6d6dc362db8bc3a4049be9aa9d34325c
+# Source0-md5:	37e0da476b9718baa341f16393b32514
 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/
 %{?with_opencl:BuildRequires:	OpenCL-devel}
 BuildRequires:	OpenEXR-devel >= 1.0.6
@@ -61,12 +62,10 @@ BuildRequires:	flif-devel
 BuildRequires:	fontconfig-devel >= 2.1.0
 BuildRequires:	freetype-devel >= 2.0.2-2
 %{?with_openmp:BuildRequires:	gcc-c++ >= 6:4.2}
-BuildRequires:	gettext-devel
 %{?with_gs:BuildRequires:	ghostscript-devel}
 %{?with_graphviz:BuildRequires:	graphviz-devel >= 2.9.0}
 BuildRequires:	jbigkit-devel
 BuildRequires:	lcms2-devel >= 2.0
-BuildRequires:	libde265-devel
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
 %{?with_openmp:BuildRequires:	libgomp-devel}
 BuildRequires:	libheif-devel
@@ -75,11 +74,12 @@ BuildRequires:	liblqr-devel >= 0.1.0
 BuildRequires:	libltdl-devel
 BuildRequires:	libpng-devel >= %{libpng_ver}
 %{?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}
@@ -96,6 +96,7 @@ BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xz
 BuildRequires:	xz-devel >= 2.9.0
 BuildRequires:	zlib-devel >= 1.0.0
+BuildRequires:	zstd-devel >= 1.0.0
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Suggests:	shared-color-profiles
 Obsoletes:	ImageMagick-coder-dps
@@ -208,12 +209,12 @@ 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
+Requires:	zlib-devel >= 1.0.0
 
 %description devel
 This is the ImageMagick development package. It includes header files
@@ -454,6 +455,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
@@ -504,6 +518,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
@@ -660,6 +686,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.
@@ -683,10 +710,11 @@ Moduł kodera dla plików WMF.
 %prep
 %setup -q -n %{name}-%{ver}-%{pver}
 %patch0 -p1
-
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
 
@@ -795,6 +823,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/clip.la
 %attr(755,root,root) %{modulesdir}/coders/cmyk.so
 %{modulesdir}/coders/cmyk.la
+%attr(755,root,root) %{modulesdir}/coders/cube.so
+%{modulesdir}/coders/cube.la
 %attr(755,root,root) %{modulesdir}/coders/cut.so
 %{modulesdir}/coders/cut.la
 %attr(755,root,root) %{modulesdir}/coders/dcm.so
@@ -805,8 +835,6 @@ 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
@@ -823,8 +851,6 @@ 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
@@ -1038,6 +1064,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
+
 %if %{with graphviz}
 %files coder-dot
 %defattr(644,root,root,755)
@@ -1068,6 +1100,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)
@@ -1130,7 +1168,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/ImageMagick-OpenCL.patch b/ImageMagick-OpenCL.patch
new file mode 100644
index 0000000..a275c51
--- /dev/null
+++ b/ImageMagick-OpenCL.patch
@@ -0,0 +1,11 @@
+--- ImageMagick-7.0.8-19/MagickCore/opencl.c.orig	2018-12-22 17:26:37.420370732 +0100
++++ ImageMagick-7.0.8-19/MagickCore/opencl.c	2018-12-22 17:31:49.203700501 +0100
+@@ -2460,7 +2460,7 @@
+ #ifdef MAGICKCORE_WINDOWS_SUPPORT
+   openCL_library->library=(void *)LoadLibraryA("OpenCL.dll");
+ #else
+-  openCL_library->library=(void *)dlopen("libOpenCL.so", RTLD_NOW);
++  openCL_library->library=(void *)dlopen("libOpenCL.so.1", RTLD_NOW);
+ #endif
+ #define BIND(X) \
+   if ((openCL_library->X=(MAGICKpfn_##X)OsLibraryGetFunctionAddress(openCL_library->library,#X)) == NULL) \
diff --git a/ImageMagick-ldflags.patch b/ImageMagick-ldflags.patch
index 231f931..1fd516b 100644
--- a/ImageMagick-ldflags.patch
+++ b/ImageMagick-ldflags.patch
@@ -1,6 +1,6 @@
---- ImageMagick-7.0.8-14/configure.ac~	2018-10-24 20:04:34.000000000 +0300
-+++ ImageMagick-7.0.8-14/configure.ac	2018-10-24 20:06:02.215578717 +0300
-@@ -3939,7 +3939,22 @@
+--- ImageMagick-7.0.8-19/configure.ac.orig	2018-12-22 17:19:38.433708851 +0100
++++ ImageMagick-7.0.8-19/configure.ac	2018-12-22 17:25:41.310371371 +0100
+@@ -3937,7 +3937,22 @@
  MAGICK_CXXFLAGS="$CXXFLAGS"
  MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
  MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
@@ -21,6 +21,6 @@
 +  esac
 +done
 +LDFLAGS="$new_LDFLAGS"
- MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_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
new file mode 100644
index 0000000..16d706f
--- /dev/null
+++ b/ImageMagick-link.patch
@@ -0,0 +1,113 @@
+--- ImageMagick-7.0.8-19/configure.ac.orig	2018-12-22 17:08:34.543716430 +0100
++++ ImageMagick-7.0.8-19/configure.ac	2018-12-22 17:18:16.820376446 +0100
+@@ -1609,7 +1609,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"
+ 
+@@ -1636,7 +1636,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'
+@@ -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 $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"
++    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 $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 $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"
+ 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 9a6f309..ce57ad0 100644
--- 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-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 @@
          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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/e984c4b52bbe62ea8e326debac53a1b066521962

More information about the pld-cvs-commit mailing list