cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to ImageMagick 6.9.10-80, plus add a post-release patch researched by

Browse Source 
cwen@ that may fix some consumers on gcc3 arches.
This commit is contained in:
sthen 2019-12-28 14:39:47 +00:00
parent f51cff49fb
commit 2c9c567a0d
4 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/ImageMagick/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.195 2019/12/19 15:39:10 sthen Exp $
# $OpenBSD: Makefile,v 1.196 2019/12/28 14:39:47 sthen Exp $
BROKEN-arm= libm functions (cabs etc) not detected, fallback code is broken
COMMENT= image processing tools
VER= 6.9.10
DASHVER= 79
DASHVER= 80
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
PORTROACH= site:https://imagemagick.org/download/ limit:6.*
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += MagickCore-6.Q16 6.7 # 6.0
SHARED_LIBS += MagickCore-6.Q16 7.0 # 6.0
SHARED_LIBS += MagickWand-6.Q16 4.2 # 6.0
SHARED_LIBS += Magick++-6.Q16 5.2 # 8.0

4
graphics/ImageMagick/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ImageMagick-6.9.10-79.tar.xz) = Ure/Bxdf7KjaESoJNmG6p/50U+uMV22PkEE1zDwVVn4=
SIZE (ImageMagick-6.9.10-79.tar.xz) = 9066380
SHA256 (ImageMagick-6.9.10-80.tar.xz) = qbEVCRPrPtw0P8NC4QhgYvp66hiCLfIxdnTDdah13W8=
SIZE (ImageMagick-6.9.10-80.tar.xz) = 9062028

19
graphics/ImageMagick/patches/patch-magick_magick-config_h Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-magick_magick-config_h,v 1.1 2019/12/28 14:39:48 sthen Exp $
From 4e13897e9a9c3edf52c84b45217e26f5244f9986 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Thu, 26 Dec 2019 12:14:48 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/67
Index: magick/magick-config.h
--- magick/magick-config.h.orig
+++ magick/magick-config.h
@@ -162,7 +162,7 @@ extern "C" {
# define __has_builtin(x) 0
#endif
-#if __STDC_VERSION__ > 201112L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ > 201112L && !defined(__MINGW32__)
# define MAGICKCORE_HAVE_STDC_ALIGNED_ALLOC 1
#endif

28
graphics/ImageMagick/patches/patch-magick_memory__h Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-magick_memory__h,v 1.1 2019/12/28 14:39:48 sthen Exp $
From 4e13897e9a9c3edf52c84b45217e26f5244f9986 Mon Sep 17 00:00:00 2001
From: Cristy <mikayla-grace@urban-warrior.org>
Date: Thu, 26 Dec 2019 12:14:48 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/67
Index: magick/memory_.h
--- magick/memory_.h.orig
+++ magick/memory_.h
@@ -68,7 +68,7 @@ extern MagickExport void
SetMagickMemoryMethods(AcquireMemoryHandler,ResizeMemoryHandler,
DestroyMemoryHandler);
-inline MagickExport MagickBooleanType HeapOverflowSanityCheck(
+static inline MagickBooleanType HeapOverflowSanityCheck(
const size_t count,const size_t quantum)
{
if ((count == 0) || (quantum == 0))
@@ -81,7 +81,7 @@ inline MagickExport MagickBooleanType HeapOverflowSani
return(MagickFalse);
}
-inline MagickExport MagickBooleanType HeapOverflowSanityCheckGetSize(
+static inline MagickBooleanType HeapOverflowSanityCheckGetSize(
const size_t count,const size_t quantum,size_t *const extent)
{
size_t