Hello community, here is the log from the commit of package ImageMagick.1463 for openSUSE:12.3:Update checked in at 2013-03-26 11:36:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/ImageMagick.1463 (Old) and /work/SRC/openSUSE:12.3:Update/.ImageMagick.1463.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick.1463", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.3:Update/.ImageMagick.1463.new/ImageMagick.changes 2013-03-26 11:36:04.000000000 +0100 @@ -0,0 +1,1376 @@ +------------------------------------------------------------------- +Mon Mar 18 16:16:43 UTC 2013 - [email protected] + +- disable test suite on ppc and ppc64 + +------------------------------------------------------------------- +Tue Jan 15 17:34:50 UTC 2013 - [email protected] + +- fix wrong mean-error output: + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22586 + * dropped disable-matlab-test.patch + * added ImageMagick-uninitialized-memory.patch + +------------------------------------------------------------------- +Thu Jan 10 16:24:43 UTC 2013 - [email protected] + +- do not disable checking altogether. +- disable-matlab-test.patch: disable the 1 MATLAB testcase that fails. + +------------------------------------------------------------------- +Thu Jan 10 05:32:13 UTC 2013 - [email protected] + +- disable check for the moment, it breaks on Factory and 12.1, but + 12.2 + +------------------------------------------------------------------- +Tue Jan 8 11:14:12 UTC 2013 - [email protected] + +- enable support for Pango markup + * this allows rendering formatted text with the pango:"..." syntax + see http://www.imagemagick.org/Usage/text/#pango for details + * to actually use this, libpango needs to be installed + +------------------------------------------------------------------- +Tue Aug 7 13:06:22 UTC 2012 - [email protected] + +- updated to 6.7.8.8: + * Added 2d named convolution kernel Binomial (for Fred Wienhaus) + * Clean up sigmoidal-contrast. + * Use ConcatenateString() for multi-block GIF comments. + * Caption no longer chops off text (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=21558). + * Support LUV colorspace. + * Support HCL colorspace. + * Don't transform the composite image colorspace, set it instead. + * Interpret -border 5% as 5% of width and 5% of height (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=21537). + * Don't normalize zero-sum kernels (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=21584). + * Transform grayscale to linear RGB if fill color is non-gray (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=21586). + etc. see ChangeLog + +------------------------------------------------------------------- +Wed May 16 09:48:34 UTC 2012 - [email protected] + +- updated to 6.7.6.9: + * Don't write an invalid PNG sRGB chunk when rendering intent is undefined. + * EXR images are in the linear RGB colorspace with a gamma of 1.0. + * Correct annotation offset for right-to-left labels. + * The -level 100x0% now produces the equivalent of -negate. + * etc., see ChangeLog + +------------------------------------------------------------------- +Tue Mar 27 16:20:53 UTC 2012 - [email protected] + +- cleanup the package +- updated to 6.7.6.1: fixes + * CVE-2012-0247 [bnc#746880] + * CVE-2012-0248 [bnc#746880] + * CVE-2012-1185 [bnc#752879] + * CVE-2012-1186 [bnc#752879] + +------------------------------------------------------------------- +Fri Mar 9 9:4:11 UTC 2012 - [email protected] + +- moved the libtool archives to the main package +- separated the bulk documentation +- added a regression %check for the locale comma crash + +------------------------------------------------------------------- +Tue Feb 14 09:02:14 UTC 2012 - [email protected] + +- license update: SUSE-ImageMagick + Use SUSE- proprietary prefix until SPDX upstream accepts ImageMagick as + license (e.g. like Fedora) + +------------------------------------------------------------------- +Thu Jan 19 15:29:00 UTC 2012 - [email protected] + +- ImageMagick-devel requires libbz2-devel [bnc#741947] + +------------------------------------------------------------------- +Thu Jan 19 11:09:44 UTC 2012 - [email protected] + +- update to 6.7.4.7: + * Fixed -black-threshold and -white-threshold so they work properly with + the -channels option + * Promote image depths 9-15 to 16 to avoid crashing in the PNG + encoder + * Fix problems with JNG encoder "quality" + * Fix memory leak in JP2 coder + * Use maximum bounds when rendering PDF + * etc. see ChangeLog + +------------------------------------------------------------------- +Tue Jan 17 19:42:15 UTC 2012 - [email protected] + +- Add explicit libbz2-devel BuildRequires +- Support LZMA +- Use libcms2 now. +- Cleanup huge dependency bloat in -devel package, this + will likely cause build fails on dependant packages + the solution is to fix your BuildRequires. + +------------------------------------------------------------------- +Mon Oct 31 13:51:57 UTC 2011 - [email protected] + +- update to 6.7.3.3: + * removed upstreamed scene.patch + +------------------------------------------------------------------- +Tue Oct 18 14:23:33 UTC 2011 - [email protected] + +- build against librsvg as recommended upstream [bnc#724222] + +------------------------------------------------------------------- +Sat Oct 15 04:47:13 UTC 2011 - [email protected] + +- add libtool as buildrequire to make the spec file more reliable + +------------------------------------------------------------------- +Thu Oct 6 12:47:38 UTC 2011 - [email protected] + +- fixed [bnc#717871] -- imagemagick display wrong order + * scene.patch + +------------------------------------------------------------------- +Tue Sep 20 13:22:37 UTC 2011 - [email protected] + +- update to 6.7.2.7: + * Fix memory leak in text annotation. + * The "-strip" option was excluding the PNG tRNS chunk. + * Caption now wraps properly for Chinese text. + * The PNG encoder would sometimes fail to respect the -define + PNG:color-type option when the incoming image was PseudoClass. + * Properly handled continued JPEG embedded profiles. + * Revert -colorspace sRGB option patch. + * Revert -type PaletteMatte option patch. + * etc. see ChangeLog. +- obsoletes reason-error-message.patch + +------------------------------------------------------------------- +Sat Sep 17 09:36:34 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- +Fri Sep 16 17:34:10 UTC 2011 - [email protected] + +- Fix baselibs: add missing requires to ImageMagick-devel +- Remove redundant tags/sections + +------------------------------------------------------------------- +Wed Sep 7 08:53:45 UTC 2011 - [email protected] + +- fixed wrong error messages [bnc#673303] + +------------------------------------------------------------------- +Fri Jul 29 07:07:44 UTC 2011 - [email protected] + +- update to 6.7.1.0: + * Defend against corrupt PSD resource blocks. + * Properly allocate points when render text with large font size. + * Added support for Z_RLE strategy in the png compressor, using + -quality 98 or 99. + * Handle "-quality 97" properly in the png encoder, i.e., use intrapixel + filtering when writing a MNG file and no filtering when writing a PNG file. + * Added "-define PNG:compression-level|strategy|filter=value" options to + the PNG encoder. If these options are used, they take precedence over + the -quality option. + * Use zlib default compression strategy instead of Z_RLE and Z_FIXED + strategies when linking with zlib versions (prior to 1.2.0 and 1.2.2.2, + respectively) that don't support them. +- switch on WEBP support -- require libwebp-devel to build + +------------------------------------------------------------------- +Mon Jun 20 10:44:54 UTC 2011 - [email protected] + +- updated to 6.7.0.8: + * added Initial implementation of Cylinder to/from Plane 3D Distorts + Includes deritive (scaled lookup), and anti-alised horizon (validity) + Currently can NOT handle extractions from full 360 cylinder panoramas. + * Fix transient error for composite over operator. + * Fix one-off bug in option parser. + * etc., see ChangeLog +- adjusted inc-struct.diff ++++ 1179 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.ImageMagick.1463.new/ImageMagick.changes New: ---- ImageMagick-6.6.8.9-doc.patch ImageMagick-6.6.8.9-examples.patch ImageMagick-6.7.6.1-no-dist-lzip.patch ImageMagick-6.7.8-8.tar.bz2 ImageMagick-uninitialized-memory.patch ImageMagick.changes ImageMagick.spec baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ # # spec file for package ImageMagick # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ImageMagick BuildRequires: dcraw BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-library BuildRequires: libbz2-devel BuildRequires: libdjvulibre-devel BuildRequires: libexif-devel BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel BuildRequires: librsvg-devel BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libwebp-devel BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel BuildRequires: pango-devel BuildRequires: pkgconfig %define mfr_version 6.7.8 %define mfr_revision 8 %define source_version %{mfr_version}-%{mfr_revision} Version: %{mfr_version}.%{mfr_revision} Release: 0 %define libver 5 Summary: Viewer and Converter for Images License: SUSE-ImageMagick Group: Productivity/Graphics/Other Url: http://www.imagemagick.org Source: ImageMagick-%{source_version}.tar.bz2 # To get mtime of file Source1: ImageMagick.changes Source2: baselibs.conf Patch1: ImageMagick-6.6.8.9-examples.patch Patch2: ImageMagick-6.6.8.9-doc.patch Patch3: ImageMagick-6.7.6.1-no-dist-lzip.patch # will be upstreamed: # http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22586 Patch4: ImageMagick-uninitialized-memory.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick Requires: ImageMagick = %{version} Requires: libMagickCore%{libver} = %{version} Requires: perl = %{perl_version} Summary: Perl interface for ImageMagick Group: Development/Libraries/Perl %package devel Requires: ImageMagick = %{version} Requires: libMagickCore%{libver} = %{version} Requires: libMagickWand%{libver} = %{version} Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ Requires: glibc-devel # bnc#741947: Requires: libbz2-devel %package extra Requires: ImageMagick = %{version} Requires: libMagickCore%{libver} = %{version} Summary: Viewer and Converter for Images - extra codecs Group: Productivity/Graphics/Other #delegates configured in delegates.xml that imagemagick can use Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf %package -n libMagickCore%{libver} Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} %package -n libMagickWand%{libver} Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other %package -n libMagick++%{libver} Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library Group: Development/Libraries/C and C++ %package -n libMagick++-devel Requires: ImageMagick-devel = %{version} Requires: libMagick++%{libver} = %{version} Requires: libstdc++-devel Summary: C++ Interface for ImageMagick - files mandatory for development Group: Development/Libraries/C and C++ %package doc Summary: Document Files for ImageMagick Library Group: Development/Libraries/C and C++ %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %prep %setup -n ImageMagick-%{source_version} %patch1 %patch2 %patch3 -p1 %patch4 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="-L%{_libdir}" CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10` # Use mtime of .changes for build time sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh autoreconf --force --install -v %configure --with-pic \ --enable-shared \ --without-frozenpaths \ --with-magick_plus_plus \ --with-modules \ --with-threads \ --without-perl \ --disable-static \ --with-djvu=yes \ --with-wmf=yes make %{?_smp_mflags} all cd PerlMagick perl Makefile.PL make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs export MAGICK_CONFIGURE_PATH=$PWD/config cd PerlMagick %ifnarch ppc ppc64 make test %endif %install %{__install} -d "${RPM_BUILD_ROOT%}"'{_defaultdocdir}/%{name}/images' %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ pkgdocdir=%{_defaultdocdir}/%{name}/ cd PerlMagick %{__make} "DESTDIR=${RPM_BUILD_ROOT}" 'LD_RUN_PATH=%{_libdir}:%{_prefix}/X11R6/%{_lib}' install_vendor %perl_process_packlist cd '../Magick++' %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} PATH='/bin:/usr/bin' find demo -type f -perm +111 -execdir %{__rm} -rf '{}' ';' %{__mv} demo/makefile.2 demo/Makefile cd .. %{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml %{__cp} -a -t "${RPM_BUILD_ROOT}"'%{_defaultdocdir}/%{name}/' scenes PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \ -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' %{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/libltdl.* %{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"' %if 0%{?suse_version} > 1020 %fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}/wand %fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api %endif rm -rf %{buildroot}/%{_datadir}/doc/%{name} %post -n libMagickCore%{libver} -p /sbin/ldconfig %postun -n libMagickCore%{libver} -p /sbin/ldconfig %post -n libMagickWand%{libver} -p /sbin/ldconfig %postun -n libMagickWand%{libver} -p /sbin/ldconfig %post -n libMagick++%{libver} -p /sbin/ldconfig %postun -n libMagick++%{libver} -p /sbin/ldconfig %files %defattr(-,root,root) %docdir %{_docdir}/%{name} %doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %{_bindir}/[^MW]* %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz %files -n libMagickCore%{libver} %defattr(-,root,root) %doc LICENSE %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* %{_libdir}/libMagickCore.so.%{libver}* %dir %{_libdir}/ImageMagick* %dir %{_libdir}/ImageMagick*/modules* %dir %{_libdir}/ImageMagick*/modules*/* %{_libdir}/ImageMagick*/config %exclude %{_libdir}/ImageMagick*/modules*/*/wmf.* %exclude %{_libdir}/ImageMagick*/modules*/*/jp2.* %exclude %{_libdir}/ImageMagick*/modules*/*/djvu.* %{_libdir}/ImageMagick*/modules*/*/*.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/*.la %files -n libMagickWand%{libver} %defattr(-,root,root) %doc LICENSE %{_libdir}/libMagickWand.so.%{libver}* %files extra %defattr(-,root,root) %doc LICENSE %{_libdir}/ImageMagick*/modules*/*/wmf.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/wmf.la %{_libdir}/ImageMagick*/modules*/*/jp2.so %{_libdir}/ImageMagick*/modules*/*/jp2.la %{_libdir}/ImageMagick*/modules*/*/djvu.so %{_libdir}/ImageMagick*/modules*/*/djvu.la %files devel %defattr(-,root,root) %doc LICENSE %{_libdir}/libMagickCore.so %{_libdir}/libMagickWand.so %dir %{_includedir}/ImageMagick %{_includedir}/ImageMagick/magick %{_includedir}/ImageMagick/wand %{_includedir}/ImageMagick/wand.h %{_bindir}/MagickCore-config %{_bindir}/MagickWand-config %{_bindir}/Magick-config %{_bindir}/Wand-config %{_libdir}/pkgconfig/ImageMagick.pc %{_libdir}/pkgconfig/Wand.pc %{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/MagickWand.pc %doc %{_mandir}/man1/*-config.1.gz %exclude %{_mandir}/man1/Magick++-config.1.gz %files -n perl-PerlMagick %defattr(-,root,root) %doc LICENSE %doc PerlMagick/README.txt %doc PerlMagick/demo %doc %{_mandir}/man3/Image::Magick.3pm* %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image %files -n libMagick++%{libver} %defattr(-,root,root) %doc LICENSE %{_libdir}/libMagick++.so.%{libver}* %files -n libMagick++-devel %defattr(-,root,root) %doc LICENSE %doc Magick++/demo %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++.so %{_includedir}/ImageMagick/Magick++.h %{_includedir}/ImageMagick/Magick++ %{_bindir}/Magick++-config %{_libdir}/pkgconfig/ImageMagick++.pc %{_libdir}/pkgconfig/Magick++.pc %doc %{_mandir}/man1/Magick++-config.1.gz %files doc %defattr(-,root,root) %dir %{_docdir}/%{name} %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%{libver} 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%{libver} 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++%{libver} 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 ++++++ ImageMagick-6.6.8.9-doc.patch ++++++ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac @@ -2973,7 +2973,7 @@ AC_SUBST(FILTER_PATH) # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" +DOCUMENTATION_RELATIVE_PATH="packages/${PACKAGE_NAME}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" case "${build_os}" in ++++++ ImageMagick-6.6.8.9-examples.patch ++++++ --- Magick++/demo/makefile.2 +++ Magick++/demo/makefile.2 @@ -0,0 +1,8 @@ +LDFLAGS= $(shell Magick-config --ldflags) +LOADLIBES=-lMagick++ $(shell Magick-config --libs) +CPPFLAGS=$(shell Magick-config --cflags) $(shell Magick-config --cppflags) + +all: button demo detrans flip shapes + + + ++++++ ImageMagick-6.7.6.1-no-dist-lzip.patch ++++++ 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 # Ensure that make can run correctly AM_SANITY_CHECK -AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) +AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ++++++ ImageMagick-uninitialized-memory.patch ++++++ http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22586 Index: ImageMagick-6.7.8-8/coders/mat.c =================================================================== --- ImageMagick-6.7.8-8.orig/coders/mat.c +++ ImageMagick-6.7.8-8/coders/mat.c @@ -897,7 +897,7 @@ NEXT_FRAME: { for (i = 0; i < (ssize_t) MATLAB_HDR.SizeY; i++) { - q=QueueAuthenticPixels(image,0,MATLAB_HDR.SizeY-i-1,image->columns,1,exception); + q=GetAuthenticPixels(image,0,MATLAB_HDR.SizeY-i-1,image->columns,1,exception); if (q == (PixelPacket *)NULL) { if (logging) (void)LogMagickEvent(CoderEvent,GetMagickModule(), Index: ImageMagick-6.7.8-8/magick/quantum-import.c =================================================================== --- ImageMagick-6.7.8-8.orig/magick/quantum-import.c +++ ImageMagick-6.7.8-8/magick/quantum-import.c @@ -1032,62 +1032,86 @@ static void ImportBlueQuantum(const Imag switch (quantum_info->depth) { - case 10: + case 8: { - Quantum - cbcr[4]; + unsigned char + pixel; - pixel=0; - if (quantum_info->pack == MagickFalse) - { - register ssize_t - i; + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushCharPixel(p,&pixel); + SetPixelBlue(q,ScaleCharToQuantum(pixel)); + p+=quantum_info->pad; + q++; + } + break; + } + case 16: + { + unsigned short + pixel; - size_t - quantum; + if (quantum_info->format == FloatingPointQuantumFormat) + { + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushShortPixel(quantum_info->endian,p,&pixel); + SetPixelBlue(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); + p+=quantum_info->pad; + q++; + } + break; + } + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushShortPixel(quantum_info->endian,p,&pixel); + SetPixelBlue(q,ScaleShortToQuantum(pixel)); + p+=quantum_info->pad; + q++; + } + break; + } + case 32: + { + unsigned int + pixel; - ssize_t - n; + if (quantum_info->format == FloatingPointQuantumFormat) + { + float + pixel; - n=0; - quantum=0; - for (x=0; x < (ssize_t) number_pixels; x+=2) + for (x=0; x < (ssize_t) number_pixels; x++) { - for (i=0; i < 4; i++) - { - switch (n % 3) - { - case 0: - { - p=PushLongPixel(quantum_info->endian,p,&pixel); - quantum=(size_t) (ScaleShortToQuantum((unsigned short) - (((pixel >> 22) & 0x3ff) << 6))); - break; - } - case 1: - { - quantum=(size_t) (ScaleShortToQuantum((unsigned short) - (((pixel >> 12) & 0x3ff) << 6))); - break; - } - case 2: - { - quantum=(size_t) (ScaleShortToQuantum((unsigned short) - (((pixel >> 2) & 0x3ff) << 6))); - break; - } - } - cbcr[i]=(Quantum) (quantum); - n++; - } + p=PushFloatPixel(quantum_info,p,&pixel); + SetPixelBlue(q,ClampToQuantum(pixel)); p+=quantum_info->pad; - SetPixelRed(q,cbcr[1]); - SetPixelGreen(q,cbcr[0]); - SetPixelBlue(q,cbcr[2]); q++; - SetPixelRed(q,cbcr[3]); - SetPixelGreen(q,cbcr[0]); - SetPixelBlue(q,cbcr[2]); + } + break; + } + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushLongPixel(quantum_info->endian,p,&pixel); + SetPixelBlue(q,ScaleLongToQuantum(pixel)); + p+=quantum_info->pad; + q++; + } + break; + } + case 64: + { + if (quantum_info->format == FloatingPointQuantumFormat) + { + double + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + p=PushDoublePixel(quantum_info,p,&pixel); + SetPixelBlue(q,ClampToQuantum(pixel)); + p+=quantum_info->pad; q++; } break; @@ -1102,9 +1126,8 @@ static void ImportBlueQuantum(const Imag for (x=0; x < (ssize_t) number_pixels; x++) { p=PushQuantumPixel(quantum_info,p,&pixel); - SetPixelRed(q,ScaleAnyToQuantum(pixel,range)); - p=PushQuantumPixel(quantum_info,p,&pixel); - SetPixelGreen(q,ScaleAnyToQuantum(pixel,range)); + SetPixelBlue(q,ScaleAnyToQuantum(pixel,range)); + p+=quantum_info->pad; q++; } break; ++++++ baselibs.conf ++++++ libMagickCore5 libMagickWand5 ImageMagick-devel requires -ImageMagick-<targettype> requires "libMagickCore5-<targettype> = <version>" requires "libMagickWand5-<targettype> = <version>" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
