commit c8d07ff40c76af63df5a84177cbd8c3c93927cea
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Fri Apr 26 05:27:09 2024 +0200
- updated to 7.1.1-31
ImageMagick-OpenCL.patch | 12 ++++++------
ImageMagick-autotrace.patch | 32 --------------------------------
ImageMagick-ldflags.patch | 11 +++++------
ImageMagick-link.patch | 16 ++++++++--------
ImageMagick-perl.patch | 13 +++++++++++++
ImageMagick.spec | 18 ++++++++----------
6 files changed, 40 insertions(+), 62 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index cc09fad..c199212 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -27,7 +27,7 @@
%define libpng_ver 2:1.6.34
%define ver 7.1.1
-%define pver 19
+%define pver 31
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
@@ -43,21 +43,20 @@ Release: 1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
-Source0:
https://www.imagemagick.org/download/releases/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: a019ee22b76315cc30813e13561e21d1
-
+Source0:
https://download.imagemagick.org/archive/releases/%{name}-%{ver}-%{pver}.tar.lz
+# Source0-md5: 70ca8d5bed3e99dd9b828571b78825d8
+Patch0: %{name}-perl.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
Patch4: %{name}-lt.patch
Patch5: %{name}-OpenCL.patch
-Patch6: %{name}-autotrace.patch
URL: https://imagemagick.org/
%{?with_opencl:BuildRequires: OpenCL-devel}
%{?with_exr:BuildRequires: OpenEXR-devel >= 1.0.6}
BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.12
-%{?with_autotrace:BuildRequires: autotrace-devel >= 0.31.1}
+%{?with_autotrace:BuildRequires: autotrace-devel >= 0.31.2}
BuildRequires: bzip2-devel >= 1.0.1
%{?with_djvu:BuildRequires: djvulibre-devel >= 3.5.0}
BuildRequires: expat-devel >= 1.95.7
@@ -88,6 +87,7 @@ BuildRequires: libwebp-devel >= 0.5.0
%{?with_wmf:BuildRequires: libwmf-devel >= 2:0.2.2}
BuildRequires: libxml2-devel >= 2.0
BuildRequires: libzip-devel >= 1.0.0
+BuildRequires: lzip
%{?with_openjpeg:BuildRequires: openjpeg2-devel >= 2.1.0}
BuildRequires: pango-devel >= 1:1.28.1
BuildRequires: perl-devel >= 1:5.8.1
@@ -99,7 +99,6 @@ BuildRequires: tar >= 1:1.22
#BuildRequires: txt2html
BuildRequires: xorg-lib-libX11-devel
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
@@ -747,13 +746,12 @@ 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
-%patch6 -p1 -R
find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e
's=!/usr/local/bin/perl=!%{__perl}='
@@ -822,7 +820,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}/%{name}-%{mver}/{LICENSE,NEWS.txt}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{mver}/LICENSE
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
diff --git a/ImageMagick-OpenCL.patch b/ImageMagick-OpenCL.patch
index 3ceba12..072cc0a 100644
--- a/ImageMagick-OpenCL.patch
+++ b/ImageMagick-OpenCL.patch
@@ -1,11 +1,11 @@
---- ImageMagick-7.0.11-14/MagickCore/opencl.c.orig 2022-04-11
22:18:32.449920499 +0200
-+++ ImageMagick-7.0.11-14/MagickCore/opencl.c 2022-04-12 06:23:14.996566315
+0200
-@@ -2509,7 +2509,7 @@ static MagickBooleanType BindOpenCLFunct
+--- ImageMagick-7.1.1-31/MagickCore/opencl.c.orig 2024-04-25
20:19:45.713297893 +0200
++++ ImageMagick-7.1.1-31/MagickCore/opencl.c 2024-04-25 20:53:35.772300120
+0200
+@@ -2484,7 +2484,7 @@ static MagickBooleanType BindOpenCLFunct
#ifdef MAGICKCORE_WINDOWS_SUPPORT
- openCL_library->library=(void *)LoadLibraryA("OpenCL.dll");
+ openCL_library->library=(void *)lt_dlopen("OpenCL.dll");
#else
-- openCL_library->library=(void *)dlopen("libOpenCL.so",RTLD_NOW);
-+ openCL_library->library=(void *)dlopen("libOpenCL.so.1",RTLD_NOW);
+- openCL_library->library=(void *)lt_dlopen("libOpenCL.so");
++ openCL_library->library=(void *)lt_dlopen("libOpenCL.so.1");
#endif
#define BIND(X) \
if
((openCL_library->X=(MAGICKpfn_##X)OsLibraryGetFunctionAddress(openCL_library->library,#X))
== NULL) \
diff --git a/ImageMagick-autotrace.patch b/ImageMagick-autotrace.patch
deleted file mode 100644
index e441363..0000000
--- a/ImageMagick-autotrace.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 51968547b98bde1cd6c6cc7145faf3cc1f365a22
-Author: Cristy <mikayla-gr...@urban-warrior.org>
-Date: Sat Feb 22 09:54:09 2020 -0500
-
- https://github.com/ImageMagick/ImageMagick/issues/1848
-
-diff --git a/coders/svg.c b/coders/svg.c
-index 199475a49..172ec558c 100644
---- a/coders/svg.c
-+++ b/coders/svg.c
-@@ -3931,7 +3931,7 @@ static MagickBooleanType TraceSVGImage(Image
*image,ExceptionInfo *exception)
- {
- #if defined(MAGICKCORE_AUTOTRACE_DELEGATE)
- {
-- at_bitmap_type
-+ at_bitmap
- *trace;
-
- at_fitting_opts_type
-diff --git a/configure.ac b/configure.ac
-index cc5d2344c..9eec1941a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1714,7 +1714,7 @@ AUTOTRACE_LIBS=""
- AUTOTRACE_PKG=""
- if test "x$with_autotrace" = "xyes"; then
-
AC_MSG_RESULT([-------------------------------------------------------------])
-- PKG_CHECK_MODULES([AUTOTRACE],[autotrace >=
0.31.1],[have_autotrace=yes],[have_autotrace=no])
-+ PKG_CHECK_MODULES([AUTOTRACE],[autotrace >=
0.31.2],[have_autotrace=yes],[have_autotrace=no])
- AC_MSG_RESULT([])
- fi
-
diff --git a/ImageMagick-ldflags.patch b/ImageMagick-ldflags.patch
index 10eea73..cb02b02 100644
--- a/ImageMagick-ldflags.patch
+++ b/ImageMagick-ldflags.patch
@@ -1,7 +1,6 @@
-diff -urNp -x '*.orig' ImageMagick-7.0.10-60.org/configure.ac
ImageMagick-7.0.10-60/configure.ac
---- ImageMagick-7.0.10-60.org/configure.ac 2021-05-07 22:44:36.399778071
+0200
-+++ ImageMagick-7.0.10-60/configure.ac 2021-05-07 22:44:37.156444998 +0200
-@@ -3961,7 +3961,22 @@ MAGICK_CFLAGS=$CFLAGS
+--- ImageMagick-7.1.1-31/configure.ac.orig 2024-04-25 20:17:34.194010394
+0200
++++ ImageMagick-7.1.1-31/configure.ac 2024-04-25 20:19:23.783416698 +0200
+@@ -4160,7 +4160,22 @@ MAGICK_CFLAGS=$CFLAGS
MAGICK_CXXFLAGS="$CXXFLAGS"
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
@@ -23,5 +22,5 @@ diff -urNp -x '*.orig' ImageMagick-7.0.10-60.org/configure.ac
ImageMagick-7.0.10
+done
+LDFLAGS="$new_LDFLAGS"
MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
-
- AC_SUBST([MAGICK_CFLAGS])
+ MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'`
+ MAGICK_EXTRA_DEP_LIBS=`echo $MAGICK_EXTRA_DEP_LIBS | sed -e 's/ */ /g'`
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 444eaeb..c7c52a9 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- ImageMagick-7.0.11-14/configure.ac.orig 2021-05-31 15:35:02.000000000
+0200
-+++ ImageMagick-7.0.11-14/configure.ac 2022-04-11 22:17:59.016768289 +0200
-@@ -1491,7 +1491,7 @@ if test "$no_x" != 'yes'; then
+--- ImageMagick-7.1.1-31/configure.ac.orig 2024-04-21 15:36:48.000000000
+0200
++++ ImageMagick-7.1.1-31/configure.ac 2024-04-25 20:17:02.137517393 +0200
+@@ -1553,7 +1553,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"
-@@ -1518,7 +1518,7 @@ if test "$no_x" != 'yes'; then
+@@ -1580,7 +1580,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'
-@@ -4029,9 +4029,9 @@ fi
+@@ -4131,9 +4131,9 @@ fi
#
if test "$build_modules" != 'no'; then
- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $DMR_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 $ZIP_LIBS
$ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS $MTMALLOC_LIBS"
-+ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $DMR_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 $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS $MTMALLOC_LIBS"
++ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $DMR_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 $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS $MTMALLOC_LIBS"
else
-- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $DMR_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 $ZIP_LIBS
$ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS $MTMALLOC_LIBS"
-+ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $DMR_LIBS $TIFF_LIBS
$FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS
$AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS
$HEIF_LIBS $WEBPMUX_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
$LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS $MTMALLOC_LIBS"
+- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $DMR_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 $ZIP_LIBS
$ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS $MTMALLOC_LIBS $UHDR_LIBS"
++ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $DMR_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 $ZIP_LIBS
$ZSTD_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS
$THREAD_LIBS $TCMALLOC_LIBS $MTMALLOC_LIBS $UHDR_LIBS"
fi
MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
AC_SUBST([MAGICK_DEP_LIBS])
diff --git a/ImageMagick-perl.patch b/ImageMagick-perl.patch
new file mode 100644
index 0000000..3321fe3
--- /dev/null
+++ b/ImageMagick-perl.patch
@@ -0,0 +1,13 @@
+Drop INSTALL_BASE so that INSTALLDIRS=vendor has effect
+--- ImageMagick-7.1.1-31/PerlMagick/Makefile.PL.in.orig 2024-04-21
15:36:48.000000000 +0200
++++ ImageMagick-7.1.1-31/PerlMagick/Makefile.PL.in 2024-04-25
21:18:39.450820661 +0200
+@@ -223,9 +223,6 @@ WriteMakefile
+ # Linker flags for building a dynamically loadable module
+ 'LDDLFLAGS' => $LDDLFLAGS_magick,
+
+- # Install PerlMagick into ImageMagick prefix
+- 'INSTALL_BASE' => '@PREFIX_DIR@',
+-
+ # Install PerlMagick binary into ImageMagick bin directory
+ 'INSTALLBIN' => '@BIN_DIR@',
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/c8d07ff40c76af63df5a84177cbd8c3c93927cea
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
