[packages/ImageMagick] - up to 6.9.0.0
arekm
arekm at pld-linux.org
Wed Nov 26 11:07:28 CET 2014
commit 324c50930a60387e90b220f8833110d07b0311aa
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Nov 26 11:07:22 2014 +0100
- up to 6.9.0.0
ImageMagick-link.patch | 11 ++++++-----
ImageMagick-lt.patch | 6 ++++--
ImageMagick-mupdf.patch | 19 -------------------
ImageMagick.spec | 26 ++++++++++++++------------
4 files changed, 24 insertions(+), 38 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index c062346..85190db 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -16,11 +16,10 @@
%bcond_without wmf # WMF module (which uses libwmf library)
# - module feautres:
%bcond_without autotrace # Autotrace support in SVG module
-%bcond_with mupdf # MuPDF support in XPS module (not really used)
%include /usr/lib/rpm/macros.perl
-%define ver 6.8.7
-%define pver 6
+%define ver 6.9.0
+%define pver 0
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
@@ -32,18 +31,18 @@ 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: 6
+Release: 1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 9370a8f672fd1fab779ea9acbd6b0ad4
+# Source0-md5: 3714e7d5d248c13aee95a7f54970349f
Patch0: %{name}-ac.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
Patch4: %{name}-lt.patch
-Patch5: %{name}-mupdf.patch
+
URL: http://www.imagemagick.org/
%{?with_opencl:BuildRequires: OpenCL-devel}
BuildRequires: OpenEXR-devel >= 1.0.6
@@ -75,7 +74,6 @@ BuildRequires: libtool >= 2:2.2
BuildRequires: libwebp-devel
%{?with_wmf:BuildRequires: libwmf-devel >= 2:0.2.2}
BuildRequires: libxml2-devel >= 2.0
-%{?with_mupdf:BuildRequires: mupdf-devel}
BuildRequires: pango-devel >= 1:1.28.1
BuildRequires: perl-devel >= 1:5.8.1
BuildRequires: pkgconfig
@@ -661,7 +659,6 @@ Moduł kodera dla plików WMF.
%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}='
@@ -691,7 +688,6 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
--with-gvc%{!?with_graphviz:=no} \
--with-jp2%{!?with_jasper:=no} \
--with-magick_plus_plus%{!?with_cxx:=no} \
- --with-mupdf%{!?with_mupdf:=no} \
--with-openexr%{!?with_exr:=no} \
--with-wmf%{!?with_wmf:=no} \
--with-gs-font-dir=%{_fontsdir}/Type1 \
@@ -812,6 +808,8 @@ rm -rf $RPM_BUILD_ROOT
%{modulesdir}/coders/info.la
%attr(755,root,root) %{modulesdir}/coders/inline.so
%{modulesdir}/coders/inline.la
+%attr(755,root,root) %{modulesdir}/coders/json.so
+%{modulesdir}/coders/json.la
%attr(755,root,root) %{modulesdir}/coders/ipl.so
%{modulesdir}/coders/ipl.la
%attr(755,root,root) %{modulesdir}/coders/jnx.so
@@ -894,6 +892,8 @@ rm -rf $RPM_BUILD_ROOT
%{modulesdir}/coders/sfw.la
%attr(755,root,root) %{modulesdir}/coders/sgi.so
%{modulesdir}/coders/sgi.la
+%attr(755,root,root) %{modulesdir}/coders/sixel.so
+%{modulesdir}/coders/sixel.la
%attr(755,root,root) %{modulesdir}/coders/stegano.so
%{modulesdir}/coders/stegano.la
%attr(755,root,root) %{modulesdir}/coders/sun.so
@@ -920,6 +920,8 @@ rm -rf $RPM_BUILD_ROOT
%{modulesdir}/coders/vid.la
%attr(755,root,root) %{modulesdir}/coders/viff.so
%{modulesdir}/coders/viff.la
+%attr(755,root,root) %{modulesdir}/coders/vips.so
+%{modulesdir}/coders/vips.la
%attr(755,root,root) %{modulesdir}/coders/wbmp.so
%{modulesdir}/coders/wbmp.la
%attr(755,root,root) %{modulesdir}/coders/wpg.so
@@ -979,9 +981,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ChangeLog LICENSE AUTHORS.txt
%attr(755,root,root) %{_libdir}/libMagickCore-6.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore-6.%{abisuf}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-6.%{abisuf}.so.2
%attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-6.%{abisuf}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-6.%{abisuf}.so.2
%dir %{_libdir}/ImageMagick-%{ver}
%dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
%{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1162,7 +1164,7 @@ rm -rf $RPM_BUILD_ROOT
%files c++
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.3
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.5
%files c++-devel
%defattr(644,root,root,755)
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 960dcc7..ec8d5ec 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -18,15 +18,16 @@
fi
if test "$no_x" != 'yes'; then
have_x='yes'
-@@ -3865,9 +3865,9 @@
+@@ -3972,9 +3972,9 @@
#
if test "$build_modules" != 'no'; then
-- MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_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 $THREAD_LIBS"
-+ MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_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 $THREAD_LIBS"
+- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_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 $LQR_LIBS $FFTW_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="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_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 $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
-+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
+- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_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 $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 $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_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 $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-lt.patch b/ImageMagick-lt.patch
index 36956c4..e9aef45 100644
--- a/ImageMagick-lt.patch
+++ b/ImageMagick-lt.patch
@@ -1,9 +1,11 @@
--- ImageMagick-6.6.6-7/configure.ac~ 2010-12-27 13:27:17.432375100 +0100
+++ ImageMagick-6.6.6-7/configure.ac 2010-12-27 13:30:28.809041767 +0100
-@@ -513,10 +513,6 @@
+--- configure.ac~ 2014-11-26 10:14:50.000000000 +0100
++++ configure.ac 2014-11-26 10:15:09.968560186 +0100
+@@ -512,10 +512,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"
diff --git a/ImageMagick-mupdf.patch b/ImageMagick-mupdf.patch
deleted file mode 100644
index fd4838d..0000000
--- a/ImageMagick-mupdf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ImageMagick-6.8.7-3/configure.ac.orig 2013-11-01 09:48:55.513688836 +0100
-+++ ImageMagick-6.8.7-3/configure.ac 2013-11-02 15:48:26.215824407 +0100
-@@ -2515,14 +2515,14 @@
- failed=0
- passed=0
- AC_CHECK_HEADER(mupdf/fitz.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-- AC_CHECK_LIB(mupdf,fz_new_context,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-lmupdf $FREETYPE_LIBS)
-+ AC_CHECK_LIB(mupdf,fz_new_context,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-lmupdf-js-none $FREETYPE_LIBS)
- AC_MSG_CHECKING([if MUPDF package is complete])
- if test $passed -gt 0; then
- if test $failed -gt 0; then
- AC_MSG_RESULT([no -- some components failed test])
- have_mupdf='no (failed tests)'
- else
-- MUPDF_LIBS='-lmupdf'
-+ MUPDF_LIBS='-lmupdf -lmupdf-js-none'
- LIBS="$MUPDF_LIBS $LIBS"
- AC_DEFINE(MUPDF_DELEGATE,1,Define if you have MUPDF library)
- AC_MSG_RESULT([yes])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/324c50930a60387e90b220f8833110d07b0311aa
More information about the pld-cvs-commit
mailing list