[pkgsrc/trunk]: pkgsrc/graphics GraphicsMagick: updated to 1.3.31

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc40ef62640e
branches:  trunk
changeset: 315257:bc40ef62640e
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Nov 20 10:19:29 2018 +0000

description:
GraphicsMagick: updated to 1.3.31

1.3.31:

Special Issues:
Firmware and operating system updates to address the Spectre vulnerability (and possibly to some extent the Meltdown vulnerability) have substantially penalized GraphicsMagick's OpenMP performance. 
Performance is reduced even with GCC 7 and 8's improved optimizers. There does not appear to be anything we can do about this.
Security Fixes:

GraphicsMagick is now participating in Google's oss-fuzz project due to the contributions and assistance of Alex Gaynor. Since February 4 2018, 292 issues have been opened by oss-fuzz and 279 of 
those issues have been resolved. The issues list is available at https://bugs.chromium.org/p/oss-fuzz/issues/list under search term "graphicsmagick". Issues are available for anyone to view and 
duplicate if they have been in "Verified" status for 30 days, or if they have been in "New" status for 90 days. There are too many fixes to list here. Please consult the GraphicsMagick ChangeLog 
file, Mercurial repository commit log, and the oss-fuzz issues list for details.

Bug fixes:
See above note about oss-fuzz fixes.
CINEON: Fix unexpected hang on a crafted Cineon image. SourceForge issue 571.
Drawing recursion is limited to 100 and may be tuned via the MAX_DRAWIMAGE_RECURSION pre-processor definition.
Fix reading MIFF files using legacy keyword 'color-profile' for ICC color profile as was used by ImageMagick 4.2.9.
Fix reading/writing files when 'magick' is specified in lower case. This bug was a regression in 1.3.30.

New Features:
TIFF: Support Zstd compression in TIFF. This requires libtiff 4.0.10 or later.
TIFF: Support WebP compression in TIFF. This requires libtiff 4.0.10 or later.

API Updates:
MagickMonitor() is marked as deprecated. Code should not be using this function any more.

Feature improvements:
The progress monitor callbacks (registered using MagickMonitor() or MagickMonitorFormatted()) are serialized via a common semaphore rather than via critical sections in OpenMP loops. OpenMP loops are 
updated to use OpenMP 'atomic' and 'flush' to update shared loop variables rather than using a OpenMP 'critical' construct, reducing contention. Performance on some targets is observed to have been 
improved by this change.

Build Changes:
There was already a 'compare' command installed with the '--enable-magick-compat' configure option was used but it did not function. Now it functions. There was no compare command in ImageMagick 
5.5.2 and this compare command is only roughly similar to a compare command in some subsequent ImageMagick release.
Removed Remove Ghostscript library support (--with-gslib) from configure script. The 'HasGS' pre-processor defines which were enabled by this remain in the source code so it is still possible to use 
this library if absolutely necessary (e.g. CPPFLAGS=-DHasGS LIBS=-lgs).
No longer explicitly link with the OpenMP library when it will be supplied already due to CFLAGS.

Behavior Changes:
JPEG: Libjpeg-turbo is allowed 1/5th the memory resource limit provided for Graphicsmagick via the cinfo->mem->max_memory_to_use option, which is part of the IJG JPEG API/ABI, but usually not 
supported there. This feature works for libjpeg-turbo 1.5.2 and later. Limiting the memory usage is useful since libjpeg-turbo may otherwise consume arbitrary amounts of memory even before 
Graphicsmagick is informed of the image dimensions.
JPEG: The maximum number of JPEG progressive scans is limited to 50. Otherwise some technically valid files could be read for almost forever.

diffstat:

 graphics/GraphicsMagick/Makefile                              |   6 ++-
 graphics/GraphicsMagick/Makefile.common                       |   4 +-
 graphics/GraphicsMagick/distinfo                              |  13 ++++---
 graphics/GraphicsMagick/options.mk                            |  18 +---------
 graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in |  10 +++---
 graphics/p5-GraphicsMagick/Makefile                           |   3 +-
 6 files changed, 22 insertions(+), 32 deletions(-)

diffs (119 lines):

diff -r 43a0b6773ec5 -r bc40ef62640e graphics/GraphicsMagick/Makefile
--- a/graphics/GraphicsMagick/Makefile  Tue Nov 20 09:38:26 2018 +0000
+++ b/graphics/GraphicsMagick/Makefile  Tue Nov 20 10:19:29 2018 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.91 2018/11/14 22:21:34 kleink Exp $
+# $NetBSD: Makefile,v 1.92 2018/11/20 10:19:29 adam Exp $
 
-PKGREVISION= 3
 .include "Makefile.common"
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -30,6 +29,9 @@
 
 .include "options.mk"
 
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff -r 43a0b6773ec5 -r bc40ef62640e graphics/GraphicsMagick/Makefile.common
--- a/graphics/GraphicsMagick/Makefile.common   Tue Nov 20 09:38:26 2018 +0000
+++ b/graphics/GraphicsMagick/Makefile.common   Tue Nov 20 10:19:29 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.21 2018/06/24 10:16:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2018/11/20 10:19:29 adam Exp $
 #
 # used by graphics/GraphicsMagick/Makefile
 # used by graphics/p5-GraphicsMagick/Makefile
 
 GM_MAJOR_VER=  1.3
-GM_MINOR_VER=  30
+GM_MINOR_VER=  31
 DISTVERSION=   ${GM_MAJOR_VER}.${GM_MINOR_VER}
 DISTNAME=      GraphicsMagick-${DISTVERSION}
 CATEGORIES=    graphics
diff -r 43a0b6773ec5 -r bc40ef62640e graphics/GraphicsMagick/distinfo
--- a/graphics/GraphicsMagick/distinfo  Tue Nov 20 09:38:26 2018 +0000
+++ b/graphics/GraphicsMagick/distinfo  Tue Nov 20 10:19:29 2018 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.47 2018/06/24 10:16:49 wiz Exp $
+$NetBSD: distinfo,v 1.48 2018/11/20 10:19:29 adam Exp $
 
-SHA1 (GraphicsMagick-1.3.30.tar.xz) = e9b1f6b84739eef3e112d4905e3d72b1e6983abd
-RMD160 (GraphicsMagick-1.3.30.tar.xz) = 5048f04e926ae2a4d2141ed1b8605a511e077fbc
-SHA512 (GraphicsMagick-1.3.30.tar.xz) = 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
-Size (GraphicsMagick-1.3.30.tar.xz) = 5496116 bytes
-SHA1 (patch-config_delegates.mgk.in) = c7a38daeeccd12e19480d1222e400899da1d4153
+SHA1 (GraphicsMagick-1.3.31.tar.xz) = 06229cbb16cc9a3eff9b1bd0426a88fb6b806bd9
+RMD160 (GraphicsMagick-1.3.31.tar.xz) = 55f4448820f8b24f2d50f989775cc263490451fd
+SHA512 (GraphicsMagick-1.3.31.tar.xz) = 7bfc38fcbe32a049650f46a4f3c1137bea827490fe3fdbd71dc0c70afbcf513195ef7f8e94557774c7cb83e60249f2c5be7d8cfc8ef33043e99b39cea2edbf19
+Size (GraphicsMagick-1.3.31.tar.xz) = 5547684 bytes
+SHA1 (patch-config_delegates.mgk.in) = c52192a35bede530d310688a576ef2181a9f073c
+SHA1 (patch-configure) = bdb76557cd8a5c116b6c84dc63f4e35ddde39c87
diff -r 43a0b6773ec5 -r bc40ef62640e graphics/GraphicsMagick/options.mk
--- a/graphics/GraphicsMagick/options.mk        Tue Nov 20 09:38:26 2018 +0000
+++ b/graphics/GraphicsMagick/options.mk        Tue Nov 20 10:19:29 2018 +0000
@@ -1,25 +1,13 @@
-# $NetBSD: options.mk,v 1.6 2013/04/25 03:53:11 sbd Exp $
+# $NetBSD: options.mk,v 1.7 2018/11/20 10:19:29 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.GraphicsMagick
-PKG_SUPPORTED_OPTIONS= bzip2 lzma x11 jasper ghostscript wmf
-PKG_SUGGESTED_OPTIONS= bzip2 lzma x11 jasper
+PKG_SUPPORTED_OPTIONS= x11 jasper ghostscript wmf
+PKG_SUGGESTED_OPTIONS= x11 jasper
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   jasper x11
 
-.if !empty(PKG_OPTIONS:Mbzip2)
-.include "../../archivers/bzip2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-bzlib
-.endif
-
-.if !empty(PKG_OPTIONS:Mlzma)
-.include "../../archivers/xz/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-lzma
-.endif
-
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff -r 43a0b6773ec5 -r bc40ef62640e graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in
--- a/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in     Tue Nov 20 09:38:26 2018 +0000
+++ b/graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in     Tue Nov 20 10:19:29 2018 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-config_delegates.mgk.in,v 1.1 2016/06/06 11:46:34 wiz Exp $
+$NetBSD: patch-config_delegates.mgk.in,v 1.2 2018/11/20 10:19:29 adam Exp $
 
 Avoid tools directory in installed file.
 
---- config/delegates.mgk.in.orig       2016-05-30 17:19:54.000000000 +0000
+--- config/delegates.mgk.in.orig       2018-11-17 16:13:19.000000000 +0000
 +++ config/delegates.mgk.in
-@@ -98,8 +98,8 @@
-   <!-- Read CMYK Postscript, EPS, and PDF  -->
-   <delegate decode="gs-cmyk" stealth="True" command='"@PSDelegate@" -q -dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSCMYKDevice@ -dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s 
"-sOutputFile=%s" -- "%s" -c quit' />
+@@ -107,8 +107,8 @@
+   <!-- Read color PDF using Poppler's pdftoppm -->
+   <delegate decode="poppler-color" stealth="True" command='"pdftoppm" "-freetype" "yes" "-rx" "-aa" "yes" "-aaVector" "yes" "72" "-ry" "72" "%s" ">" "%s"' />
  
 -  <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
 -  <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
diff -r 43a0b6773ec5 -r bc40ef62640e graphics/p5-GraphicsMagick/Makefile
--- a/graphics/p5-GraphicsMagick/Makefile       Tue Nov 20 09:38:26 2018 +0000
+++ b/graphics/p5-GraphicsMagick/Makefile       Tue Nov 20 10:19:29 2018 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.41 2018/11/14 22:21:44 kleink Exp $
+# $NetBSD: Makefile,v 1.42 2018/11/20 10:19:29 adam Exp $
 
-PKGREVISION= 3
 .include "../../graphics/GraphicsMagick/Makefile.common"
 
 PKGNAME=       p5-GraphicsMagick-${DISTVERSION}