From 53798140b6fe4e6cd65cf1a11b0ffc45310fd872 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 8 May 2006 11:39:07 +0000 Subject: Changes 6.2.7.3: * Add -adaptive-sharpen to the convert and mogrify programs. Changes 6.2.7.2: * Generate proper image filenames when filename has more than one embedded period (e.g. image.gif.eps becomes image.gif-0.eps, image.gif-1.eps, etc.). * CompositeImage() is now thread-safe. --- graphics/ImageMagick/Makefile.common | 4 ++-- graphics/ImageMagick/PLIST | 4 +++- graphics/ImageMagick/distinfo | 13 ++++++------- graphics/ImageMagick/patches/patch-aa | 6 +++--- graphics/ImageMagick/patches/patch-ab | 10 +++++----- graphics/ImageMagick/patches/patch-ac | 24 ------------------------ 6 files changed, 19 insertions(+), 42 deletions(-) delete mode 100644 graphics/ImageMagick/patches/patch-ac diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common index ea941422947..26bbcbb057d 100644 --- a/graphics/ImageMagick/Makefile.common +++ b/graphics/ImageMagick/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.53 2006/04/30 17:55:12 adam Exp $ +# $NetBSD: Makefile.common,v 1.54 2006/05/08 11:39:07 adam Exp $ ########################################################################### # @@ -10,7 +10,7 @@ ########################################################################### IM_MAJOR_VER= 6.2.7 -IM_MINOR_VER= 1 +IM_MINOR_VER= 4 IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} .if (${IM_MINOR_VER} != NONE) diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index b8377d0a4fa..b5c626c7ab0 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.45 2006/03/05 21:25:48 adam Exp $ +@comment $NetBSD: PLIST,v 1.46 2006/05/08 11:39:07 adam Exp $ bin/Magick++-config bin/Magick-config bin/Wand-config @@ -255,6 +255,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-image.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-wand.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/module.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html @@ -271,6 +272,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/signature.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/stream.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/transform.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/version.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/architecture.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/binary-releases.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/changelog.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/color.html diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 058f73942d2..8f2efb3533a 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.65 2006/05/03 22:57:22 wiz Exp $ +$NetBSD: distinfo,v 1.66 2006/05/08 11:39:07 adam Exp $ -SHA1 (ImageMagick-6.2.7-1.tar.bz2) = ad9885040191452dcf42456debc044d2af01caae -RMD160 (ImageMagick-6.2.7-1.tar.bz2) = 337a2aa548f050624cb0626860b0d1ae26acf348 -Size (ImageMagick-6.2.7-1.tar.bz2) = 5167016 bytes -SHA1 (patch-aa) = d2342d754195b66368f56a3f2c27ccf1d7fdc00b -SHA1 (patch-ab) = cfa9680cf461dc350f16b7f0b631773625c655f8 -SHA1 (patch-ac) = 3158b5791818f8d8c699964bb244c76b0c2d2e61 +SHA1 (ImageMagick-6.2.7-4.tar.bz2) = 342a0238ad2193a22d4ca20f46da378e660651df +RMD160 (ImageMagick-6.2.7-4.tar.bz2) = c3ad3310dac63fb47509d1590370525dd5a3d3f2 +Size (ImageMagick-6.2.7-4.tar.bz2) = 5190490 bytes +SHA1 (patch-aa) = 18c0d77512b0fc7247b2b0bb16d080f7c149bcf1 +SHA1 (patch-ab) = 4937b544f4c8f85974890cbc6a62fca689a2e630 diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index c81f6111ab0..3c5d21f920a 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.35 2006/04/30 17:55:12 adam Exp $ +$NetBSD: patch-aa,v 1.36 2006/05/08 11:39:07 adam Exp $ ---- configure.orig 2006-04-24 03:19:39.000000000 +0200 +--- configure.orig 2006-05-07 17:10:26.000000000 +0200 +++ configure -@@ -25315,9 +25315,6 @@ fi +@@ -25305,9 +25305,6 @@ fi # Enable building/use of libltdl if we are building shared libraries regardless # of whether modules are built or not. with_ltdl='no' diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab index 088734e1026..c45ba4af68a 100644 --- a/graphics/ImageMagick/patches/patch-ab +++ b/graphics/ImageMagick/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.18 2006/04/30 17:55:12 adam Exp $ +$NetBSD: patch-ab,v 1.19 2006/05/08 11:39:07 adam Exp $ ---- Makefile.in.orig 2006-04-24 03:19:49.000000000 +0200 +--- Makefile.in.orig 2006-05-07 17:10:38.000000000 +0200 +++ Makefile.in -@@ -3264,8 +3264,6 @@ WAND_CLEANFILES = \ +@@ -3263,8 +3263,6 @@ WAND_CLEANFILES = \ @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/bin/Magick++-config @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.18 2006/04/30 17:55:12 adam Exp $ @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/lib/ImageMagick++.pc -@@ -3315,7 +3313,6 @@ WAND_CLEANFILES = \ +@@ -3314,7 +3312,6 @@ WAND_CLEANFILES = \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/INSTALL \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/NEWS \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/README \ @@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.18 2006/04/30 17:55:12 adam Exp $ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/bin/Magick++-config.in \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/lib/ImageMagick++.pc.in \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/demo/model.miff \ -@@ -4583,7 +4580,6 @@ pkgconfig_DATA = \ +@@ -4582,7 +4579,6 @@ pkgconfig_DATA = \ # Manual pages to install man_MANS = \ $(MAGICK_MANS) \ diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac deleted file mode 100644 index e88a0674840..00000000000 --- a/graphics/ImageMagick/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.14 2006/05/03 22:57:22 wiz Exp $ - ---- coders/png.c.orig 2006-04-07 02:33:15.000000000 +0000 -+++ coders/png.c -@@ -1755,7 +1755,7 @@ static Image *ReadOnePNGImage(MngInfo *m - #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \ - && (PNG_LIBPNG_VER >= 10200) - /* Disable thread-unsafe features of pnggccrd */ -- if (png_access_version() >= 10200) -+ if (png_access_version_number() >= 10200) - { - png_uint_32 mmx_disable_mask=0; - png_uint_32 asm_flags; -@@ -1764,8 +1764,8 @@ static Image *ReadOnePNGImage(MngInfo *m - | PNG_ASM_FLAG_MMX_READ_FILTER_SUB \ - | PNG_ASM_FLAG_MMX_READ_FILTER_AVG \ - | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ); -- asm_flags=png_get_asm_flags(png_ptr); -- png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask); -+ asm_flags=png_get_asm_flags(ping); -+ png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask); - } - #endif - -- cgit v1.2.3