From aa16cd994b64e9452ea81d0e7d070d9dd6924faf Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 27 Feb 2005 12:37:30 +0000 Subject: Chanes 6.2.0-2: * The Tru64 UNIX 4.0D/5.1 C++ compiler doesn't support ios::binary. There is an #ifdef for this, MISSING_STD_IOS_BINARY, but nothing sets it in configure.ac. So, I whipped up something to test it. I've tested this with the Sun, HP, IBM, SGI, and GNU C++ compilers. * Bitmaps in wmf files which are drawed via ipa_bmp_draw (in coders/wmf.c) are not scaled to the output size, but drawn with the original size. * Shear no longer produces artifacts for a 0 y-shear (e.g. 60x0). * The PerlMagick memory, disk, etc., limits were not being set for values other than unlimited. * Not all memory allocated in GetTransformTokens & GetStyleTokens are freed in SVG parsing. --- graphics/ImageMagick/Makefile.common | 7 +++---- graphics/ImageMagick/PLIST | 30 ++++++++++++++++-------------- graphics/ImageMagick/distinfo | 10 +++++----- graphics/ImageMagick/patches/patch-aa | 6 +++--- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common index 0674c45749b..2efe17246d5 100644 --- a/graphics/ImageMagick/Makefile.common +++ b/graphics/ImageMagick/Makefile.common @@ -1,9 +1,8 @@ -# $NetBSD: Makefile.common,v 1.32 2005/02/05 18:16:15 jklos Exp $ +# $NetBSD: Makefile.common,v 1.33 2005/02/27 12:37:30 adam Exp $ -IM_MAJOR_VER= 6.1.9 -IM_MINOR_VER= 4 +IM_MAJOR_VER= 6.2.0 +IM_MINOR_VER= 2 IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} -PKGREVISION= 1 .if (${IM_MINOR_VER} != NONE) DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER} diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index cb47a8901d2..97a347441b5 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.30 2005/01/27 13:51:39 adam Exp $ +@comment $NetBSD: PLIST,v 1.31 2005/02/27 12:37:30 adam Exp $ bin/Magick++-config bin/Magick-config bin/Wand-config @@ -32,8 +32,8 @@ include/magick/annotate.h include/magick/api.h include/magick/attribute.h include/magick/blob.h +include/magick/cache-view.h include/magick/cache.h -include/magick/cache_view.h include/magick/client.h include/magick/coder.h include/magick/color.h @@ -64,8 +64,8 @@ include/magick/list.h include/magick/locale_.h include/magick/log.h include/magick/magic.h +include/magick/magick-config.h include/magick/magick.h -include/magick/magick_config.h include/magick/memory_.h include/magick/methods.h include/magick/module.h @@ -77,7 +77,7 @@ include/magick/paint.h include/magick/pixel.h include/magick/profile.h include/magick/quantize.h -include/magick/random.h +include/magick/random_.h include/magick/registry.h include/magick/resize.h include/magick/resource_.h @@ -85,6 +85,7 @@ include/magick/segment.h include/magick/semaphore.h include/magick/shear.h include/magick/signature.h +include/magick/splay-tree.h include/magick/stream.h include/magick/string_.h include/magick/timer.h @@ -95,10 +96,11 @@ include/magick/utility.h include/magick/version.h include/magick/widget.h include/magick/xwindow.h -include/wand/drawing_wand.h +include/wand/drawing-wand.h +include/wand/magick-wand.h include/wand/magick_wand.h -include/wand/pixel_iterator.h -include/wand/pixel_wand.h +include/wand/pixel-iterator.h +include/wand/pixel-wand.h lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/colors.xml lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.xml lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.xml @@ -145,8 +147,8 @@ share/ImageMagick-${IM_MAJOR_VER}/images/dogwaffle.png share/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg share/ImageMagick-${IM_MAJOR_VER}/images/granite.png share/ImageMagick-${IM_MAJOR_VER}/images/logo.png -share/ImageMagick-${IM_MAJOR_VER}/images/magick.png share/ImageMagick-${IM_MAJOR_VER}/images/magick-icon.png +share/ImageMagick-${IM_MAJOR_VER}/images/magick.png share/ImageMagick-${IM_MAJOR_VER}/images/networkeleven.png share/ImageMagick-${IM_MAJOR_VER}/images/pair.png share/ImageMagick-${IM_MAJOR_VER}/images/promote.png @@ -219,8 +221,8 @@ share/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html share/ImageMagick-${IM_MAJOR_VER}/www/api/annotate.html share/ImageMagick-${IM_MAJOR_VER}/www/api/attribute.html share/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html +share/ImageMagick-${IM_MAJOR_VER}/www/api/cache-view.html share/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/cache_view.html share/ImageMagick-${IM_MAJOR_VER}/www/api/color.html share/ImageMagick-${IM_MAJOR_VER}/www/api/colorspace.html share/ImageMagick-${IM_MAJOR_VER}/www/api/compare.html @@ -230,23 +232,23 @@ share/ImageMagick-${IM_MAJOR_VER}/www/api/decorate.html share/ImageMagick-${IM_MAJOR_VER}/www/api/deprecate.html share/ImageMagick-${IM_MAJOR_VER}/www/api/display.html share/ImageMagick-${IM_MAJOR_VER}/www/api/draw.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/drawing_wand.html +share/ImageMagick-${IM_MAJOR_VER}/www/api/drawing-wand.html share/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html share/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html share/ImageMagick-${IM_MAJOR_VER}/www/api/exception.html share/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html share/ImageMagick-${IM_MAJOR_VER}/www/api/image.html share/ImageMagick-${IM_MAJOR_VER}/www/api/list.html +share/ImageMagick-${IM_MAJOR_VER}/www/api/magick-wand.html share/ImageMagick-${IM_MAJOR_VER}/www/api/magick.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/magick_wand.html share/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html share/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html share/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html share/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/pixel_iterator.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/pixel_wand.html -share/ImageMagick-${IM_MAJOR_VER}/www/api/quantize.html +share/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-iterator.html +share/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-wand.html share/ImageMagick-${IM_MAJOR_VER}/www/api/profile.html +share/ImageMagick-${IM_MAJOR_VER}/www/api/quantize.html share/ImageMagick-${IM_MAJOR_VER}/www/api/registry.html share/ImageMagick-${IM_MAJOR_VER}/www/api/resize.html share/ImageMagick-${IM_MAJOR_VER}/www/api/resource.html diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 90e1ba1d796..c4f36e6ef25 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.41 2005/02/24 08:45:02 agc Exp $ +$NetBSD: distinfo,v 1.42 2005/02/27 12:37:30 adam Exp $ -SHA1 (ImageMagick-6.1.9-4.tar.bz2) = cefa28825374dfa65bf9d9932e9db3ca38a68820 -RMD160 (ImageMagick-6.1.9-4.tar.bz2) = 35895bffee13932a08bc832f2fd5d5e4d2ef57db -Size (ImageMagick-6.1.9-4.tar.bz2) = 4617422 bytes -SHA1 (patch-aa) = 8fc26a7c88c58c5324d9935b768b53932fa4c9f0 +SHA1 (ImageMagick-6.2.0-2.tar.bz2) = 00069b9fb6da7b433fa2e1977fd4d5df3c1f7f4b +RMD160 (ImageMagick-6.2.0-2.tar.bz2) = 23a381ac246c220d3ad19463c6eb0897a4b6b4e7 +Size (ImageMagick-6.2.0-2.tar.bz2) = 4639981 bytes +SHA1 (patch-aa) = 41824024eed1178ed16a55d7dcc490454cc062f9 diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index 5c1714ddc92..7ff92759136 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.27 2005/01/05 09:25:18 adam Exp $ +$NetBSD: patch-aa,v 1.28 2005/02/27 12:37:30 adam Exp $ ---- configure.orig 2004-12-27 21:45:13.000000000 +0000 +--- configure.orig 2005-02-25 19:38:46.000000000 +0000 +++ configure -@@ -25563,9 +25563,6 @@ fi +@@ -25816,9 +25816,6 @@ fi # Enable building/use of libltdl if we are building shared libraries regardless # of whether modules are built or not. with_ltdl='no' -- cgit v1.2.3