Update ImageMagick to 6.9.5.7.

Only add dependancy (indirect) to glib20 if the depenancy uses glib20. [1]
Add Indirect dependancy to ilmbase for the exr plugin.

Reported by:	Miroslav Lachman <000.fbsd@quip.cz> (on freebsd-ports@) [1]
This commit is contained in:
Koop Mast 2016-08-21 19:52:54 +00:00
parent 96e21afed2
commit bc8b83e355
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=420583
3 changed files with 8 additions and 17 deletions

View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ImageMagick
DISTVERSION= 6.9.5-5
DISTVERSION= 6.9.5-7
PORTEPOCH= 1
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
@ -50,7 +50,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= MAKE=${MAKE_CMD}
CONFIGURE_ARGS= --without-dps
USE_LDCONFIG= yes
USE_GNOME= glib20 libxml2
USE_GNOME= libxml2
SAMPLE_FILES= coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
policy.xml quantization-table.xml thresholds.xml type-apple.xml \
@ -172,7 +172,8 @@ PLIST_SUB+= MODULES='@comment '
. if ${_IMAGEMAGICK_THREADS} == "no"
IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
. else
LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR
LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR \
libImath-2_2.so:graphics/ilmbase
PLIST_SUB+= OPENEXR=""
. endif
.else
@ -229,6 +230,7 @@ CONFIGURE_ARGS+= --without-gslib
.if ${PORT_OPTIONS:MLQR}
CONFIGURE_ARGS+= --with-lqr
LIB_DEPENDS+= liblqr-1.so:graphics/liblqr-1
USE_GNOME+= glib20
.else
CONFIGURE_ARGS+= --without-lqr
.endif

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1470820107
SHA256 (ImageMagick-6.9.5-5.tar.xz) = b3b5cc1989a53b8847ffdc3b5ed740ba0c9c4e9b103cbbac7d0a78e5b7d2936f
SIZE (ImageMagick-6.9.5-5.tar.xz) = 8784240
TIMESTAMP = 1471726909
SHA256 (ImageMagick-6.9.5-7.tar.xz) = c5f527ab5936527a23d9da2d80ebed906302f476908235ee2b31790dfd665901
SIZE (ImageMagick-6.9.5-7.tar.xz) = 8788196

View file

@ -1,11 +0,0 @@
--- tests/validate.c.orig 2016-08-10 11:23:44.131844000 +0200
+++ tests/validate.c 2016-08-10 11:24:56.257698000 +0200
@@ -2394,7 +2394,7 @@
else
{
(void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickHomeURL();
+ GetMagickVersion((size_t *) NULL));
(void) FormatLocaleFile(stdout,"Copyright: %s\n\n",
GetMagickCopyright());
(void) FormatLocaleFile(stdout,