summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2020-10-14 16:15:37 +0000
committerwiz <wiz@pkgsrc.org>2020-10-14 16:15:37 +0000
commit9896bd0184ca1ca6b72d9f2b13de857b5fbda0f4 (patch)
treeff27b05457cc283942303ef7abcc75344d349c90 /graphics
parent486e848ba7acec26a706dfc393a99194798f1b17 (diff)
downloadpkgsrc-9896bd0184ca1ca6b72d9f2b13de857b5fbda0f4.tar.gz
ImageMagick: update to 7.0.10.34.
2020-10-07 7.0.10-34 <quetzlzacatenango@image...> * Release ImageMagick version 7.0.10-34 GIT revision 17695:de3284341:20201008 2020-10-05 7.0.10-34 <quetzlzacatenango@image...> * check for linux-compatible sendfile().
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile.common4
-rw-r--r--graphics/ImageMagick/distinfo11
-rw-r--r--graphics/ImageMagick/patches/patch-MagickCore_cache.c16
3 files changed, 7 insertions, 24 deletions
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 5ec80039a2f..7ee4d885392 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.218 2020/10/05 17:23:29 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.219 2020/10/14 16:15:37 wiz Exp $
#
# used by graphics/p5-PerlMagick/Makefile
IM_MAJOR_VER= 7.0.10
-IM_MINOR_VER= 33
+IM_MINOR_VER= 34
IM_MAJOR_LIB_VER= 7
.if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 778145f8a2b..bb12547b2f0 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.235 2020/10/05 17:23:29 triaxx Exp $
+$NetBSD: distinfo,v 1.236 2020/10/14 16:15:37 wiz Exp $
-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 (ImageMagick-7.0.10-34.tar.xz) = 833b63c04473aa65b6d4ff667868cceae118509c
+RMD160 (ImageMagick-7.0.10-34.tar.xz) = 6494eb48f7f8fdc88324b0b7d8fee96f687abd75
+SHA512 (ImageMagick-7.0.10-34.tar.xz) = f3637c929d75bd1eff7845c7fb85ca58bb6e00f618f2c39883e7ea5e080e3fcbc3f5d5989935df17c5498ff11723e0362f684e77f5bcbbff30bb0b30208c23d3
+Size (ImageMagick-7.0.10-34.tar.xz) = 9655368 bytes
SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f
-SHA1 (patch-MagickCore_cache.c) = d9bf65fd0d26bcd4339f4be44510ef8eb44bc319
diff --git a/graphics/ImageMagick/patches/patch-MagickCore_cache.c b/graphics/ImageMagick/patches/patch-MagickCore_cache.c
deleted file mode 100644
index 71166509bbc..00000000000
--- a/graphics/ImageMagick/patches/patch-MagickCore_cache.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$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,