<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/28ef5c203a92b91cd08f07c8b0ba5528da47cedf">https://github.com/macports/macports-ports/commit/28ef5c203a92b91cd08f07c8b0ba5528da47cedf</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 28ef5c203a9 libjxl: update to 0.10.2
</span>28ef5c203a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 28ef5c203a92b91cd08f07c8b0ba5528da47cedf
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Mar 9 18:10:18 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> libjxl: update to 0.10.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69436
</span>---
graphics/libjxl/Portfile | 11 ++++++-----
graphics/libjxl/files/3381.patch | 27 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/Portfile b/graphics/libjxl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a7db89f8a4..0da08198ae2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjxl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjxl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libjxl libjxl 0.10.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libjxl libjxl 0.10.2 v
</span> categories graphics
maintainers {jmr @jmroot}
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +22,8 @@ master_sites-append sourceforge:project/macports/distfiles/${name}:skcms
</span> # https://skia.googlesource.com/skcms/+archive/${skcms_commit}.tar.gz?dummy=
distfiles-append skcms-${skcms_commit}${extract.suffix}:skcms
checksums ${name}-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 53702ac96e8244e08bcfbafb19c23b3284002f28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 91b9a83a230d608b5d35d2ab5068bd0ec7028797575e3013211be5928028c8cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2eb8d8d71455c37feb532de45bb0770e4aa42e31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 95e807f63143856dc4d161c071cca01115d2c6405b3d3209854ac6989dc6bb91 \
</span> skcms-${skcms_commit}${extract.suffix} \
rmd160 441c5313197732e0756df440be91bd813a994c20 \
sha256 1ee4607d6fbcad26759fcbc95a6dcdccf3dfc1e55a5ca748e7853f9fb97b28ee
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,8 @@ post-extract {
</span> }
patchfiles include_order.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- find_asciidoc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_asciidoc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3381.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 15} {
# No support for sized operator delete
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +74,7 @@ compiler.cxx_standard 2011
</span> # Compilation warning (from highway headers):
# "x86 Clang <= 6: define HWY_COMPILE_ONLY_SCALAR or upgrade."
# (Xcode Clang 10.0.1 ~= llvm.org Clang 7.0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist {clang < 1203}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist {clang < 1001}
</span>
variant tests description {Enable building of test code} {
depends_build-append port:gtest
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjxl/files/3381.patch b/graphics/libjxl/files/3381.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d0c8aef6293
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjxl/files/3381.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 975570c2c79858cb6bce90b1c889aa82928214fc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Evgenii Kliuchnikov <eustas@google.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 6 Mar 2024 11:27:53 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix build for some compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/jxl/coeff_order.h | 7 +++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/jxl/coeff_order.h b/lib/jxl/coeff_order.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1b8beadbc19..79c0c976c94 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jxl/coeff_order.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jxl/coeff_order.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,10 +30,9 @@ static constexpr std::array<size_t, 3 * kNumOrders + 1> kCoeffOrderOffset = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 100, 108, 172, 236, 300, 332, 364, 396, 652, 908,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1164, 1292, 1420, 1548, 2572, 3596, 4620, 5132, 5644, kCoeffOrderLimit};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static JXL_MAYBE_UNUSED constexpr size_t CoeffOrderOffset(size_t order,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t c) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCoeffOrderOffset[3 * order + c] * kDCTBlockSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// TODO(eustas): rollback to constexpr once modern C++ becomes reuired.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CoeffOrderOffset(O, C) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (kCoeffOrderOffset[3 * (O) + (C)] * kDCTBlockSize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static JXL_MAYBE_UNUSED constexpr size_t kCoeffOrderMaxSize =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCoeffOrderLimit * kDCTBlockSize;
</span></pre><pre style='margin:0'>
</pre>