From nobody Sat Nov 23 05:29:35 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 4XwLBR5FGkz5dy5d; Sat, 23 Nov 2024 05:29:35 +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 4XwLBR47CHz4LVx; Sat, 23 Nov 2024 05:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732339775; 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=0BiCvdv3D6FYxsxQ/BZAU3qjoPWguZJVLOFFVd0fzwg=; b=tsiRoVR8E/zBT7I+IEnDlBWtGVcxfh2kjqc+0VTsZ7D9R3p7UM87m9F7NHGxk/9rEEDd0d MPUU/kJIHH+r8+T7ig9DEm5PzNZz1k01Rn9h4C94SEmgjOvLLjq3dfEy+OM6J2j6np5Dn+ adC/9NH4O/Enz0Bk/QUV1ZikL4km6066D4f6v7xj0G2HUSPoVV9XU7u5j09fLQqhAgWmxo V4jAy6oTLX7mcYfIrzsEOVFsTaIzyydVIvW4AJHQTcScUSSzmRrgGdp54s4W7IWNqe0VZC HvlnfPgnrJb99iU68rs0T4bZKHEdMt9H9KBu49sLSLFZS3NNdLp7ox9a/Ysq/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732339775; 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=0BiCvdv3D6FYxsxQ/BZAU3qjoPWguZJVLOFFVd0fzwg=; b=KOANvZb4W9rxCRLzRiGn7xY0qG9J5cLRxSU9a+J77cTMm7/j4aRsYSKhFEURFUFF8yucAH pqjjUvMmHX0dkGYVhFZXhyJpirvT3wKLnNx7SjzPUQGWo6rWBZ18odZemNy0BrEsjVOwWT 3MjxdGqnR0Afgro/ocmncM6QYy3AfkNm315kmSC4/vhSu3ySOAOBBWqnesb7R94rSDmf8O /8YPVFVAs53H2lxGf/dkaC15KjiUo35WjC5Efh8sdrXO+SJTQiFwikL2f06utEZUsQ0KRR AyYkxK+qawVKEzgYD8k5qxESdOkH2FkwUnbmnMAgcyz25a8kx58YhDVAXXxMSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732339775; a=rsa-sha256; cv=none; b=OG2jAMbsQV5/WLkgM56cX/G1pJ59EBR0NcArQ2xW2EyDyybNWHVn/Jj5qv+kKJPhZWZv33 r6g7/hMVKSakBFgtP9ngoZHxgB0d5Nh90HB8LztlKpxS4lRaNjDxbG5gnUL1kv+7CsiCyW GDyCVmNLBgFfOPdH5EOtcyk9U7ZPHxePM04YCS2/f+GVF1eArPMik2ersJIu0xY+6VWwqA +ctaXKowHejmJJqbbE9NHY7XGAxoB5Y53dDnyY1TkV4lEuZz6iXmNQnTR6jj0nMbEAYUcb EkHPx3TYesdLAycEhnChKXT8Z3jukzZ1W+S4PM4oVQClWz15sIgYMCktOAyIBQ== 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 4XwLBR2YhGzwgP; Sat, 23 Nov 2024 05:29:35 +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 4AN5TZrV083467; Sat, 23 Nov 2024 05:29:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AN5TZf9083464; Sat, 23 Nov 2024 05:29:35 GMT (envelope-from git) Date: Sat, 23 Nov 2024 05:29:35 GMT Message-Id: <202411230529.4AN5TZf9083464@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: 5ce6ee9b773c - 2024Q4 - graphics/libjxl: expose LCMS2 support (disabled by default) 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 5ce6ee9b773c528098e33e2be881d7511d4651f0 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ce6ee9b773c528098e33e2be881d7511d4651f0 commit 5ce6ee9b773c528098e33e2be881d7511d4651f0 Author: Jan Beich AuthorDate: 2024-11-23 04:48:33 +0000 Commit: Jan Beich CommitDate: 2024-11-23 05:29:21 +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 (cherry picked from commit cafd30223ccd019bf6abdf5cdba35f0726dfcb9b) --- 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 86c00cac5f92..7ea4140b60af 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -18,8 +18,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 @@ -29,8 +28,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 @@ -43,6 +44,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 @@ -60,12 +68,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