From nobody Sun Jan 9 13:23:22 2022 X-Original-To: dev-commits-ports-branches@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 0A76E193F2E6; Sun, 9 Jan 2022 13:23:23 +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 4JWyMG3fz3z3J61; Sun, 9 Jan 2022 13:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5EE2212DAF; Sun, 9 Jan 2022 13:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 209DNM0d063274; Sun, 9 Jan 2022 13:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 209DNMo1063273; Sun, 9 Jan 2022 13:23:22 GMT (envelope-from git) Date: Sun, 9 Jan 2022 13:23:22 GMT Message-Id: <202201091323.209DNMo1063273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: a70c181433ca - 2022Q1 - graphics/ImageMagick7: expose JPEG XL support List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: a70c181433caacd4ae45e3148f1a5748e899f9e3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641734602; 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=JdEvPqd+QQEdreO+hYa2P1zc/couIP6iLJSoGGqvVDQ=; b=yVz41qM4SpY6TbdDrDefHH8rLg/a9wq7OPt3x+nh2k24GtO1rOw8JY3NTa/mSndCYIYNLd SqHzRt0x8sg7VaP+CxPUXEfo390kjISuos/vbhNm55Ct7KCjM9es1qIAp3WZr+L2FVNnmT XGeOe2K27o8VyEPnIjHQu2h2F1wXYc3+mfXH33gaxLqyvbup+9zBXe7/DR5qyaXtQQ8Gd9 aujzTCpwVy6omKQx3n/kBm31iM216Hcb+ub3Fmnw/LQZolBgcHp7fS44nRwvXns790JLHb TdM1yQ+Obhx0/ExLGmumJuEgolkAf/5lFrLtX4ZED5ppj+YUgUGwGzSMOal1UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641734602; a=rsa-sha256; cv=none; b=g4+H9+gaS0+0Ol3d7dZEvaXnJ1WfHDQbdC1IGaIQ4zNhe5ZAW3QJbCiF835IPbMPRbjXrg BHvoi3pxTGG3uULi42mAU7Z0fPPJfeOMkVU5cg5aorsJbw+wnOzWRhoOpobt2v+3vBTGek DQ8+tOPOHceVw8f+Y85MAG7IAbQfpTYwcSYe/h33eTUWmjnJx6UvWGh4eOVAkn+7ZFLVSo cFYeYyLSJGQFuXJU4HtVIc6O004qBWC1Lw+SIuApzBphLtSmhzvr23jmUZ0TkKVyP84qKK fakJh33ctCb+xsxLPvTxI0mSMD8WaIXITU2QIVdA9tctNexSA8e8JOd9PW84OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a70c181433caacd4ae45e3148f1a5748e899f9e3 commit a70c181433caacd4ae45e3148f1a5748e899f9e3 Author: Jan Beich AuthorDate: 2022-01-09 13:12:23 +0000 Commit: Jan Beich CommitDate: 2022-01-09 13:22:57 +0000 graphics/ImageMagick7: expose JPEG XL support (cherry picked from commit 57e088fe337076b7738a6ca7ccfd3574c5f80824) --- graphics/ImageMagick7/Makefile | 6 +++++- graphics/ImageMagick7/pkg-plist | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index c00c81e53f75..3f6a041cd312 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -62,7 +62,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_SUB= yes OPTIONS_DEFINE= BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \ - GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ + GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \ THREADS X11 16BIT_PIXEL HDRI HEIF RAW OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \ @@ -126,6 +126,10 @@ JPEG2000_DESC= OpenJPEG 2000 support via openjpeg JPEG2000_CONFIGURE_WITH=openjp2 JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +JXL_DESC= JPEG XL image format via libjxl +JXL_CONFIGURE_WITH= jxl +JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl + LCMS2_CONFIGURE_WITH= lcms LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 diff --git a/graphics/ImageMagick7/pkg-plist b/graphics/ImageMagick7/pkg-plist index b6ffc30f4aaf..0a59036a1e22 100644 --- a/graphics/ImageMagick7/pkg-plist +++ b/graphics/ImageMagick7/pkg-plist @@ -259,6 +259,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml %%JPEG2000%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/jp2.so %%JPEG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/jpeg.la %%JPEG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/jpeg.so +%%JXL%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/jxl.la +%%JXL%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/jxl.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/json.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/json.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/kernel.la