CVS commit: pkgsrc/graphics/ImageMagick

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Oct  5 17:23:29 UTC 2020

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile.common distinfo
Added Files:
        pkgsrc/graphics/ImageMagick/patches: patch-MagickCore_cache.c

Log Message:
ImageMagick: Update to 7.0.10.33

pkgsrc changes:
---------------
  * Package update
  * Fix build on FreeBSD (pull requested upstream)

upstream changes:
-----------------
2020-10-04  7.0.10-33  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.10-33 GIT revision 17683:c1bfec283:20201004

2020-10-04  7.0.10-33  <quetzlzacatenango@image...>
  * miscellaneous clean-up.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 pkgsrc/graphics/ImageMagick/Makefile.common
cvs rdiff -u -r1.234 -r1.235 pkgsrc/graphics/ImageMagick/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_cache.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick/Makefile.common
diff -u pkgsrc/graphics/ImageMagick/Makefile.common:1.217 pkgsrc/graphics/ImageMagick/Makefile.common:1.218
--- pkgsrc/graphics/ImageMagick/Makefile.common:1.217   Mon Oct  5 11:33:43 2020
+++ pkgsrc/graphics/ImageMagick/Makefile.common Mon Oct  5 17:23:29 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.217 2020/10/05 11:33:43 wiz Exp $
+# $NetBSD: Makefile.common,v 1.218 2020/10/05 17:23:29 triaxx Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
 IM_MAJOR_VER=          7.0.10
-IM_MINOR_VER=          32
+IM_MINOR_VER=          33
 IM_MAJOR_LIB_VER=      7
 
 .if (${IM_MINOR_VER} != NONE)

Index: pkgsrc/graphics/ImageMagick/distinfo
diff -u pkgsrc/graphics/ImageMagick/distinfo:1.234 pkgsrc/graphics/ImageMagick/distinfo:1.235
--- pkgsrc/graphics/ImageMagick/distinfo:1.234  Mon Oct  5 11:33:43 2020
+++ pkgsrc/graphics/ImageMagick/distinfo        Mon Oct  5 17:23:29 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.234 2020/10/05 11:33:43 wiz Exp $
+$NetBSD: distinfo,v 1.235 2020/10/05 17:23:29 triaxx Exp $
 
-SHA1 (ImageMagick-7.0.10-32.tar.xz) = 1174f39deaa71b8aaf7279c4648e172db42321ef
-RMD160 (ImageMagick-7.0.10-32.tar.xz) = e74f301d87d24b56b615e10c099e5d11b89dd5c6
-SHA512 (ImageMagick-7.0.10-32.tar.xz) = 90dccd74b903228a8d8b1026f684375d5dbb4e275281a460d08db3eb5d07152a492a24ad08cc20c22d5cbdcb8161d262e0b4af33a6abfd85681e558c41419444
-Size (ImageMagick-7.0.10-32.tar.xz) = 9652884 bytes
+SHA1 (ImageMagick-7.0.10-33.tar.xz) = 92f9f8d5e87e5bf2d1c32e488d45c9a04800bdbf
+RMD160 (ImageMagick-7.0.10-33.tar.xz) = 88f3e91b905534ac4f628f087dca731d56576be1
+SHA512 (ImageMagick-7.0.10-33.tar.xz) = ebc1fe858a9a8d06aadd8da78667d98ef8be2f27795620db0d2dbb79e5e164fae52c7f7e8abd0ff651dd76e1a0820b70af70b7551290dcd32c1e43676c623622
+Size (ImageMagick-7.0.10-33.tar.xz) = 9657908 bytes
 SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f
+SHA1 (patch-MagickCore_cache.c) = d9bf65fd0d26bcd4339f4be44510ef8eb44bc319

Added files:

Index: pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_cache.c
diff -u /dev/null pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_cache.c:1.1
--- /dev/null   Mon Oct  5 17:23:29 2020
+++ pkgsrc/graphics/ImageMagick/patches/patch-MagickCore_cache.c        Mon Oct  5 17:23:29 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-MagickCore_cache.c,v 1.1 2020/10/05 17:23:29 triaxx Exp $
+
+Fix build on FreeBSD
+https://github.com/triaxx/ImageMagick/commit/11583e4
+
+--- MagickCore/cache.c.orig    2020-10-04 15:44:21.000000000 +0000
++++ MagickCore/cache.c
+@@ -621,7 +621,7 @@ static MagickBooleanType ClonePixelCacheOnDisk(
+   quantum=(size_t) MagickMaxBufferExtent;
+   if ((fstat(cache_info->file,&file_stats) == 0) && (file_stats.st_size > 0))
+     {
+-#if defined(MAGICKCORE_HAVE_SENDFILE) && !defined(__APPLE__)
++#if defined(MAGICKCORE_HAVE_SENDFILE) && !defined(__APPLE__) && !defined(__FreeBSD__)
+       if (cache_info->length < 0x7ffff000)
+         {
+           count=sendfile(clone_info->file,cache_info->file,(off_t *) NULL,