commit daaed2dc331dfb8975d47b4c7bf1d8d5873351f8
Author: Jakub Bogusz <[email protected]>
Date: Tue Oct 29 18:38:39 2019 +0100
- updated to 7.0.8-68
- updated link patch
ImageMagick-link.patch | 18 +++++++++---------
ImageMagick.spec | 11 +++++++----
2 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 74abf3e..551a41c 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,4 +1,5 @@
# TODO
+# - jxl delegate, BR: brunsli https://github.com/google/brunsli
# - create sane default policy file:
# https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801
#
@@ -23,7 +24,7 @@
%define libpng_ver 2:1.6.34
%define ver 7.0.8
-%define pver 32
+%define pver 68
%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
@@ -36,12 +37,12 @@ Summary(tr.UTF-8): X altında resim gösterme, çevirme ve
değişiklik yapma
Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X
Window
Name: ImageMagick
Version: %{ver}%{?pver:.%{pver}}
-Release: 2
+Release: 1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
-Source0:
https://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: ef04a7ab79665f8b66991a1859c328bf
+Source0:
https://www.imagemagick.org/download/releases/%{name}-%{ver}-%{pver}.tar.xz
+# Source0-md5: f97e8c077cdc335fc66cf925e64576f9
Patch0: config.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
@@ -963,6 +964,8 @@ rm -rf $RPM_BUILD_ROOT
%{modulesdir}/coders/tile.la
%attr(755,root,root) %{modulesdir}/coders/tim.so
%{modulesdir}/coders/tim.la
+%attr(755,root,root) %{modulesdir}/coders/tim2.so
+%{modulesdir}/coders/tim2.la
%attr(755,root,root) %{modulesdir}/coders/ttf.so
%{modulesdir}/coders/ttf.la
%attr(755,root,root) %{modulesdir}/coders/txt.so
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 16d706f..0e07f7f 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- ImageMagick-7.0.8-68/configure.ac.orig 2019-10-06 00:26:07.000000000
+0200
++++ ImageMagick-7.0.8-68/configure.ac 2019-10-26 20:30:22.370870651 +0200
+@@ -1649,7 +1649,7 @@
AC_MSG_CHECKING([for X11])
AC_MSG_RESULT([])
LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9,7 +9,7 @@
LIBS="$X11_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-@@ -1636,7 +1636,7 @@
+@@ -1676,7 +1676,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',,)
@@ -18,15 +18,15 @@
fi
if test "$no_x" != 'yes'; then
have_x='yes'
-@@ -3915,9 +3915,9 @@
+@@ -4016,9 +4016,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"
+- 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"
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"
+- 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 $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 $TCMALLOC_LIBS"
fi
MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
AC_SUBST(MAGICK_DEP_LIBS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/daaed2dc331dfb8975d47b4c7bf1d8d5873351f8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
