[packages/ImageMagick] - updated to 6.8.4-8 (new library names; ImageMagick 6.7.x left on ImageMagick-6.7 branch) - updated
qboosh
qboosh at pld-linux.org
Tue Apr 9 20:35:25 CEST 2013
commit 8ee30ebe64ed0c43afcce9a685709f59cc171cdb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 9 20:35:35 2013 +0200
- updated to 6.8.4-8 (new library names; ImageMagick 6.7.x left on ImageMagick-6.7 branch)
- updated link,ldflags patches
- removed obsolete agread-param patch
ImageMagick-ldflags.patch | 8 ++---
ImageMagick-link.patch | 20 +++++------
ImageMagick.spec | 91 ++++++++++++++++++++++++++++-------------------
agread-param.patch | 32 -----------------
4 files changed, 69 insertions(+), 82 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 9e67527..f925fec 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -18,9 +18,8 @@
%bcond_without autotrace # Autotrace support in SVG module
%include /usr/lib/rpm/macros.perl
-%define ver 6.7.9
-%define pver 10
-%define QuantumDepth 16
+%define ver 6.8.4
+%define pver 8
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
@@ -36,14 +35,13 @@ Release: 1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
-Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/legacy/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: e6c4da963f7651674dca48f2b9f575bb
+Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
+# Source0-md5: 880879dbf6e3c6e8fe610e98a229b9c4
Patch0: %{name}-ac.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
Patch4: %{name}-lt.patch
-Patch5: agread-param.patch
URL: http://www.imagemagick.org/
%{?with_opencl:BuildRequires: OpenCL-devel}
BuildRequires: OpenEXR-devel >= 1.0.6
@@ -76,7 +74,7 @@ BuildRequires: libwebp-devel
%{?with_wmf:BuildRequires: libwmf-devel >= 2:0.2.2}
BuildRequires: libxml2-devel >= 2.0
BuildRequires: pango-devel >= 1:1.28.1
-BuildRequires: perl-devel >= 1:5.8.0
+BuildRequires: perl-devel >= 1:5.8.1
BuildRequires: pkgconfig
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.315
@@ -93,7 +91,9 @@ Obsoletes: ImageMagick-coder-dps
Obsoletes: ImageMagick-coder-mpeg
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define modulesdir %{_libdir}/ImageMagick-%{ver}/modules-Q%{QuantumDepth}
+%define QuantumDepth 16
+%define abisuf Q%{QuantumDepth}%{?with_hdri:HDRI}
+%define modulesdir %{_libdir}/ImageMagick-%{ver}/modules-%{abisuf}
%description
ImageMagick is an image display, conversion, and manipulation tool. It
@@ -656,7 +656,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}='
@@ -670,7 +669,6 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
%{__autoheader}
%{__automake}
%configure \
- --disable-ltdl-install \
%{!?with_opencl:--disable-opencl} \
%{!?with_gomp:--disable-openmp} \
--disable-silent-rules \
@@ -694,7 +692,8 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
--with-perl-options="INSTALLDIRS=vendor" \
--with-quantum-depth=%{QuantumDepth} \
--with-threads \
- --with-x
+ --with-x \
+ --with-webp
%{__make} -j1
%{__sed} -i -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
@@ -708,10 +707,12 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
pkgdocdir=%{_docdir}/%{name}-doc-%{version}
cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-6/{ChangeLog,LICENSE,NEWS.txt}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -727,10 +728,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{modulesdir}
%dir %{modulesdir}/coders
%dir %{modulesdir}/filters
-%dir %{_datadir}/ImageMagick-%{ver}
-%{_datadir}/ImageMagick-%{ver}/*.xml
-%dir %{_sysconfdir}/ImageMagick
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ImageMagick/*.xml
+%dir %{_datadir}/ImageMagick-6
+%{_datadir}/ImageMagick-6/*.xml
+%dir %{_sysconfdir}/ImageMagick-6
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ImageMagick-6/*.xml
# ========= coders without additional deps
%attr(755,root,root) %{modulesdir}/coders/aai.so
@@ -811,6 +812,8 @@ rm -rf $RPM_BUILD_ROOT
%{modulesdir}/coders/magick.la
%attr(755,root,root) %{modulesdir}/coders/map.so
%{modulesdir}/coders/map.la
+%attr(755,root,root) %{modulesdir}/coders/mask.so
+%{modulesdir}/coders/mask.la
%attr(755,root,root) %{modulesdir}/coders/mat.so
%{modulesdir}/coders/mat.la
%attr(755,root,root) %{modulesdir}/coders/matte.so
@@ -929,6 +932,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{modulesdir}/filters/analyze.so
%{modulesdir}/filters/analyze.la
+%dir %{_libdir}/ImageMagick-%{ver}/bin-%{abisuf}
+%attr(755,root,root) %{_libdir}/ImageMagick-%{ver}/bin-%{abisuf}/*
+
%attr(755,root,root) %{_bindir}/animate
%attr(755,root,root) %{_bindir}/compare
%attr(755,root,root) %{_bindir}/composite
@@ -961,13 +967,13 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%doc ChangeLog LICENSE AUTHORS.txt
-%attr(755,root,root) %{_libdir}/libMagickCore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore.so.5
-%attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.5
+%attr(755,root,root) %{_libdir}/libMagickCore-6.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-6.%{abisuf}.so.1
+%attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-6.%{abisuf}.so.1
%dir %{_libdir}/ImageMagick-%{ver}
-%dir %{_libdir}/ImageMagick-%{ver}/config
-%{_libdir}/ImageMagick-%{ver}/config/configure.xml
+%dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
+%{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
%files coder-caption
%defattr(644,root,root,755)
@@ -1102,14 +1108,18 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/MagickCore-config
%attr(755,root,root) %{_bindir}/MagickWand-config
%attr(755,root,root) %{_bindir}/Wand-config
-%attr(755,root,root) %{_libdir}/libMagickCore.so
-%attr(755,root,root) %{_libdir}/libMagickWand.so
-%dir %{_includedir}/ImageMagick
-%{_includedir}/ImageMagick/magick
-%{_includedir}/ImageMagick/wand
+%attr(755,root,root) %{_libdir}/libMagickCore-6.%{abisuf}.so
+%attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so
+%dir %{_includedir}/ImageMagick-6
+%{_includedir}/ImageMagick-6/magick
+%{_includedir}/ImageMagick-6/wand
+%{_pkgconfigdir}/ImageMagick-6.%{abisuf}.pc
%{_pkgconfigdir}/ImageMagick.pc
+%{_pkgconfigdir}/MagickCore-6.%{abisuf}.pc
%{_pkgconfigdir}/MagickCore.pc
+%{_pkgconfigdir}/MagickWand-6.%{abisuf}.pc
%{_pkgconfigdir}/MagickWand.pc
+%{_pkgconfigdir}/Wand-6.%{abisuf}.pc
%{_pkgconfigdir}/Wand.pc
%{_mandir}/man1/Magick-config.1*
%{_mandir}/man1/MagickCore-config.1*
@@ -1118,36 +1128,45 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
-%{_libdir}/libMagickCore.a
-%{_libdir}/libMagickWand.a
+%{_libdir}/libMagickCore-6.%{abisuf}.a
+%{_libdir}/libMagickWand-6.%{abisuf}.a
%files -n perl-%{name}
%defattr(644,root,root,755)
%{perl_vendorarch}/Image/Magick.pm
+%dir %{perl_vendorarch}/Image/Magick
+%{perl_vendorarch}/Image/Magick/%{abisuf}.pm
%dir %{perl_vendorarch}/auto/Image/Magick
%{perl_vendorarch}/auto/Image/Magick/autosplit.ix
%{perl_vendorarch}/auto/Image/Magick/Magick.bs
%attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/Magick.so
+%dir %{perl_vendorarch}/auto/Image/Magick/%{abisuf}
+%{perl_vendorarch}/auto/Image/Magick/%{abisuf}/autosplit.ix
+%{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.so
%{_mandir}/man3/Image::Magick.3pm*
+%{_mandir}/man3/Image::Magick::%{abisuf}.3pm*
%{_examplesdir}/%{name}-perl-%{version}
%if %{with cxx}
%files c++
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libMagick++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++.so.5
+%attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.1
%files c++-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Magick++-config
-%attr(755,root,root) %{_libdir}/libMagick++.so
-%{_includedir}/ImageMagick/Magick++
-%{_includedir}/ImageMagick/Magick++.h
+%attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so
+%{_includedir}/ImageMagick-6/Magick++
+%{_includedir}/ImageMagick-6/Magick++.h
+%{_pkgconfigdir}/ImageMagick++-6.%{abisuf}.pc
%{_pkgconfigdir}/ImageMagick++.pc
+%{_pkgconfigdir}/Magick++-6.%{abisuf}.pc
%{_pkgconfigdir}/Magick++.pc
%{_mandir}/man1/Magick++-config.1*
%files c++-static
%defattr(644,root,root,755)
-%{_libdir}/libMagick++.a
+%{_libdir}/libMagick++-6.%{abisuf}.a
%endif
diff --git a/ImageMagick-ldflags.patch b/ImageMagick-ldflags.patch
index 1dfdf90..1a1b3af 100644
--- a/ImageMagick-ldflags.patch
+++ b/ImageMagick-ldflags.patch
@@ -1,6 +1,6 @@
---- ImageMagick-6.4.1/configure.ac.orig 2008-05-27 09:44:58.000000000 +0200
-+++ ImageMagick-6.4.1/configure.ac 2008-05-27 09:46:59.000000000 +0200
-@@ -3086,7 +3086,17 @@
+--- ImageMagick-6.8.4-8/configure.ac.orig 2013-04-09 15:47:16.713625903 +0200
++++ ImageMagick-6.8.4-8/configure.ac 2013-04-09 15:49:29.416956473 +0200
+@@ -3903,7 +3903,17 @@
MAGICK_CXXFLAGS="$CXXFLAGS"
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
@@ -16,6 +16,6 @@
+ ;;
+ esac
+done
- MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
+ MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS"
AC_SUBST(MAGICK_CFLAGS)
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index b138438..960dcc7 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,6 +1,6 @@
---- ImageMagick-6.7.9-10/configure.ac~ 2013-03-20 00:00:39.000000000 +0200
-+++ ImageMagick-6.7.9-10/configure.ac 2013-03-20 00:03:56.927315607 +0200
-@@ -1369,7 +1369,7 @@
+--- ImageMagick-6.8.4-8/configure.ac.orig 2013-04-08 21:28:19.045000250 +0200
++++ ImageMagick-6.8.4-8/configure.ac 2013-04-09 15:46:42.263626622 +0200
+@@ -1519,7 +1519,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"
-@@ -1396,7 +1396,7 @@
+@@ -1546,7 +1546,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'
-@@ -3718,9 +3718,9 @@
- AC_SUBST(MAGICK_LTDLDEPS)
+@@ -3865,9 +3865,9 @@
+ #
- if test "$with_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 $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 $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
+ 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"
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 $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 $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"
fi
AC_SUBST(MAGICK_DEP_LIBS)
diff --git a/agread-param.patch b/agread-param.patch
deleted file mode 100644
index 834fdf5..0000000
--- a/agread-param.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-add agread extra parameter
-
-seems the parameter was always defined in prototype, just compiler was
-not that picky about that
-
-libtool: compile: ccache x86_64-pld-linux-gcc -std=gnu99 -std=gnu99 -DHAVE_CONFIG_H -I. -I./config -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -fopenmp -O2 -fwrapv -pipe -Wformat -Werror=format-security -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -fPIC -march=x86-64 -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2 -Wall -pthread -MT coders/coders_dot_la-dot.lo -MD -MP -MF coders/.deps/coders_dot_la-dot.Tpo -c coders/dot.c -fPIC -DPIC -o coders/.libs/coders_dot_la-dot.o
-coders/dot.c: In function 'ReadDOTImage':
-coders/dot.c:138:3: error: too few arguments to function 'agread'
-In file included from /usr/include/graphviz/types.h:49:0,
- from /usr/include/graphviz/gvc.h:17,
- from coders/dot.c:66:
-/usr/include/graphviz/cgraph.h:268:18: note: declared here
-make[1]: *** [coders/coders_dot_la-dot.lo] Error 1
-make[1]: Leaving directory `/home/users/glen/rpm/BUILD/x86_64-linux/ImageMagick-6.7.5-9'
-
-checked:
-- auto/ti/graphviz-2_26_3-7
-- auto/th/graphviz-2_20_3-9
-- auto/ti/graphviz-2_18-4
-- auto/ti/graphviz-2_14_1-6
-
---- ImageMagick-6.7.9-10/coders/dot.c~ 2012-08-30 14:41:56.000000000 +0300
-+++ ImageMagick-6.7.9-10/coders/dot.c 2013-03-20 00:23:13.217244621 +0200
-@@ -136,7 +136,7 @@
- (void) AcquireUniqueFilename(read_info->filename);
- (void) FormatLocaleString(command,MaxTextExtent,"-Tsvg -o%s %s",
- read_info->filename,image_info->filename);
-- graph=agread(GetBlobFileHandle(image));
-+ graph=agread(GetBlobFileHandle(image), (Agdisc_t *) 0);
- if (graph == (graph_t *) NULL)
- return ((Image *) NULL);
- option=GetImageOption(image_info,"dot:layout-engine");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/8ee30ebe64ed0c43afcce9a685709f59cc171cdb
More information about the pld-cvs-commit
mailing list