[packages/ImageMagick/ImageMagick-6] - updated to 6.9.12-44 (new sonames, xtrn coder dropped) - updated config,link patches - added autot
qboosh
qboosh at pld-linux.org
Tue Apr 12 21:26:09 CEST 2022
commit 5bdfbe6e93a696a653dfaf609f93c7b04df2ca2a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 12 21:26:07 2022 +0200
- updated to 6.9.12-44 (new sonames, xtrn coder dropped)
- updated config,link patches
- added autotrace patch (back to 0.31.1)
ImageMagick-link.patch | 18 +++++++++---------
ImageMagick.spec | 38 ++++++++++++++++++++++----------------
config.patch | 10 +++++++---
3 files changed, 38 insertions(+), 28 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 055ab70..3c19bf0 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,4 +1,5 @@
# TODO
+# - jxl via brunsli (or wait for port to libjxl?)
# - create sane default policy file:
# https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801
#
@@ -21,8 +22,8 @@
%bcond_without autotrace # Autotrace support in SVG module
%define origname ImageMagick
-%define ver 6.9.11
-%define pver 34
+%define ver 6.9.12
+%define pver 44
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
@@ -34,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: 5
+Release: 1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
Source0: https://www.imagemagick.org/download/releases/%{origname}-%{ver}-%{pver}.tar.xz
-# Source0-md5: fcc7d47c06e9047b1d9383dd624431f3
+# Source0-md5: 5ac7128caf53b6f742c5acdf63f4bb1a
Patch0: config.patch
Patch1: %{origname}-link.patch
Patch2: %{origname}-libpath.patch
@@ -48,6 +49,7 @@ Patch4: %{origname}-lt.patch
Patch5: perlmagick.patch
Patch6: magick6.patch
Patch7: %{origname}-OpenCL.patch
+Patch8: %{origname}-autotrace.patch
URL: https://legacy.imagemagick.org/
%{?with_opencl:BuildRequires: OpenCL-devel}
BuildRequires: OpenEXR-devel >= 1.0.6
@@ -79,7 +81,7 @@ BuildRequires: librsvg-devel >= 2.9.0
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: libtool >= 2:2.2
-BuildRequires: libwebp-devel >= 0.4.4
+BuildRequires: libwebp-devel >= 0.5.0
%{?with_wmf:BuildRequires: libwmf-devel >= 2:0.2.2}
BuildRequires: libxml2-devel >= 2.0
%{?with_openjpeg:BuildRequires: openjpeg2-devel >= 2.1.0}
@@ -99,8 +101,12 @@ BuildRequires: zstd-devel >= 1.0.0
BuildRequires: zlib-devel >= 1.0.0
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Suggests: shared-color-profiles
-Obsoletes: ImageMagick-coder-dps
-Obsoletes: ImageMagick-coder-mpeg
+Obsoletes: ImageMagick-coder-braille < 1:6.4.1.3-2
+Obsoletes: ImageMagick-coder-dds < 1:6.4.1.3-2
+Obsoletes: ImageMagick-coder-dps < 1:6.2.6.0-3
+Obsoletes: ImageMagick-coder-hdf < 1:5.5.2.5
+Obsoletes: ImageMagick-coder-xps < 1:6.4.1.3-2
+Obsoletes: ImageMagick-coder-mpeg < 1:5.5.2.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%if 0%{!?QuantumDepth:1}
@@ -298,7 +304,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: perl-dirs
Provides: ImageMagick-perl = %{epoch}:%{version}-%{release}
-Obsoletes: ImageMagick-perl
+Obsoletes: ImageMagick-perl < 1:6.6.1.1-4
%description -n perl-%{name}
This is the ImageMagick Perl support package. It perl modules and
@@ -687,7 +693,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
+Requires: libwebp >= 0.5.0
%description coder-webp
Coder module for WebP files.
@@ -717,6 +723,7 @@ Moduł kodera dla plików WMF.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1 -R
find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
@@ -742,6 +749,7 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
--with-autotrace%{!?with_autotrace:=no} \
--with-djvu%{!?with_djvu:=no} \
--with-dps=no \
+ --with-fftw \
--with-fpx%{!?with_fpx:=no} \
--with-gs-font-dir=%{_fontsdir}/Type1 \
--with-gslib%{!?with_gs:=no} \
@@ -792,7 +800,7 @@ cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
# packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{origname}-%{mver}/{ChangeLog,LICENSE,NEWS.txt}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{origname}-%{mver}/{ChangeLog.md,LICENSE,NEWS.txt}
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -1010,8 +1018,6 @@ rm -rf $RPM_BUILD_ROOT
%{modulesdir}/coders/xps.la
%attr(755,root,root) %{modulesdir}/coders/x.so
%{modulesdir}/coders/x.la
-%attr(755,root,root) %{modulesdir}/coders/xtrn.so
-%{modulesdir}/coders/xtrn.la
%attr(755,root,root) %{modulesdir}/coders/xwd.so
%{modulesdir}/coders/xwd.la
%attr(755,root,root) %{modulesdir}/coders/ycbcr.so
@@ -1053,11 +1059,11 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
-%doc ChangeLog LICENSE AUTHORS.txt
+%doc ChangeLog.md LICENSE AUTHORS.txt
%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.6
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.7
%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.6
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.7
%dir %{_libdir}/ImageMagick-%{ver}
%dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
%{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1256,7 +1262,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.8
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.9
%files c++-devel
%defattr(644,root,root,755)
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 0968b2e..5701102 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- ImageMagick-6.9.12-44/configure.ac.orig 2022-03-27 14:17:02.000000000 +0200
++++ ImageMagick-6.9.12-44/configure.ac 2022-04-12 19:42:26.292592350 +0200
+@@ -1471,7 +1471,7 @@ if test "$no_x" != 'yes'; then
AC_MSG_CHECKING([for X11])
AC_MSG_RESULT([])
LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,7 +9,7 @@
LIBS="$X11_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-@@ -1539,7 +1539,7 @@
+@@ -1498,7 +1498,7 @@ if test "$no_x" != 'yes'; then
#
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,15 @@
fi
if test "$no_x" != 'yes'; then
have_x='yes'
-@@ -3869,9 +3869,9 @@
+@@ -3862,9 +3862,9 @@ fi
#
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 $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_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 $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 $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"
+- 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 $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 $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 $MATH_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
fi
MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
AC_SUBST([MAGICK_DEP_LIBS])
diff --git a/config.patch b/config.patch
index 214a933..4f9aa3f 100644
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- ImageMagick-6.9.12-44/config/policy.xml.orig 2022-04-12 19:26:30.564436640 +0200
++++ ImageMagick-6.9.12-44/config/policy.xml 2022-04-12 19:39:15.813624263 +0200
+@@ -68,10 +68,7 @@
<!-- <policy domain="resource" name="thread" value="4"/> -->
<!-- <policy domain="resource" name="throttle" value="0"/> -->
<!-- <policy domain="resource" name="time" value="3600"/> -->
@@ -11,6 +11,10 @@
<!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
<!-- <policy domain="cache" name="synchronize" value="True"/> -->
<!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+@@ -79,4 +76,18 @@
+ <!-- <policy domain="system" name="shred" value="2"/> -->
+ <!-- <policy domain="system" name="precision" value="6"/> -->
+ <!-- <policy domain="system" name="font" value="/path/to/font.ttf"/> -->
+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+ <policy domain="coder" rights="none" pattern="URL" />
+ <policy domain="coder" rights="none" pattern="HTTPS" />
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/5bdfbe6e93a696a653dfaf609f93c7b04df2ca2a
More information about the pld-cvs-commit
mailing list