diff --git a/ImageMagick-6.7.6.1-no-dist-lzip.patch b/ImageMagick-6.7.6.1-no-dist-lzip.patch index c9a06c4..1204eb3 100644 --- a/ImageMagick-6.7.6.1-no-dist-lzip.patch +++ b/ImageMagick-6.7.6.1-no-dist-lzip.patch @@ -2,7 +2,7 @@ Index: ImageMagick-6.7.6-1/configure.ac =================================================================== --- ImageMagick-6.7.6-1.orig/configure.ac +++ ImageMagick-6.7.6-1/configure.ac -@@ -128,7 +128,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl +@@ -160,7 +160,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl # Ensure that make can run correctly AM_SANITY_CHECK diff --git a/ImageMagick-6.8.5.7-no-XPMCompliance.patch b/ImageMagick-6.8.5.7-no-XPMCompliance.patch index b56ba43..3fadb28 100644 --- a/ImageMagick-6.8.5.7-no-XPMCompliance.patch +++ b/ImageMagick-6.8.5.7-no-XPMCompliance.patch @@ -2,7 +2,7 @@ Index: ImageMagick-6.8.5-7/coders/xpm.c =================================================================== --- ImageMagick-6.8.5-7.orig/coders/xpm.c +++ ImageMagick-6.8.5-7/coders/xpm.c -@@ -382,7 +382,7 @@ static Image *ReadXPMImage(const ImageIn +@@ -386,7 +386,7 @@ static Image *ReadXPMImage(const ImageIn image->storage_class=DirectClass; image->matte=MagickTrue; } diff --git a/ImageMagick-6.8.8-1.tar.xz b/ImageMagick-6.8.8-1.tar.xz deleted file mode 100644 index 22bbbd6..0000000 --- a/ImageMagick-6.8.8-1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ce766720e07c61a9993c3c226425d8b1b7a18fd8ffb1841c2380a7d622c107b -size 7527812 diff --git a/ImageMagick-6.8.8-1.tar.xz.asc b/ImageMagick-6.8.8-1.tar.xz.asc deleted file mode 100644 index e3ffc28..0000000 --- a/ImageMagick-6.8.8-1.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJSwYBnAAoJEImrY9SCdzd6wBUQAI0Xa27kNqht69qgevKr38u7 -11BvBv8hOgG57tPQzuR5vhssb70drVrRKV2ltGHm76yLAkLbK0SEhbBPb3rGCKIr -xJfI3mMzkZ9t4QSyxnSYZBmgG6vRjsSugynYEqexrOQDtTbA8eQCvSeXBKSe8DiQ -p/yeozhAIWEAjx1/LImvJ93X0lyVWiIgzaUMmK6P6idMtM3vCrdve4XH6Q3h4HDs -XZsDVVi7HKgCYKhiumVDLfYaUuDkOBtudQivlulvPXNO6TpVxc2raZs5aTMHWuVU -FjXGZpZV0ZT+DGVUG/0URbX6Xl3bQDek9VI7LHe2uUaOQUfjMS70Ahwnf2j/NaXX -6TCeqnQT2ZiNKNsC8ulxyKV6hmNKvdIC3KAau3wV7liorRjtSWnxOGC1EnXFHVeC -2YQrTxbDqKQOqT288kXr7V+fyP2pvFkHveKyKeCorezsbHBkQuXHwHM+PQFHDySm -HCeQ48/X4QJqV527hUzEyHBrYVda8/lgDVCs10qIUnoIv/PteFFKDno+QZ3+pzIi -VRlT9cc70aak7rDI6lYUoRkuzLStPJR0E4Ddrx9noTW8rlJ+fBcLoJT/8ifBeJVx -Tc8ewtRti5ot518pnTfu28EUb+tPmxazCTcH3sOBFVlIZ0S5WJaNx1wp4l/w0Hcc -4OganUQ47rFSoKpyTDNL -=VjWH ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.8-7.tar.xz b/ImageMagick-6.8.8-7.tar.xz new file mode 100644 index 0000000..a995d6b --- /dev/null +++ b/ImageMagick-6.8.8-7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea5753a42329b0c251c753053b66078891a3733f929051f7e9190446f39ab2f4 +size 7448900 diff --git a/ImageMagick-6.8.8-7.tar.xz.asc b/ImageMagick-6.8.8-7.tar.xz.asc new file mode 100644 index 0000000..fa3bb1c --- /dev/null +++ b/ImageMagick-6.8.8-7.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJTAim5AAoJEImrY9SCdzd6pU0P/3N/0Q3GUawzQyKwSmMcplMJ +EBYP3HUNmEf2Vs5tXwumfBfJWMjkWQQ5M0rvmPEPNUSrLN7eBI5ghlxAMuP0kDva +gBuoTGpNMms4N0jvH2CKtv2w9E6jFMR2cafQ2yrS1N0o3qHIrVGSN5G96Z1XvTjn +qjJzA9A7rMg2pDyx4WKOml68Q077iMPkX8EAtqDOOVqV62fR7R8ud02grLfCxkx7 +4ff0qRSA5OE0vniOMnSQAfvPjliAULQ08O/lDI7JwGUEIzYnbrDOFwLcDxSITds6 +FiVCP6ult9L/TnWTfDXRx3iwstv/ds34u1MZrQ30Rrq0bXpNcC6L/MYQYW2fhmxT +MJsM9CcqLunvl0ZDgVotzwVfwyhgdr1lpn6bDY8ohxLLSE81Q7RnRq+ulJMfWHag +VHpkZheCFW8YAi2nDy0ZOFVzXV+2QqGcAtuMkRAt7XefkcX5lH64AFg1sMTHBSdr +yyywyTNXME9o3Lt0GW7Mq8eYRQRv/MwLLoL5NeXS9xu+xEK5HBt7N7K0rwHR9ulg +UHSm+LTVo3cUkwgNFdWIuFqc5FkI7rv7n08rBR/gXXWCyJO9F7iHAHolz0/2HKbd +efOcDufFwA6jvzI5U7LQbXpkJFkni+nBoGzmGj8VWDEJJhWiqU8blmKuY6qGnRBF +9U3g7TIgCNty17wCogCT +=nFNz +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 27bb4d6..f032977 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Feb 27 08:25:02 UTC 2014 - pgajdos@suse.com + +- fix baselibs + +------------------------------------------------------------------- +Wed Feb 26 20:17:35 UTC 2014 - opensuse@dstoecker.de + +- update to 6.8.8-7 +- remove disable_mat_test.patch (fixed upstream) + +------------------------------------------------------------------- +Tue Feb 18 07:28:51 UTC 2014 - pgajdos@suse.com + +- updated to 6.8.8-6: + * build against openjpeg2 + * identify -define identify:locate=maximum locates the position of the + maximum value + * Fix case where an image moment might have a mass of 0 or a Hu moment might + be 0. + * Enhance the TXT coder to read RGB percent values, e.g. 10.008%. + * etc. see ChangeLog + ------------------------------------------------------------------- Thu Feb 13 14:03:12 UTC 2014 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 0df3afd..d6c111d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -43,14 +43,15 @@ BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel BuildRequires: openexr-devel +BuildRequires: openjpeg2-devel BuildRequires: pango-devel BuildRequires: pkgconfig %define mfr_version 6.8.8 -%define mfr_revision 1 +%define mfr_revision 7 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} -%define clibver 1 +%define clibver 2 %define cxxlibver 3 %define libspec -6_Q%{quantum_depth} Version: %{mfr_version}.%{mfr_revision} @@ -76,8 +77,6 @@ Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch # bugs # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch -# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=24957 -Patch12: disable_mat_test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -133,6 +132,102 @@ Group: Development/Libraries/C and C++ BuildArch: noarch %endif +%description +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + +%description devel +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + +%description extra +This package adds support for djvu, wmf and jpeg2000 formats and +installs optional helper applications. + +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + +%description -n libMagickCore%{libspec}-%{clibver} +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + +%description -n libMagickWand%{libspec}-%{clibver} +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + +%description -n perl-PerlMagick +PerlMagick is an objected-oriented Perl interface to ImageMagick. Use +the module to read, manipulate, or write an image or image sequence +from within a Perl script. This makes it suitable for Web CGI scripts. + +%description -n libMagick++%{libspec}-%{cxxlibver} +This is Magick++, the object-oriented C++ API for the ImageMagick +image-processing library. + +Magick++ supports an object model inspired by PerlMagick. Magick++ +should be faster than PerlMagick since it is written in a compiled +language which is not parsed at run-time. This makes it suitable for +Web CGI programs. Images support implicit reference counting so that +copy constructors and assignment incur almost no cost. The cost of +actually copying an image (if necessary) is done just before +modification and this copy is managed automatically by Magick++. +De-referenced copies are automatically deleted. The image objects +support value (rather than pointer) semantics so it is trivial to +support multiple generations of an image in memory at one time. + +%description -n libMagick++-devel +This is Magick++, the object-oriented C++ API for the ImageMagick +image-processing library. + +Magick++ supports an object model inspired by PerlMagick. Magick++ +should be faster than PerlMagick since it is written in a compiled +language which is not parsed at run-time. This makes it suitable for +Web CGI programs. Images support implicit reference counting so that +copy constructors and assignment incur almost no cost. The cost of +actually copying an image (if necessary) is done just before +modification and this copy is managed automatically by Magick++. +De-referenced copies are automatically deleted. The image objects +support value (rather than pointer) semantics so it is trivial to +support multiple generations of an image in memory at one time. + +%description doc +HTML documentation for ImageMagick library and scene examples. + %prep %{?gpg_verify: %gpg_verify %{S:3}} %setup -n ImageMagick-%{source_version} @@ -142,9 +237,6 @@ BuildArch: noarch %patch3 -p1 %patch4 -p1 %patch11 -p1 -%ifarch ppc ppc64 s390 s390x -%patch12 -%endif %build export CFLAGS="$RPM_OPT_FLAGS" @@ -300,113 +392,4 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %defattr(-,root,root) %{_docdir}/%{name}-doc -%description -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - -%description devel -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - -%description extra -This package adds support for djvu, wmf and jpeg2000 formats and -installs optional helper applications. - -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - -%description -n libMagickCore%{libspec}-%{clibver} -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - -%description -n libMagickWand%{libspec}-%{clibver} -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - -%description -n perl-PerlMagick -PerlMagick is an objected-oriented Perl interface to ImageMagick. Use -the module to read, manipulate, or write an image or image sequence -from within a Perl script. This makes it suitable for Web CGI scripts. - -%description -n libMagick++%{libspec}-%{cxxlibver} -This is Magick++, the object-oriented C++ API for the ImageMagick -image-processing library. - -Magick++ supports an object model inspired by PerlMagick. Magick++ -should be faster than PerlMagick since it is written in a compiled -language which is not parsed at run-time. This makes it suitable for -Web CGI programs. Images support implicit reference counting so that -copy constructors and assignment incur almost no cost. The cost of -actually copying an image (if necessary) is done just before -modification and this copy is managed automatically by Magick++. -De-referenced copies are automatically deleted. The image objects -support value (rather than pointer) semantics so it is trivial to -support multiple generations of an image in memory at one time. - -%description -n libMagick++-devel -This is Magick++, the object-oriented C++ API for the ImageMagick -image-processing library. - -Magick++ supports an object model inspired by PerlMagick. Magick++ -should be faster than PerlMagick since it is written in a compiled -language which is not parsed at run-time. This makes it suitable for -Web CGI programs. Images support implicit reference counting so that -copy constructors and assignment incur almost no cost. The cost of -actually copying an image (if necessary) is done just before -modification and this copy is managed automatically by Magick++. -De-referenced copies are automatically deleted. The image objects -support value (rather than pointer) semantics so it is trivial to -support multiple generations of an image in memory at one time. - -%description doc -HTML documentation for ImageMagick library and scene examples. - - - - - - - - - - - - - - %changelog diff --git a/baselibs.conf b/baselibs.conf index 34e404c..3bae474 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,10 +1,10 @@ -libMagickCore-6_Q16-1 -libMagickWand-6_Q16-1 +libMagickCore-6_Q16-2 +libMagickWand-6_Q16-2 libMagick++-6_Q16-3 ImageMagick-devel requires -ImageMagick- - requires "libMagickCore-6_Q16-1- = " - requires "libMagickWand-6_Q16-1- = " + requires "libMagickCore-6_Q16-2- = " + requires "libMagickWand-6_Q16-2- = " libMagick++-devel requires -ImageMagick- requires "libMagick++-6_Q16-3- = " diff --git a/disable_mat_test.patch b/disable_mat_test.patch deleted file mode 100644 index 559ea19..0000000 --- a/disable_mat_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: PerlMagick/t/read.t -=================================================================== ---- PerlMagick/t/read.t.orig 2013-11-18 14:03:16.000000000 +0100 -+++ PerlMagick/t/read.t 2014-02-13 15:03:03.017996724 +0100 -@@ -74,7 +74,7 @@ - - print("MAT (MatLab gray 64-bit LSB double) ...\n"); - ++$test; --testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.2, 1.02); -+testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.22, 1.02); - - print("MAT (MatLab RGB 8-bit LSB integer) ...\n"); - ++$test;