View | Details | Raw Unified | Return to bug 276208
Collapse All | Expand All

(-)b/graphics/ImageMagick7/Makefile (-6 / +8 lines)
Lines 1-6 Link Here
1
PORTNAME=	ImageMagick
1
PORTNAME=	ImageMagick
2
DISTVERSION=	7.1.0-62
2
DISTVERSION=	7.1.1-26
3
PORTREVISION=	9
4
CATEGORIES=	graphics perl5
3
CATEGORIES=	graphics perl5
5
MASTER_SITES=	https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
4
MASTER_SITES=	https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
6
		https://mirror.dogado.de/imagemagick/releases/ \
5
		https://mirror.dogado.de/imagemagick/releases/ \
Lines 17-22 LICENSE= APACHE20 Link Here
17
LICENSE_FILE=	${WRKSRC}/LICENSE
16
LICENSE_FILE=	${WRKSRC}/LICENSE
18
17
19
LIB_DEPENDS=	libltdl.so:devel/libltdl	\
18
LIB_DEPENDS=	libltdl.so:devel/libltdl	\
19
		libzstd.so:archivers/zstd	\
20
		libzip.so:archivers/libzip
20
		libzip.so:archivers/libzip
21
21
22
FLAVORS=		x11 nox11
22
FLAVORS=		x11 nox11
Lines 37-44 SHEBANG_FILES= www/source/examples.pl Link Here
37
GNU_CONFIGURE=	yes
37
GNU_CONFIGURE=	yes
38
CONFIGURE_ENV=	MAKE=${MAKE_CMD}
38
CONFIGURE_ENV=	MAKE=${MAKE_CMD}
39
CONFIGURE_ARGS=	--without-dps \
39
CONFIGURE_ARGS=	--without-dps \
40
		--without-flif \
40
		--with-zstd
41
		--without-zstd
42
USE_LDCONFIG=	yes
41
USE_LDCONFIG=	yes
43
USE_GNOME=	libxml2
42
USE_GNOME=	libxml2
44
43
Lines 50-60 SAMPLE_FILES= colors.xml delegates.xml log.xml mime.xml policy.xml \ Link Here
50
PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
49
PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
51
50
52
OPTIONS_SUB=	yes
51
OPTIONS_SUB=	yes
53
OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \
52
OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FLIF FONTCONFIG FPX FREETYPE \
54
		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \
53
		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \
55
		OPENEXR OPENMP PDF PERL PNG TESTS TIFF WEBP WMF THREADS \
54
		OPENEXR OPENMP PDF PERL PNG TESTS TIFF WEBP WMF THREADS \
56
		16BIT_PIXEL HDRI HEIF RAW
55
		16BIT_PIXEL HDRI HEIF RAW
57
OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \
56
OPTIONS_DEFAULT=16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \
58
		JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG \
57
		JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG \
59
		TIFF WEBP WMF THREADS HDRI RAW
58
		TIFF WEBP WMF THREADS HDRI RAW
60
59
Lines 95-100 FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig Link Here
95
FREETYPE_CONFIGURE_WITH=	freetype
94
FREETYPE_CONFIGURE_WITH=	freetype
96
FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
95
FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
97
96
97
FLIF_CONFIGURE_WITH=	flif
98
FLIF_LIB_DEPENDS=	libflif.so:graphics/flif
99
98
# FPX (FlashPIX) images
100
# FPX (FlashPIX) images
99
FPX_CONFIGURE_WITH=	fpx
101
FPX_CONFIGURE_WITH=	fpx
100
FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
102
FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
(-)b/graphics/ImageMagick7/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1676736809
1
TIMESTAMP = 1704746486
2
SHA256 (ImageMagick-7.1.0-62.tar.xz) = 8b89c1a023d4b03cca3e63a0f3cb944427d46d1363a20440282d9f6e0e343518
2
SHA256 (ImageMagick-7.1.1-26.tar.xz) = 6c7eb871fd97a5925fe03386bfab84c7ef6373371ae5e4666902aeafcea917ec
3
SIZE (ImageMagick-7.1.0-62.tar.xz) = 10359080
3
SIZE (ImageMagick-7.1.1-26.tar.xz) = 10554692
(-)b/graphics/ImageMagick7/pkg-plist (-2 / +4 lines)
Lines 225-230 lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml Link Here
225
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fits.so
225
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fits.so
226
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fl32.la
226
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fl32.la
227
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fl32.so
227
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fl32.so
228
%%FLIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/flif.la
229
%%FLIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/flif.so
228
%%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.la
230
%%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.la
229
%%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.so
231
%%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.so
230
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ftxt.la
232
%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ftxt.la
Lines 446-457 lib/libMagickCore-7.a Link Here
446
lib/libMagickCore-7.la
448
lib/libMagickCore-7.la
447
lib/libMagickCore-7.so
449
lib/libMagickCore-7.so
448
lib/libMagickCore-7.so.10
450
lib/libMagickCore-7.so.10
449
lib/libMagickCore-7.so.10.0.0
451
lib/libMagickCore-7.so.10.0.1
450
lib/libMagickWand-7.a
452
lib/libMagickWand-7.a
451
lib/libMagickWand-7.la
453
lib/libMagickWand-7.la
452
lib/libMagickWand-7.so
454
lib/libMagickWand-7.so
453
lib/libMagickWand-7.so.10
455
lib/libMagickWand-7.so.10
454
lib/libMagickWand-7.so.10.0.0
456
lib/libMagickWand-7.so.10.0.1
455
%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
457
%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
456
%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
458
%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
457
%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
459
%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
(-)a/graphics/ImageMagick7/files/patch-coders_jxl.c (-44 lines)
Removed Link Here
1
https://github.com/ImageMagick/ImageMagick/commit/9db502e6a70c
2
3
--- coders/jxl.c.orig	2023-02-12 15:55:38 UTC
4
+++ coders/jxl.c
5
@@ -444,8 +444,13 @@ static Image *ReadJXLImage(const ImageInfo *image_info
6
           *profile;
7
 
8
         JXLSetFormat(image,&pixel_format,exception);
9
+#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
10
+        jxl_status=JxlDecoderGetColorAsEncodedProfile(jxl_info,
11
+          JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding);
12
+#else
13
         jxl_status=JxlDecoderGetColorAsEncodedProfile(jxl_info,&pixel_format,
14
           JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding);
15
+#endif
16
         if (jxl_status == JXL_DEC_SUCCESS)
17
           {
18
             if (color_encoding.transfer_function == JXL_TRANSFER_FUNCTION_LINEAR)
19
@@ -460,14 +465,25 @@ static Image *ReadJXLImage(const ImageInfo *image_info
20
         else
21
           if (jxl_status != JXL_DEC_ERROR)
22
             break;
23
+#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
24
+        jxl_status=JxlDecoderGetICCProfileSize(jxl_info,
25
+          JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size);
26
+#else
27
         jxl_status=JxlDecoderGetICCProfileSize(jxl_info,&pixel_format,
28
           JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size);
29
+#endif
30
         if (jxl_status != JXL_DEC_SUCCESS)
31
           break;
32
         profile=AcquireStringInfo(profile_size);
33
+#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
34
+        jxl_status=JxlDecoderGetColorAsICCProfile(jxl_info,
35
+          JXL_COLOR_PROFILE_TARGET_ORIGINAL,GetStringInfoDatum(profile),
36
+          profile_size);
37
+#else
38
         jxl_status=JxlDecoderGetColorAsICCProfile(jxl_info,&pixel_format,
39
           JXL_COLOR_PROFILE_TARGET_ORIGINAL,GetStringInfoDatum(profile),
40
           profile_size);
41
+#endif
42
         (void) SetImageProfile(image,"icc",profile,exception);
43
         profile=DestroyStringInfo(profile);
44
         if (jxl_status == JXL_DEC_SUCCESS)
(-)a/graphics/ImageMagick7/files/patch-config_policy.xml (-17 lines)
Removed Link Here
1
Upstream doesn't disable these by default.
2
3
--- config/policy.xml.orig	2018-08-17 19:14:07 UTC
4
+++ config/policy.xml
5
@@ -65,6 +65,11 @@
6
   <!-- <policy domain="resource" name="map" value="4GiB"/> -->
7
   <!-- <policy domain="resource" name="width" value="10KP"/> -->
8
   <!-- <policy domain="resource" name="height" value="10KP"/> -->
9
   <!-- <policy domain="resource" name="list-length" value="128"/> -->
10
+  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
11
+  <policy domain="coder" rights="none" pattern="URL" />
12
+  <policy domain="coder" rights="none" pattern="HTTPS" />
13
+  <policy domain="coder" rights="none" pattern="MVG" />
14
+  <policy domain="coder" rights="none" pattern="MSL" />
15
   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
16
   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
17
   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->

Return to bug 276208