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

update to ImageMagick-6.9.10-82, while there enable zstd as suggested

Browse Source 
by Brad (ImageMagick depends on libtiff which pulls in zstd anyway now).
This commit is contained in:
sthen 2019-12-31 23:44:10 +00:00
parent de44380f30
commit 3ef7cb530d
4 changed files with 6 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/ImageMagick/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.196 2019/12/28 14:39:47 sthen Exp $
# $OpenBSD: Makefile,v 1.197 2019/12/31 23:44:10 sthen Exp $
BROKEN-arm= libm functions (cabs etc) not detected, fallback code is broken
COMMENT= image processing tools
VER= 6.9.10
DASHVER= 80
DASHVER= 82
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
PORTROACH= site:https://imagemagick.org/download/ limit:6.*
@ -31,12 +31,13 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xau Xdmcp Xext Xt bz2
WANTLIB += c djvulibre expat fftw3 fontconfig freetype iconv jasper
WANTLIB += jbig jpeg lcms2 lzma m openjp2 perl png raw_r tiff webp
WANTLIB += webpmux xcb xml2 z
WANTLIB += webpdemux webpmux xcb xml2 z zstd
COMPILER = base-clang ports-gcc base-gcc
LIB_DEPENDS = archivers/bzip2 \
archivers/xz \
archivers/zstd \
converters/libiconv \
graphics/djvulibre \
graphics/jbigkit \
@ -71,7 +72,6 @@ CONFIGURE_ARGS+= --without-gcc-arch \
--without-raqm \
--without-rsvg \
--without-wmf \
--without-zstd \
--disable-openmp
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \

4
graphics/ImageMagick/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ImageMagick-6.9.10-80.tar.xz) = qbEVCRPrPtw0P8NC4QhgYvp66hiCLfIxdnTDdah13W8=
SIZE (ImageMagick-6.9.10-80.tar.xz) = 9062028
SHA256 (ImageMagick-6.9.10-82.tar.xz) = EP3bTp2kUCm78UWKmV5yPDO6FEllTTJ6G8AGCMVOgq4=
SIZE (ImageMagick-6.9.10-82.tar.xz) = 9059664

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

@ -1,19 +0,0 @@
$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
View File

@ -1,28 +0,0 @@
$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