From 9c88d4acab5facc32320d2c258371c8344e5cc36 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 6 Feb 2007 14:52:46 +0000 Subject: Changes 6.3.2.3: * Added thumbnail format to write EXIF thumbnails. * Move EXIF properties to the EXIF namespace (e.g. exif:XResolution). * Add interpolate and background options to PerlMagick's AffineTransform(). * Revert to Postscript rendering if Freetype delegate library is not available. --- graphics/ImageMagick/Makefile | 3 +-- graphics/ImageMagick/Makefile.common | 6 +++--- graphics/ImageMagick/PLIST | 13 ++++++++----- graphics/ImageMagick/distinfo | 12 ++++++------ graphics/ImageMagick/patches/patch-aa | 12 ++++++------ graphics/ImageMagick/patches/patch-ab | 10 +++++----- graphics/p5-PerlMagick/Makefile | 3 +-- 7 files changed, 30 insertions(+), 29 deletions(-) (limited to 'graphics') diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 8bbb67e855a..0041d81cb1b 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.149 2007/01/17 23:47:19 wiz Exp $ +# $NetBSD: Makefile,v 1.150 2007/02/06 14:52:46 adam Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} -PKGREVISION= 1 MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.simplesystems.org/ImageMagick/ diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common index d37965d0f5e..21c2ad78073 100644 --- a/graphics/ImageMagick/Makefile.common +++ b/graphics/ImageMagick/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.67 2007/01/09 09:52:33 adam Exp $ +# $NetBSD: Makefile.common,v 1.68 2007/02/06 14:52:46 adam Exp $ ########################################################################### # @@ -9,8 +9,8 @@ # ########################################################################### -IM_MAJOR_VER= 6.3.1 -IM_MINOR_VER= 6 +IM_MAJOR_VER= 6.3.2 +IM_MINOR_VER= 3 IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} .if (${IM_MINOR_VER} != NONE) diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index 65986188cc8..b8f61d2eb2f 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.53 2007/01/09 09:52:33 adam Exp $ +@comment $NetBSD: PLIST,v 1.54 2007/02/06 14:52:46 adam Exp $ bin/Magick++-config bin/Magick-config bin/Wand-config @@ -32,7 +32,6 @@ include/magick/PreRvIcccm.h include/magick/animate.h 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 @@ -69,6 +68,7 @@ include/magick/magick-type.h include/magick/magick.h include/magick/memory_.h include/magick/methods.h +include/magick/mime.h include/magick/module.h include/magick/monitor.h include/magick/montage.h @@ -77,6 +77,7 @@ include/magick/paint.h include/magick/pixel.h include/magick/prepress.h include/magick/profile.h +include/magick/property.h include/magick/quantize.h include/magick/quantum.h include/magick/random_.h @@ -111,8 +112,8 @@ include/wand/display.h include/wand/drawing-wand.h include/wand/identify.h include/wand/import.h -include/wand/magick-attribute.h include/wand/magick-image.h +include/wand/magick-property.h include/wand/magick-wand.h include/wand/magick_wand.h include/wand/mogrify.h @@ -158,6 +159,7 @@ share/ImageMagick-${IM_MAJOR_VER}/NEWS share/ImageMagick-${IM_MAJOR_VER}/config/coder.xml share/ImageMagick-${IM_MAJOR_VER}/config/log.xml share/ImageMagick-${IM_MAJOR_VER}/config/magic.xml +share/ImageMagick-${IM_MAJOR_VER}/config/mime.xml share/ImageMagick-${IM_MAJOR_VER}/config/sRGB.icm share/ImageMagick-${IM_MAJOR_VER}/config/thresholds.xml share/doc/ImageMagick-${IM_MAJOR_VER}/images/arc.png @@ -197,6 +199,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/tricks.png share/doc/ImageMagick-${IM_MAJOR_VER}/images/wand.ico share/doc/ImageMagick-${IM_MAJOR_VER}/images/white-highlight.png share/doc/ImageMagick-${IM_MAJOR_VER}/index.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/ImageMagickObject.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Blob.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.fig share/doc/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.png @@ -241,7 +244,6 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/animate.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/annotate.html -share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/attribute.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/color.html @@ -260,8 +262,9 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/layer.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/list.html -share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-attribute.html share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-image.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.html +share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.php 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 diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 7c07e851755..7b98294ca51 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.82 2007/01/09 09:52:33 adam Exp $ +$NetBSD: distinfo,v 1.83 2007/02/06 14:52:46 adam Exp $ -SHA1 (ImageMagick-6.3.1-6.tar.bz2) = 2ab675dadf61ad5664f93a53ed20edab4e52d5b6 -RMD160 (ImageMagick-6.3.1-6.tar.bz2) = 6a410db9fbb857ff96e129548d2b9ab01c806695 -Size (ImageMagick-6.3.1-6.tar.bz2) = 5482825 bytes -SHA1 (patch-aa) = f0f477d9831e317924b837715ad2467560286644 -SHA1 (patch-ab) = 23cd3215eec4de0b1447c09a1d431f3004054621 +SHA1 (ImageMagick-6.3.2-3.tar.bz2) = dd62cfcde718893a8308febbc7f1116429c9b11f +RMD160 (ImageMagick-6.3.2-3.tar.bz2) = e12455b53959ad2c44afaa1ff008bc4cf991015b +Size (ImageMagick-6.3.2-3.tar.bz2) = 5532639 bytes +SHA1 (patch-aa) = f2505a5845b3f26c2bc18127777690024fcad692 +SHA1 (patch-ab) = 080ee4a9d4e4d188200cebd4169ff931d71cd0ec diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index 75460994a92..e18de9314b3 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.40 2006/12/09 10:57:49 adam Exp $ +$NetBSD: patch-aa,v 1.41 2007/02/06 14:52:47 adam Exp $ ---- configure.orig 2006-11-27 02:54:52.000000000 +0100 +--- configure.orig 2007-02-05 22:13:22.000000000 +0100 +++ configure -@@ -18993,9 +18993,6 @@ fi +@@ -18997,9 +18997,6 @@ fi # Enable building/use of libltdl if we are building shared libraries regardless # of whether modules are built or not. with_ltdl='no' @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.40 2006/12/09 10:57:49 adam Exp $ if test "$with_ltdl" != 'no'; then WITH_LTDL_TRUE= -@@ -34391,7 +34388,7 @@ cat >>confdefs.h <<\_ACEOF +@@ -34656,7 +34653,7 @@ cat >>confdefs.h <<\_ACEOF #define HasFONTCONFIG 1 _ACEOF @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.40 2006/12/09 10:57:49 adam Exp $ CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS" fi fi -@@ -36509,7 +36506,7 @@ cat >>confdefs.h <<\_ACEOF +@@ -36774,7 +36771,7 @@ cat >>confdefs.h <<\_ACEOF #define HasGVC 1 _ACEOF @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.40 2006/12/09 10:57:49 adam Exp $ CPPFLAGS="$GVC_CFLAGS $CPPFLAGS" fi fi -@@ -37054,7 +37051,7 @@ cat >>confdefs.h <<\_ACEOF +@@ -37319,7 +37316,7 @@ cat >>confdefs.h <<\_ACEOF #define HasRSVG 1 _ACEOF diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab index a4ceabbd644..00fa15d405d 100644 --- a/graphics/ImageMagick/patches/patch-ab +++ b/graphics/ImageMagick/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.25 2006/12/09 10:57:49 adam Exp $ +$NetBSD: patch-ab,v 1.26 2007/02/06 14:52:47 adam Exp $ ---- Makefile.in.orig 2006-11-27 02:54:57.000000000 +0100 +--- Makefile.in.orig 2007-02-05 22:13:28.000000000 +0100 +++ Makefile.in -@@ -3579,8 +3579,6 @@ WAND_CLEANFILES = \ +@@ -3627,8 +3627,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.25 2006/12/09 10:57:49 adam Exp $ @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/lib/ImageMagick++.pc -@@ -3630,7 +3628,6 @@ WAND_CLEANFILES = \ +@@ -3678,7 +3676,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.25 2006/12/09 10:57:49 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 \ -@@ -4882,7 +4879,6 @@ pkgconfig_DATA = \ +@@ -4930,7 +4927,6 @@ pkgconfig_DATA = \ # Manual pages to install man_MANS = \ $(MAGICK_MANS) \ diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index 2ed415c670d..1496c527abb 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.57 2007/01/17 23:47:20 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2007/02/06 14:52:47 adam Exp $ .include "../../graphics/ImageMagick/Makefile.common" PKGNAME= p5-PerlMagick-${DISTVERSION} -PKGREVISION= 1 SVR4_PKGNAME= p5pma MAINTAINER= pkgsrc-users@NetBSD.org -- cgit v1.2.3