Attachment 247535 Details for Bug 276208 – Upgrade IM7 to the currently-latest. Provide for FLIF and ZSTD support.

[patch] Upgrade IM7 to the currently-latest. Provide for FLIF and ZSTD support.

IM7.diff (text/plain), 7.23 KB, created by Mikhail T. on 2024-01-08 22:55:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2024-01-08 22:55:50 UTC

Size: 7.23 KB

patch

obsolete

>diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
>index 66fd6062c19..422a43bec91 100644
>--- a/graphics/ImageMagick7/Makefile
>+++ b/graphics/ImageMagick7/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	ImageMagick
>-DISTVERSION=	7.1.0-62
>-PORTREVISION=	9
>+DISTVERSION=	7.1.1-26
> CATEGORIES=	graphics perl5
> MASTER_SITES=	https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
> 		https://mirror.dogado.de/imagemagick/releases/ \
>@@ -17,6 +16,7 @@ LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	libltdl.so:devel/libltdl	\
>+		libzstd.so:archivers/zstd	\
> 		libzip.so:archivers/libzip
> 
> FLAVORS=		x11 nox11
>@@ -37,8 +37,7 @@ SHEBANG_FILES=	www/source/examples.pl
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	MAKE=${MAKE_CMD}
> CONFIGURE_ARGS=	--without-dps \
>-		--without-flif \
>-		--without-zstd
>+		--with-zstd
> USE_LDCONFIG=	yes
> USE_GNOME=	libxml2
> 
>@@ -50,11 +49,11 @@ SAMPLE_FILES=	colors.xml delegates.xml log.xml mime.xml policy.xml \
> PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
> 
> OPTIONS_SUB=	yes
>-OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \
>+OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FLIF FONTCONFIG FPX FREETYPE \
> 		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \
> 		OPENEXR OPENMP PDF PERL PNG TESTS TIFF WEBP WMF THREADS \
> 		16BIT_PIXEL HDRI HEIF RAW
>-OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \
>+OPTIONS_DEFAULT=16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \
> 		JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG \
> 		TIFF WEBP WMF THREADS HDRI RAW
> 
>@@ -95,6 +94,9 @@ FONTCONFIG_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig
> FREETYPE_CONFIGURE_WITH=	freetype
> FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
> 
>+FLIF_CONFIGURE_WITH=	flif
>+FLIF_LIB_DEPENDS=	libflif.so:graphics/flif
>+
> # FPX (FlashPIX) images
> FPX_CONFIGURE_WITH=	fpx
> FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
>diff --git a/graphics/ImageMagick7/distinfo b/graphics/ImageMagick7/distinfo
>index 3dac217e1a8..eced02353ad 100644
>--- a/graphics/ImageMagick7/distinfo
>+++ b/graphics/ImageMagick7/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1676736809
>-SHA256 (ImageMagick-7.1.0-62.tar.xz) = 8b89c1a023d4b03cca3e63a0f3cb944427d46d1363a20440282d9f6e0e343518
>-SIZE (ImageMagick-7.1.0-62.tar.xz) = 10359080
>+TIMESTAMP = 1704746486
>+SHA256 (ImageMagick-7.1.1-26.tar.xz) = 6c7eb871fd97a5925fe03386bfab84c7ef6373371ae5e4666902aeafcea917ec
>+SIZE (ImageMagick-7.1.1-26.tar.xz) = 10554692
>diff --git a/graphics/ImageMagick7/pkg-plist b/graphics/ImageMagick7/pkg-plist
>index 3aec07eaf86..0be25c3184d 100644
>--- a/graphics/ImageMagick7/pkg-plist
>+++ b/graphics/ImageMagick7/pkg-plist
>@@ -225,6 +225,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
> %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fits.so
> %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fl32.la
> %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fl32.so
>+%%FLIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/flif.la
>+%%FLIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/flif.so
> %%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.la
> %%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.so
> %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ftxt.la
>@@ -446,12 +448,12 @@ lib/libMagickCore-7.a
> lib/libMagickCore-7.la
> lib/libMagickCore-7.so
> lib/libMagickCore-7.so.10
>-lib/libMagickCore-7.so.10.0.0
>+lib/libMagickCore-7.so.10.0.1
> lib/libMagickWand-7.a
> lib/libMagickWand-7.la
> lib/libMagickWand-7.so
> lib/libMagickWand-7.so.10
>-lib/libMagickWand-7.so.10.0.0
>+lib/libMagickWand-7.so.10.0.1
> %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
> %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
> %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
>diff --git a/graphics/ImageMagick7/files/patch-coders_jxl.c b/graphics/ImageMagick7/files/patch-coders_jxl.c
>deleted file mode 100644
>index 83ce69bf592..00000000000
>--- a/graphics/ImageMagick7/files/patch-coders_jxl.c
>+++ /dev/null
>@@ -1,44 +0,0 @@
>-https://github.com/ImageMagick/ImageMagick/commit/9db502e6a70c
>-
>---- coders/jxl.c.orig	2023-02-12 15:55:38 UTC
>-+++ coders/jxl.c
>-@@ -444,8 +444,13 @@ static Image *ReadJXLImage(const ImageInfo *image_info
>-           *profile;
>- 
>-         JXLSetFormat(image,&pixel_format,exception);
>-+#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
>-+        jxl_status=JxlDecoderGetColorAsEncodedProfile(jxl_info,
>-+          JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding);
>-+#else
>-         jxl_status=JxlDecoderGetColorAsEncodedProfile(jxl_info,&pixel_format,
>-           JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding);
>-+#endif
>-         if (jxl_status == JXL_DEC_SUCCESS)
>-           {
>-             if (color_encoding.transfer_function == JXL_TRANSFER_FUNCTION_LINEAR)
>-@@ -460,14 +465,25 @@ static Image *ReadJXLImage(const ImageInfo *image_info
>-         else
>-           if (jxl_status != JXL_DEC_ERROR)
>-             break;
>-+#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
>-+        jxl_status=JxlDecoderGetICCProfileSize(jxl_info,
>-+          JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size);
>-+#else
>-         jxl_status=JxlDecoderGetICCProfileSize(jxl_info,&pixel_format,
>-           JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size);
>-+#endif
>-         if (jxl_status != JXL_DEC_SUCCESS)
>-           break;
>-         profile=AcquireStringInfo(profile_size);
>-+#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
>-+        jxl_status=JxlDecoderGetColorAsICCProfile(jxl_info,
>-+          JXL_COLOR_PROFILE_TARGET_ORIGINAL,GetStringInfoDatum(profile),
>-+          profile_size);
>-+#else
>-         jxl_status=JxlDecoderGetColorAsICCProfile(jxl_info,&pixel_format,
>-           JXL_COLOR_PROFILE_TARGET_ORIGINAL,GetStringInfoDatum(profile),
>-           profile_size);
>-+#endif
>-         (void) SetImageProfile(image,"icc",profile,exception);
>-         profile=DestroyStringInfo(profile);
>-         if (jxl_status == JXL_DEC_SUCCESS)
>diff --git a/graphics/ImageMagick7/files/patch-config_policy.xml b/graphics/ImageMagick7/files/patch-config_policy.xml
>deleted file mode 100644
>index e51c4551d2c..00000000000
>--- a/graphics/ImageMagick7/files/patch-config_policy.xml
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-Upstream doesn't disable these by default.
>-
>---- config/policy.xml.orig	2018-08-17 19:14:07 UTC
>-+++ config/policy.xml
>-@@ -65,6 +65,11 @@
>-   
>-   
>-   
>-   
>-+  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
>-+  <policy domain="coder" rights="none" pattern="URL" />
>-+  <policy domain="coder" rights="none" pattern="HTTPS" />
>-+  <policy domain="coder" rights="none" pattern="MVG" />
>-+  <policy domain="coder" rights="none" pattern="MSL" />
>-   
>-   
>-

Actions: View | Diff

Attachments on bug 276208: 247535 | 247687