packages: ImageMagick/ImageMagick-ldflags.patch, ImageMagick/ImageMagick.sp...
qboosh
qboosh at pld-linux.org
Sat Oct 23 22:21:48 CEST 2010
Author: qboosh Date: Sat Oct 23 20:21:48 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 6.6.5-2 (note: new sonames)
- added lt patch (kill empty CXX substitution which breaks libtool)
---- Files affected:
packages/ImageMagick:
ImageMagick-ldflags.patch (1.2 -> 1.3) , ImageMagick.spec (1.373 -> 1.374) , ImageMagick-lt.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ImageMagick/ImageMagick-ldflags.patch
diff -u packages/ImageMagick/ImageMagick-ldflags.patch:1.2 packages/ImageMagick/ImageMagick-ldflags.patch:1.3
--- packages/ImageMagick/ImageMagick-ldflags.patch:1.2 Tue May 27 10:23:43 2008
+++ packages/ImageMagick/ImageMagick-ldflags.patch Sat Oct 23 22:21:42 2010
@@ -5,7 +5,7 @@
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_LDFLAGS="-L$LIB_DIR"
++MAGICK_LDFLAGS=""
+for flag in $LDFLAGS
+do
+ case "$flag" in
================================================================
Index: packages/ImageMagick/ImageMagick.spec
diff -u packages/ImageMagick/ImageMagick.spec:1.373 packages/ImageMagick/ImageMagick.spec:1.374
--- packages/ImageMagick/ImageMagick.spec:1.373 Tue Jun 29 08:16:37 2010
+++ packages/ImageMagick/ImageMagick.spec Sat Oct 23 22:21:42 2010
@@ -5,7 +5,8 @@
# Conditional build:
%bcond_without djvu # without DJVU module
%bcond_without fpx # without FlashPIX module (which uses fpx library)
-%bcond_without graphviz # without Graphviz support
+%bcond_without gomp # without OpenMP support
+%bcond_without graphviz # without dot module (which uses GraphViz libraries)
%bcond_with gs # with PostScript support through ghostscript library (warning: breaks jpeg!)
%bcond_without jasper # without JPEG2000 module (which uses jasper library)
%bcond_without wmf # without WMF module (which uses libwmf library)
@@ -13,8 +14,8 @@
%bcond_without exr # without OpenEXR module
%include /usr/lib/rpm/macros.perl
-%define ver 6.6.2
-%define pver 9
+%define ver 6.6.5
+%define pver 2
%define QuantumDepth 16
Summary: Image display, conversion, and manipulation under X
Summary(de.UTF-8): Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -31,30 +32,36 @@
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
-Source0: http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5: 5353f5ae075d14888455f0802225bf29
+Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
+# Source0-md5: aae2a0757b9e486f1db0c813fdd6fb3a
Patch0: %{name}-ac.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
+Patch4: %{name}-lt.patch
URL: http://www.imagemagick.org/
-BuildRequires: OpenEXR-devel
+BuildRequires: OpenEXR-devel >= 1.0.6
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.9
BuildRequires: bzip2-devel >= 1.0.1
%{?with_djvu:BuildRequires: djvulibre-devel}
BuildRequires: expat-devel >= 1.95.7
+BuildRequires: fftw3-devel >= 3.0
+BuildRequires: fontconfig-devel >= 2.1.0
BuildRequires: freetype-devel >= 2.0.2-2
%{?with_gs:BuildRequires: ghostscript-devel}
-%{?with_graphviz:BuildRequires: graphviz-devel >= 2.6}
+%{?with_graphviz:BuildRequires: graphviz-devel >= 2.9.0}
%{?with_jasper:BuildRequires: jasper-devel >= 1.700.5}
BuildRequires: jbigkit-devel
-BuildRequires: lcms-devel
+%{?with_gomp:BuildRequires: gcc-c++ >= 6:4.2}
+BuildRequires: lcms2-devel >= 2.0
%{?with_fpx:BuildRequires: libfpx-devel >= 1.2.0.4-3}
-BuildRequires: libjpeg-devel
+%{?with_gomp:BuildRequires: libgomp-devel}
+BuildRequires: libjpeg-devel >= 6b
+BuildRequires: liblqr-devel >= 0.1.0
BuildRequires: libltdl-devel
BuildRequires: libpng-devel >= 1.0.8
-BuildRequires: librsvg-devel
+BuildRequires: librsvg-devel >= 2.9.0
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: libtool >= 2:1.5
@@ -64,9 +71,12 @@
BuildRequires: pkgconfig
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.315
+BuildRequires: tar >= 1:1.22
# only checked for, but only supplied scripts/txt2html is used
#BuildRequires: txt2html
BuildRequires: xorg-lib-libXext
+BuildRequires: xz
+BuildRequires: zlib-devel
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Obsoletes: ImageMagick-coder-dps
Obsoletes: ImageMagick-coder-mpeg
@@ -143,6 +153,8 @@
Summary(pl.UTF-8): Biblioteki ImageMagick
Summary(pt_BR.UTF-8): Bibliotecas dinâmicas do ImageMagick
Group: X11/Libraries
+Requires: fontconfig-libs >= 2.1.0
+Requires: liblqr >= 0.1.0
%description libs
ImageMagick libraries.
@@ -162,10 +174,14 @@
Summary(uk.UTF-8): Хедери та бібліотеки для програмування з ImageMagick
Group: X11/Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: bzip2-devel
-Requires: freetype-devel
-Requires: lcms-devel
-Requires: libjpeg-devel
+Requires: bzip2-devel >= 1.0.1
+Requires: fftw3-devel >= 3.0
+Requires: fontconfig-devel >= 2.1.0
+Requires: freetype-devel >= 2.0.2
+Requires: lcms2-devel >= 2.0
+%{?with_gomp:Requires: libgomp-devel}
+Requires: libjpeg-devel >= 6b
+Requires: liblqr-devel >= 0.1.0
Requires: libltdl-devel
Requires: libtiff-devel
Requires: xorg-lib-libXext-devel
@@ -401,6 +417,7 @@
Summary(pl.UTF-8): Moduł kodera dla plików GraphViz DOT
Group: X11/Applications/Graphics
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: graphviz >= 2.9.0
%description coder-dot
Coder module for GraphViz DOT files.
@@ -413,6 +430,7 @@
Summary(pl.UTF-8): Moduł kodera dla plików EXR ILM
Group: X11/Applications/Graphics
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: OpenEXR >= 1.0.6
%description coder-exr
Coder module for ILM EXR files.
@@ -537,6 +555,7 @@
Summary(pl.UTF-8): Moduł kodera dla plików SVG (Scalable Vector Graphics)
Group: X11/Applications/Graphics
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: librsvg >= 2.9.0
%description coder-svg
Coder module for SVG (Scalable Vector Graphics) files.
@@ -586,9 +605,9 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
-%{__perl} -pi -e 's,lib/graphviz,%{_lib}/graphviz,' configure.ac
-find -type f | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
+find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
# avoid rebuilding (broken paths in scripts/Makefile.am)
touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
@@ -600,14 +619,16 @@
%{__autoheader}
%{__automake}
%configure \
+ --disable-ltdl-install \
+ %{!?with_gomp:--disable-openmp} \
+ --disable-silent-rules \
--enable-fast-install \
- --enable-lzw \
--enable-shared \
- --disable-ltdl-install \
+ --enable-static \
--without-dps \
- --with%{!?with_graphviz:out}-djvu \
- --with%{!?with_graphviz:out}-dot \
+ --with%{!?with_djvu:out}-djvu \
--with%{!?with_fpx:out}-fpx \
+ --with%{!?with_graphviz:out}-gvc \
--with%{!?with_gs:out}-gslib \
--with%{!?with_jasper:out}-jp2 \
--with%{!?with_cxx:out}-magick_plus_plus \
@@ -619,7 +640,6 @@
--with-perl-options="INSTALLDIRS=vendor" \
--with-quantum-depth=%{QuantumDepth} \
--with-threads \
- --with-ttf \
--with-x
%{__make}
@@ -627,18 +647,16 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
pkgdocdir=%{_docdir}/%{name}-doc-%{version}
-install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
-rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
-rm -f $RPM_BUILD_ROOT%{modulesdir}/coders/dps.{la,so}
+install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/ImageMagick-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-rm -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
# for koffice 1.6
cp -a magick/quantum-private.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick
@@ -670,6 +688,8 @@
%{modulesdir}/coders/art.la
%attr(755,root,root) %{modulesdir}/coders/avs.so
%{modulesdir}/coders/avs.la
+%attr(755,root,root) %{modulesdir}/coders/bgr.so
+%{modulesdir}/coders/bgr.la
%attr(755,root,root) %{modulesdir}/coders/bmp.so
%{modulesdir}/coders/bmp.la
%attr(755,root,root) %{modulesdir}/coders/braille.so
@@ -692,6 +712,8 @@
%{modulesdir}/coders/dcm.la
%attr(755,root,root) %{modulesdir}/coders/dds.so
%{modulesdir}/coders/dds.la
+%attr(755,root,root) %{modulesdir}/coders/debug.so
+%{modulesdir}/coders/debug.la
%attr(755,root,root) %{modulesdir}/coders/dib.so
%{modulesdir}/coders/dib.la
%attr(755,root,root) %{modulesdir}/coders/dng.so
@@ -883,9 +905,9 @@
%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.3
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore.so.4
%attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.3
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.4
%if %{with djvu}
%files coder-djvu
@@ -1026,19 +1048,19 @@
%files -n perl-%{name}
%defattr(644,root,root,755)
-%{perl_vendorarch}/Image/*
+%{perl_vendorarch}/Image/Magick.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
-%{_mandir}/man3/Image::Magick.*
-%{_examplesdir}/%{name}-perl
+%{_mandir}/man3/Image::Magick.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.3
+%attr(755,root,root) %ghost %{_libdir}/libMagick++.so.4
%files c++-devel
%defattr(644,root,root,755)
@@ -1062,6 +1084,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.374 2010/10/23 20:21:42 qboosh
+- updated to 6.6.5-2 (note: new sonames)
+- added lt patch (kill empty CXX substitution which breaks libtool)
+
Revision 1.373 2010/06/29 06:16:37 amateja
- updated to 6.6.2-9
================================================================
Index: packages/ImageMagick/ImageMagick-lt.patch
diff -u /dev/null packages/ImageMagick/ImageMagick-lt.patch:1.1
--- /dev/null Sat Oct 23 22:21:48 2010
+++ packages/ImageMagick/ImageMagick-lt.patch Sat Oct 23 22:21:42 2010
@@ -0,0 +1,13 @@
+--- ImageMagick-6.6.5-2/configure.ac.orig 2010-10-23 16:19:33.019743558 +0200
++++ ImageMagick-6.6.5-2/configure.ac 2010-10-23 16:51:41.847742720 +0200
+@@ -385,10 +385,6 @@
+ AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
+ CC="$PTHREAD_CC"
+ fi
+- if test "$CXX" != "$PTHREAD_CXX"; then
+- AC_MSG_WARN([Replacing compiler $CXX with compiler $PTHREAD_CXX to support pthreads.])
+- CXX="$PTHREAD_CXX"
+- fi
+ AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
+ fi
+ fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ImageMagick/ImageMagick-ldflags.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ImageMagick/ImageMagick.spec?r1=1.373&r2=1.374&f=u
More information about the pld-cvs-commit
mailing list