From nobody Sat Nov 23 05:28:06 2024 X-Original-To: dev-commits-ports-main@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 4XwL8l0RM8z5dxX2; Sat, 23 Nov 2024 05:28:07 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XwL8k6skkz4Lgq; Sat, 23 Nov 2024 05:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732339687; 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=vH2eU4B1nFLniGytMO09i3vY75Ot8EyeI3PmaSZVkU8=; b=dIvW7PUuTuIuaTX6qogitT5p0tcgQfNczw8ITRaMBPdS3I7x7uJyhSbH02A1xvVcy45ukB 1GMDX+/yRC7B+vCKCctuszwWX/2dMxexKx/YlV6mOsj7wyo5MPkFczAUbgvEbukPKLQDqq YLpA3QmkNgdAgu+fW6MAv+9h/BgFIUI+iC912/CmItWq0d5MSgxt2SCmWWSyW1bbqnQvpQ ejPyp/WZo9Jxp8/MOhgJdcuXU3tCRkGj8U6a2VQDPpWSZyKIA8MVYpEqShE6nwn894Zrex YjU/ZjZatcdu+rmI0iyae2ck9SQ35Z273lWsgA30Hd2EtGvvEfcVOAGa7GHoHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732339687; 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=vH2eU4B1nFLniGytMO09i3vY75Ot8EyeI3PmaSZVkU8=; b=bHyTmtcwKDWpiy1I4zyLJ+POiQDjVLnUuKacJoRrwzFL8lhA/kxx+Vwn0P9OQQ9jIiZFit MvUCVNC1krT5+lF6A2/G2SQn662AymBZ2xshmlNx50ZO9JHy3vekbftJ83h/ZP50yTGFJG nXUmjViotq4IgSCr4LgvaHpomgGmS3T1+baHNJc5JreWxalSgbskHVFbMnDorhF3WfJwxF xA0r2eqZsSwELYrUivOZGIVebWDP/VHgZYqN+P35aLeTOdv2dhCkWOUqb+Siz/Haa46qwU kABZdXrOfaYG45odEpwPVPJfPbSgOH5gKWwWuWPqXD5d9g/ejI0O96+0vjWC7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732339687; a=rsa-sha256; cv=none; b=uInrbflPMwuIxb4acyJpU8de28qnctMTjCIgPINPS47kHCg/7rTqQcpX0XeWt2mplACENh ZMEmG4QsOwSLpd+oeJdjNLkJ18RtosyyDT0c9Xid7sO6LJWdBvHNe3gllpQzXUnwh3qInW G5uIju3u3hXE5cZ07M8y8N4bKuksXy25SKzR8Eca6i2TtjL8xrfl2Tf96JMv4+OBc19Oeo 1nZ8J/YpRTCxNGWhQGcEhFpfQY0EjgNpRD0Vdz11ssTk+xj524qFPaLbnPsT3uzRSktthI BCwiVtlzUVXyqHAHqI+cEW6OWkiCiZma77cRLkT9/DAAPIXc3CZThgPlXAtrag== 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 4XwL8k6N4ZzwdB; Sat, 23 Nov 2024 05:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AN5S6OO082784; Sat, 23 Nov 2024 05:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AN5S62H082781; Sat, 23 Nov 2024 05:28:06 GMT (envelope-from git) Date: Sat, 23 Nov 2024 05:28:06 GMT Message-Id: <202411230528.4AN5S62H082781@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: cafd30223ccd - main - graphics/libjxl: expose LCMS2 support (disabled by default) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: cafd30223ccd019bf6abdf5cdba35f0726dfcb9b Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=cafd30223ccd019bf6abdf5cdba35f0726dfcb9b commit cafd30223ccd019bf6abdf5cdba35f0726dfcb9b Author: Jan Beich AuthorDate: 2024-11-23 04:48:33 +0000 Commit: Jan Beich CommitDate: 2024-11-23 05:26:24 +0000 graphics/libjxl: expose LCMS2 support (disabled by default) lcms2 and skcms interpret color profiles differently. Upstream default seems to be optimized for rendering in Chromium and Firefox. https://github.com/libjxl/libjxl/blob/v0.11.0/doc/color_management.md#cms-library https://github.com/libjxl/libjxl/issues/1579#issuecomment-1180561564 --- graphics/libjxl/Makefile | 20 +++++++++++--------- graphics/libjxl/distinfo | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index 96b0e046a5f8..1ea90da38987 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -19,8 +19,7 @@ USES= cmake:testing compiler:c++11-lib cpe localbase:ldflags pkgconfig shared-m CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes USE_LDCONFIG= yes -GH_TUPLE= jbeich:skcms:42030a7:skcms/third_party/skcms \ - libjxl:testdata:ff8d743:testdata/testdata \ +GH_TUPLE= libjxl:testdata:ff8d743:testdata/testdata \ webmproject:sjpeg:e5ab130:sjpeg/third_party/sjpeg \ ${NULL} CMAKE_ON= JPEGXL_ENABLE_PLUGINS @@ -30,8 +29,10 @@ CMAKE_OFF+= ${CMAKE_TESTING_ON} LDFLAGS+= -Wl,--as-needed # brotlicommon, OPENEXR/PNG deps PLIST_SUB= VERSION=${PORTVERSION} -OPTIONS_DEFINE= GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG +OPTIONS_DEFINE= GIF JPEG LCMS2 LTO MANPAGES OPENEXR PIXBUF PNG OPTIONS_DEFAULT=GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG +OPTIONS_DEFAULT_powerpc= LCMS2 +OPTIONS_DEFAULT_powerpc64= LCMS2 OPTIONS_EXCLUDE_i386= LTO # ConvolutionWithTranspose(): JXL_CHECK: out->xsize() == in.ysize() OPTIONS_EXCLUDE_riscv64= LTO # bug 262871 OPTIONS_SUB= yes @@ -44,6 +45,13 @@ JPEG_CMAKE_BOOL= JPEGXL_ENABLE_JPEGLI JPEG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG JPEG_CMAKE_BOOL_OFF+= JPEGXL_ENABLE_JPEGLI_LIBJPEG # XXX WITH_JPEG8, libmap.conf(5) +LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 +LCMS2_GH_TUPLE_OFF= jbeich:skcms:42030a7:skcms/third_party/skcms +LCMS2_CMAKE_BOOL_OFF= JPEGXL_ENABLE_SKCMS +.if make(makesum) +GH_TUPLE+= ${LCMS2_GH_TUPLE_OFF} +.endif + LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW @@ -61,12 +69,6 @@ PIXBUF_CMAKE_BOOL= JPEGXL_ENABLE_PLUGIN_GDKPIXBUF PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PNG -.include - -.if ${ARCH} == powerpc || ${ARCH} == powerpc64 -LIB_DEPENDS+= liblcms2.so:graphics/lcms2 -.endif - post-patch: @${REINPLACE_CMD} 's,/usr,${LOCALBASE},' \ ${WRKSRC}/plugins/gdk-pixbuf/jxl.thumbnailer diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo index 058647bcdd37..c30f2f05e263 100644 --- a/graphics/libjxl/distinfo +++ b/graphics/libjxl/distinfo @@ -1,9 +1,9 @@ TIMESTAMP = 1726205465 SHA256 (libjxl-libjxl-v0.11.0_GH0.tar.gz) = 7ce4ec8bb37a435a73ac18c4c9ff56c2dc6c98892bf3f53a328e3eca42efb9cf SIZE (libjxl-libjxl-v0.11.0_GH0.tar.gz) = 1873614 -SHA256 (jbeich-skcms-42030a7_GH0.tar.gz) = b7537267dd0fda80a98939cc4e4d15614d2d6f433cc8421b797e0f47078c2979 -SIZE (jbeich-skcms-42030a7_GH0.tar.gz) = 10050433 SHA256 (libjxl-testdata-ff8d743_GH0.tar.gz) = d225523e0576f21b6f8de106d2eac4e07650522bae7b65011993792a4dbc3eda SIZE (libjxl-testdata-ff8d743_GH0.tar.gz) = 69102242 SHA256 (webmproject-sjpeg-e5ab130_GH0.tar.gz) = 89d706381311af14e1124276266aebf41977f5facfd2a984cd365835e4bb55ff SIZE (webmproject-sjpeg-e5ab130_GH0.tar.gz) = 2481141 +SHA256 (jbeich-skcms-42030a7_GH0.tar.gz) = b7537267dd0fda80a98939cc4e4d15614d2d6f433cc8421b797e0f47078c2979 +SIZE (jbeich-skcms-42030a7_GH0.tar.gz) = 10050433