From 605969fc2adfdfe149dc3abcc4b3fb6fc3df754c Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 29 Jul 2020 11:21:57 +0000 Subject: [PATCH] ImageMagick: update to 7.0.10.24. Clean up pkglint while here. 2020-07-18 7.0.10-24 * Release ImageMagick version 7.0.10-24 GIT revision 17483:d11a2ec03:20200718 2020-07-18 7.0.10-24 Dirk Lemstra * To preserve compression of input image with the tiff encoder use: -define tiff:preserve-compression=true. 2020-07-05 7.0.10-24 * Add support for the -white-balance command-line option. * Discover hidden files when globbing (e.g. *.jpg) (reference https://github.com/ImageMagick/ImageMagick/discussions/2239). * New inverse-log evaluate operator. 2020-07-04 7.0.10-23 * Release ImageMagick version 7.0.10-23 GIT revision 17437:894231bc3:20200704 2020-06-28 7.0.10-23 * Ensure that float is valid in ClampToQuantum() (reference https://github.com/ImageMagick/ImageMagick/pull/2219). * New pseudo-image format, ashlar, e.g. convert *.jpg -resize 320x320 ashlar:canvas.png). 2020-06-27 7.0.10-22 * Release ImageMagick version 7.0.10-22 GIT revision 17415:5318a3e0a:20200627 2020-06-24 7.0.10-22 * Fix wrapping of caption (reference https://github.com/ImageMagick/ImageMagick/issues/2178). * Sanity check of affine matrix when drawing. 2020-06-22 7.0.10-21 * Release ImageMagick version 7.0.10-21 GIT revision 17395:af81c28c9:20200622 2020-06-21 7.0.10-21 * New image property, %N, only report the # of frames in an image sequence, just once rather than on a per frame basis * Problems converting CMYK to RGB regression (reference https://github.com/ImageMagick/ImageMagick6/issues/83) 2020-06-21 7.0.10-21 Dirk Lemstra * Added support for 32 bit zip with prediction format to the PSD decoder (reference https://github.com/ImageMagick/ImageMagick/issues/455). 2020-06-20 7.0.10-20 * Release ImageMagick version 7.0.10-20 GIT revision 17372:d91c43f3b:20200620 2020-06-14 7.0.10-20 * Fix out-of-bounds vulnerability when reading sixel images (reference https://github.com/ImageMagick/ImageMagick/issues/2143). * Fix incorrect parsing of font family list (reference https://github.com/ImageMagick/ImageMagick/issues/2153). --- graphics/ImageMagick/Makefile.common | 4 ++-- graphics/ImageMagick/PLIST | 3 ++- graphics/ImageMagick/buildlink3.mk | 14 +++++++------- graphics/ImageMagick/distinfo | 10 +++++----- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common index ab2816a192de..59d2a9c248e7 100644 --- a/graphics/ImageMagick/Makefile.common +++ b/graphics/ImageMagick/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.212 2020/06/19 10:31:06 wiz Exp $ +# $NetBSD: Makefile.common,v 1.213 2020/07/29 11:21:57 wiz Exp $ # # used by graphics/p5-PerlMagick/Makefile IM_MAJOR_VER= 7.0.10 -IM_MINOR_VER= 19 +IM_MINOR_VER= 24 IM_MAJOR_LIB_VER= 7 .if (${IM_MINOR_VER} != NONE) diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST index e336e5db0c60..7e791e1ebc11 100644 --- a/graphics/ImageMagick/PLIST +++ b/graphics/ImageMagick/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.110 2020/06/19 10:31:06 wiz Exp $ +@comment $NetBSD: PLIST,v 1.111 2020/07/29 11:21:57 wiz Exp $ bin/Magick++-config bin/MagickCore-config bin/MagickWand-config @@ -1134,6 +1134,7 @@ share/doc/ImageMagick-7/www/assets/magick.js share/doc/ImageMagick-7/www/binary-releases.html share/doc/ImageMagick-7/www/changelog.html share/doc/ImageMagick-7/www/cipher.html +share/doc/ImageMagick-7/www/cite.html share/doc/ImageMagick-7/www/clahe.html share/doc/ImageMagick-7/www/color-management.html share/doc/ImageMagick-7/www/color-thresholding.html diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index c458c09082e0..eb2f44f2e3fb 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.79 2020/06/02 08:22:42 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.80 2020/07/29 11:21:57 wiz Exp $ BUILDLINK_TREE+= ImageMagick @@ -12,22 +12,22 @@ BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick pkgbase := ImageMagick .include "../../mk/pkg-build-options.mk" -.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mdjvu) +.if ${PKG_BUILD_OPTIONS.ImageMagick:Mdjvu} .include "../../graphics/djvulibre-lib/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjp2) +.if ${PKG_BUILD_OPTIONS.ImageMagick:Mjp2} .include "../../graphics/openjpeg/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mliblqr) +.if ${PKG_BUILD_OPTIONS.ImageMagick:Mliblqr} .include "../../graphics/liblqr/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mopenexr) +.if ${PKG_BUILD_OPTIONS.ImageMagick:Mopenexr} .include "../../graphics/openexr/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mwmf) +.if ${PKG_BUILD_OPTIONS.ImageMagick:Mwmf} .include "../../graphics/libwmf/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mx11) +.if ${PKG_BUILD_OPTIONS.ImageMagick:Mx11} .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index d915216902ef..dd6ef4e752be 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.229 2020/06/19 10:31:06 wiz Exp $ +$NetBSD: distinfo,v 1.230 2020/07/29 11:21:57 wiz Exp $ -SHA1 (ImageMagick-7.0.10-19.tar.xz) = 96c81dfd60989513af46424860a16198fc8f5ec2 -RMD160 (ImageMagick-7.0.10-19.tar.xz) = cc84530c7ba366d2dab888c85ff3fab707792271 -SHA512 (ImageMagick-7.0.10-19.tar.xz) = ed577e48ca88d37c01d7e889fa1364af3398e94864b393fcc70711a3317c34adababe5ac0ea7995bd23e10aac554522ed69d290c4c11b946e8a0de86c6365e84 -Size (ImageMagick-7.0.10-19.tar.xz) = 9685552 bytes +SHA1 (ImageMagick-7.0.10-24.tar.xz) = 0fd735ea8e6aa4793af94d5302cd57540c33a43c +RMD160 (ImageMagick-7.0.10-24.tar.xz) = 948542a000d35e9a6b971ffe831b37e660eea84c +SHA512 (ImageMagick-7.0.10-24.tar.xz) = f623fef60d171e51b882ad9d7a70fab0d7af4b66f9280924f4f8899908e0ea043be93eaa56a1a669c565d023e27a9a21229714e2f85558fc7d68612ac92cfa9f +Size (ImageMagick-7.0.10-24.tar.xz) = 9705444 bytes SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f