mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
Update from 6.3.5-10 to 6.3.6-9. Some of our patches were accepted
upstream. The tests should work with and without X11. Enable FPX by default. Resolve all related PRs. Approved by: portmgr (linimon) PR: 67815 PR: 117635 PR: 116874 PR: 114387
This commit is contained in:
Mikhail Teterin
parent
9e6b25f9c6
commit
a439f82661
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202558
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= ImageMagick
|
||||
DISTVERSION= 6.3.5-10
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 6.3.6-9
|
||||
CATEGORIES= graphics perl5
|
||||
MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \
|
||||
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
|
||||
@ -37,9 +36,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
|
||||
CONFIGURE_ARGS= --enable-shared --without-dps
|
||||
USE_LDCONFIG= yes
|
||||
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
|
||||
USE_DOS2UNIX= YES
|
||||
DOS2UNIX_REGEX= .*\.(html|t)$
|
||||
|
||||
|
||||
MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
|
||||
animate.1 conjure.1 compare.1 composite.1 convert.1 display.1 \
|
||||
@ -58,13 +54,14 @@ OPTIONS= X11 "X11 support" on \
|
||||
IMAGEMAGICK_16BIT_PIXEL "16bit pixel support" on \
|
||||
IMAGEMAGICK_DJVU "DJVU format support (needs threads)" off \
|
||||
IMAGEMAGICK_LCMS "LCMS support" on \
|
||||
IMAGEMAGICK_HDRI "High Dynamic Range Images (HDRI)" off \
|
||||
IMAGEMAGICK_TTF "Freetype support" on \
|
||||
IMAGEMAGICK_FONTCONFIG "Fontconfig support" on \
|
||||
IMAGEMAGICK_JPEG "JPG format support" on \
|
||||
IMAGEMAGICK_OPENEXR "OpenEXR support (needs threads)" off \
|
||||
IMAGEMAGICK_PNG "PNG format support" on \
|
||||
IMAGEMAGICK_TIFF "TIFF format support" on \
|
||||
IMAGEMAGICK_FPX "FPX format support" off \
|
||||
IMAGEMAGICK_FPX "FPX format support" on \
|
||||
IMAGEMAGICK_JBIG "JBIG format support" on \
|
||||
IMAGEMAGICK_JPEG2000 "JPEG2000 format support" on \
|
||||
IMAGEMAGICK_DOT "GraphViz dot graphs support" off \
|
||||
@ -76,10 +73,16 @@ OPTIONS= X11 "X11 support" on \
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if defined(WITH_GHOSTSCRIPT_GNU)
|
||||
.if defined(WITH_GHOSTSCRIPT_GNU) && !defined(WITHOUT_IMAGEMAGICK_PDF)
|
||||
IGNORE= requires newer version of ghostscript
|
||||
.endif
|
||||
|
||||
.if defined(WITH_IMAGEMAGICK_HDRI)
|
||||
CONFIGURE_ARGS+= --enable-hdri
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-hdri
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_IMAGEMAGICK_PERL)
|
||||
CONFIGURE_ARGS+= --with-perl=${PERL5}
|
||||
PLIST_SUB+= WITH_PERL=''
|
||||
@ -101,9 +104,6 @@ WITH_IMAGEMAGICK_THREADS=yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-threads
|
||||
.undef WITH_IMAGEMAGICK_THREADS
|
||||
.if defined(WITH_IMAGEMAGICK_OPENEXR) && !defined(WITHOUT_IMAGEMAGICK_PERL)
|
||||
. warning OpenEXR's libIlmThread may prevent PerlMagick from working
|
||||
.endif
|
||||
.if defined(WITH_IMAGEMAGICK_DJVU)
|
||||
. warning DjVu requires threads and will not be supported
|
||||
. undef WITH_IMAGEMAGICK_DJVU
|
||||
@ -190,7 +190,7 @@ CONFIGURE_ARGS+= --without-bzlib
|
||||
|
||||
# FPX (FlashPIX) images
|
||||
.if !defined(WITHOUT_IMAGEMAGICK_FPX)
|
||||
LIB_DEPENDS+= fpx:${PORTSDIR}/graphics/libfpx
|
||||
LIB_DEPENDS+= fpx.[2-9]:${PORTSDIR}/graphics/libfpx
|
||||
CONFIGURE_ARGS+= --with-fpx
|
||||
PLIST_SUB+= FPX=""
|
||||
.else
|
||||
@ -356,14 +356,21 @@ test check:
|
||||
.if !defined(WITHOUT_IMAGEMAGICK_TESTS)
|
||||
. for m in TTF
|
||||
. if defined(WITHOUT_IMAGEMAGICK_$m)
|
||||
IGNORE+= Absence of $m breaks self-tests. Enable $m or disable automatic tests.
|
||||
. warning Absence of $m breaks self-tests. Disabling them.
|
||||
WITHOUT_IMAGEMAGICK_TESTS=yes
|
||||
. endif
|
||||
. endfor
|
||||
. for m in FPX
|
||||
.endif
|
||||
.if !defined(WITHOUT_IMAGEMAGICK_TESTS)
|
||||
. for m in HDRI MODULES
|
||||
. if defined(WITH_IMAGEMAGICK_$m)
|
||||
IGNORE+= Presence of $m breaks self-tests. Disable $m or disable automatic tests.
|
||||
. warning Presence of $m breaks self-tests. Disabling them.
|
||||
WITHOUT_IMAGEMAGICK_TESTS=yes
|
||||
. endif
|
||||
. endfor
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_IMAGEMAGICK_TESTS)
|
||||
post-build: test
|
||||
.endif
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (ImageMagick-6.3.5-10.tar.bz2) = 1b31777138ed78ae0e95b8480cb7e2c2
|
||||
SHA256 (ImageMagick-6.3.5-10.tar.bz2) = a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84
|
||||
SIZE (ImageMagick-6.3.5-10.tar.bz2) = 7571418
|
||||
MD5 (ImageMagick-6.3.6-9.tar.bz2) = 689dc20e2dc016e1da14f2d5f1abc26f
|
||||
SHA256 (ImageMagick-6.3.6-9.tar.bz2) = 961af892c253902525da46ee1b88576242f1263909d25c5e3b0b54b5e68bc652
|
||||
SIZE (ImageMagick-6.3.6-9.tar.bz2) = 7381799
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
This should be fixed in 6.3.6-0
|
||||
|
||||
http://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=9767
|
||||
|
||||
--- magick/string.c 2007-09-09 21:20:56.000000000 -0400
|
||||
+++ magick/string.c 2007-09-25 14:51:17.000000000 -0400
|
||||
@@ -219,5 +219,4 @@
|
||||
return(*destination);
|
||||
}
|
||||
- *destination=(char *) NULL;
|
||||
length=strlen(source);
|
||||
if (~length < MaxTextExtent)
|
||||
@ -1,31 +0,0 @@
|
||||
Modify module-searching to only check the compiled-in location,
|
||||
if the environment variables don't provide an override. The stock
|
||||
code checks the compiled-in location if a particular module can't
|
||||
be found at the environment-specified directory, which may lead
|
||||
to wrong binaries being loaded, etc.
|
||||
|
||||
-mi
|
||||
|
||||
--- magick/module.c Sat Sep 8 16:44:05 2007
|
||||
+++ magick/module.c Thu Oct 4 23:30:26 2007
|
||||
@@ -589,4 +589,6 @@
|
||||
"Searching for coder module file \"%s\" ...",filename);
|
||||
module_path=GetEnvironmentValue("MAGICK_CODER_MODULE_PATH");
|
||||
+ if (module_path == NULL)
|
||||
+ module_path = MagickCoderModulesPath;
|
||||
break;
|
||||
}
|
||||
@@ -596,4 +598,6 @@
|
||||
"Searching for filter module file \"%s\" ...",filename);
|
||||
module_path=GetEnvironmentValue("MAGICK_CODER_FILTER_PATH");
|
||||
+ if (module_path == NULL)
|
||||
+ module_path = MagickFilterModulesPath;
|
||||
break;
|
||||
}
|
||||
@@ -624,5 +628,5 @@
|
||||
module_path=DestroyString(module_path);
|
||||
}
|
||||
-#if defined(UseInstalledMagick)
|
||||
+#if defined(UseInstalledMagick) && 0
|
||||
#if defined(MagickCoderModulesPath)
|
||||
{
|
||||
@ -1,21 +0,0 @@
|
||||
Reduce sensitivity of the maximum errors. ImageMagick insists, these can
|
||||
vary between platforms:
|
||||
|
||||
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=9766
|
||||
|
||||
--- PerlMagick/t/filter.t 2007-09-21 10:42:06.000000000 -0400
|
||||
+++ PerlMagick/t/filter.t 2007-09-25 14:55:22.000000000 -0400
|
||||
@@ -101,5 +101,5 @@
|
||||
++$test;
|
||||
|
||||
-testFilterCompare('input.miff', q//, 'reference/filter/GaussianBlur.miff', 'GaussianBlur', q/'0.0x1.5'/, 0.02, 0.02);
|
||||
+testFilterCompare('input.miff', q//, 'reference/filter/GaussianBlur.miff', 'GaussianBlur', q/'0.0x1.5'/, 0.02, 0.2);
|
||||
++$test;
|
||||
|
||||
@@ -122,5 +122,5 @@
|
||||
++$test;
|
||||
|
||||
-testFilterCompare('input.miff', q//, 'reference/filter/Modulate.miff', 'Modulate', q/brightness=>110,saturation=>110,hue=>110/, 0.05, 0.05);
|
||||
+testFilterCompare('input.miff', q//, 'reference/filter/Modulate.miff', 'Modulate', q/brightness=>110,saturation=>110,hue=>110/, 0.05, 0.4);
|
||||
++$test;
|
||||
|
||||
@ -31,6 +31,7 @@ include/magick/PreRvIcccm.h
|
||||
include/magick/animate.h
|
||||
include/magick/annotate.h
|
||||
include/magick/api.h
|
||||
include/magick/artifact.h
|
||||
include/magick/blob.h
|
||||
include/magick/cache.h
|
||||
include/magick/cache-view.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user