From nobody Mon Jan 15 20:07:12 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TDNTY1K74z57T3p; Mon, 15 Jan 2024 20:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TDNTY0pRzz4gjg; Mon, 15 Jan 2024 20:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705349233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsZOBEnaJji/mVlgv/BK3nMNmvw2jdNaudTiyQb3FOE=; b=YmPIVNHlmaTu9/NoS0KZd71kfRsdlzv4XjyMyOvhEpO3zsfc8FRTRDKu2TKFm+IwTQa5WA WqbFQx5NWNO8B2RoBSoE7nQGaZDiHcPB7oTKeS8lAO4zJS7dpcEBd1tI4JMKPLdqpy0+Uj Rj+Gb/iHIwbDez7c9uykXL/ZXrj+lZXVVTd8RfTwF+MaLgbmUaN767AdHb1RwDCIs667iY ns35O2Ue0+cLBrK7ougZOzOEUoNjAorbsM6edhxHPrE1vvtHqQ7+wpw8ZV0Q1kQDmBLLSL y1KXJ9ReWv9Rk7zgnpSE4/VsVVWcBVL6KUp/yKmz/tTS2JNp0DnfNu/0nD00yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705349233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsZOBEnaJji/mVlgv/BK3nMNmvw2jdNaudTiyQb3FOE=; b=kOKb/8yBNlwFB3D00qK5KLvJjMZpULfxNiEPLby+9TL5zb5qyBfMckq2Ic/kkWCJR9ZHbs ZozO9GlqRmOT8lpxgBY/Vtr5/D4Mv98bdg9vapvfeFh1IgECY6tkmnrR9v0DJ1kCQHCPEs DazvYoeXfUYNlibk1zafRvl1jJOrtA+SRU/zL0UpxSyKhPEhZtl6cNs0ZdKuo14SEHL/sb s9aMbIW3DzA8iUJNuZnbFKziJ4DZMbi8PzKLDpnRwGfqRF77mqrRqGCeJIyK+u15/cyFYj qjSWpqYQgfdrEbAew1XAZyXCXHA92ffyDatinmo753+VJVfLprymoXgNhfyaUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705349233; a=rsa-sha256; cv=none; b=t7D6sQrAqnYW+ctmfImD/5rAtgA3J3NwJbV9c/1YoG2fWj5E5qG6E4iUhYK0U2tFWOES0H Vdaz60aHITnqLkLinPqwgpcsxIpFGqu0ywFt55o3C1tlV1Lvdewz228Tmg46uTZz855LGx TJ3/22yiERd1AhUSFwKbAVjrdH6KB9D+2AtVjJYdU8sOlMlYHYIqmhV0kSAWu7zJaCAoBh vcjOc8dq0a511aOUUrlPPp8Cpb9MaI7YCBaTmS/WbQyDWa1fJMPrhfRsRTrxhbuBqdSmoO HVqXQEc5F2JDZxijHvvJEAnRS9kN/0JxAu9wN5wtxMb9DYAlrp2MdOSvK9qyFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TDNTX6zp2z18tP; Mon, 15 Jan 2024 20:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40FK7CmP083072; Mon, 15 Jan 2024 20:07:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FK7ClD083069; Mon, 15 Jan 2024 20:07:12 GMT (envelope-from git) Date: Mon, 15 Jan 2024 20:07:12 GMT Message-Id: <202401152007.40FK7ClD083069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: c6cb95d84055 - main - graphics/ImageMagick7: update to 7.1.1-26 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6cb95d84055ddff74d65ffbfc928ca94a9cf8a7 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6cb95d84055ddff74d65ffbfc928ca94a9cf8a7 commit c6cb95d84055ddff74d65ffbfc928ca94a9cf8a7 Author: Mikhail T. AuthorDate: 2024-01-15 19:09:40 +0000 Commit: Gleb Popov CommitDate: 2024-01-15 19:40:07 +0000 graphics/ImageMagick7: update to 7.1.1-26 PR: 276208 Co-authored-by: awoonya --- graphics/ImageMagick7/Makefile | 14 ++++--- graphics/ImageMagick7/distinfo | 6 +-- graphics/ImageMagick7/files/patch-coders_jxl.c | 44 ---------------------- .../ImageMagick7/files/patch-config_policy.xml | 17 --------- graphics/ImageMagick7/pkg-plist | 8 +++- 5 files changed, 17 insertions(+), 72 deletions(-) diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 66fd6062c196..422a43bec913 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 3dac217e1a87..eced02353ad6 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/files/patch-coders_jxl.c b/graphics/ImageMagick7/files/patch-coders_jxl.c deleted file mode 100644 index 83ce69bf5925..000000000000 --- 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 e51c4551d2cd..000000000000 --- 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 @@ - - - - -+ -+ -+ -+ -+ - - - diff --git a/graphics/ImageMagick7/pkg-plist b/graphics/ImageMagick7/pkg-plist index 3aec07eaf865..f45ac1c5a532 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 @@ -776,6 +778,7 @@ man/man1/stream.1.gz %%PORTDOCS%%%%DOCSDIR%%-7/www/mogrify.html %%PORTDOCS%%%%DOCSDIR%%-7/www/montage.html %%PORTDOCS%%%%DOCSDIR%%-7/www/motion-picture.html +%%PORTDOCS%%%%DOCSDIR%%-7/www/multispectral-imagery.html %%PORTDOCS%%%%DOCSDIR%%-7/www/news.html %%PORTDOCS%%%%DOCSDIR%%-7/www/opencl.html %%PORTDOCS%%%%DOCSDIR%%-7/www/openmp.html @@ -816,5 +819,6 @@ man/man1/stream.1.gz %%PORTDOCS%%%%DOCSDIR%%-7/www/source/wand.c %%PORTDOCS%%%%DOCSDIR%%-7/www/stream.html %%PORTDOCS%%%%DOCSDIR%%-7/www/support.html +%%PORTDOCS%%%%DOCSDIR%%-7/www/vpat.html %%PORTDOCS%%%%DOCSDIR%%-7/www/wand.png %%PORTDOCS%%%%DOCSDIR%%-7/www/webp.html