<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c5d2c7e52f9c552a6079add1894c66c322a10eab">https://github.com/macports/macports-ports/commit/c5d2c7e52f9c552a6079add1894c66c322a10eab</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 c5d2c7e52f9 qt6-qtbase: attempt to fix build on 10.14
</span>c5d2c7e52f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c5d2c7e52f9c552a6079add1894c66c322a10eab
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Tue Jul 25 17:30:47 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt6-qtbase: attempt to fix build on 10.14
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67802
</span>---
aqua/qt6/Portfile | 5 +++++
aqua/qt6/files/patch-qtbase-intel_intrinsics.diff | 20 ++++++++++++++++++++
2 files changed, 25 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0d0f591a01..516679e427e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -990,6 +990,11 @@ if { ${subport} eq "${name}-qtbase" || ${subport} eq "${name}-qtbase-docs" } {
</span> # see https://trac.macports.org/ticket/64345
patchfiles-append patch-qtbase-macos_10.14_sdk.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error: no matching function for call to '_mm256_maskz_cvtps_ph'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # note: candidate function not viable: requires 2 arguments, but 3 were provided
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/67802
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args-replace --prefix=${prefix} \
"-prefix ${qt6.dir}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt6/files/patch-qtbase-intel_intrinsics.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..65d9f364154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LLVM clang [3.9.0,9.0.0) (and so likely also Xcode clang <11.4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+defined the _mm256_maskz_cvtps_ph intrinsic as 2-argument.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use the equivalent intrinsic _mm256_maskz_cvt_roundps_ph instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+since clang has always defined it as 3-argument.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.macports.org/ticket/67802
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/global/qfloat16.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/global/qfloat16.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,9 +176,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void qFloatToFloat16_tail_avx256(quint16 *out, const float *in, qsizetype len) noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __mmask16 mask = _bzhi_u32(-1, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __m256 f32 = _mm256_maskz_loadu_ps(mask, in );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __m128i f16 = _mm256_maskz_cvtps_ph(mask, f32, _MM_FROUND_TO_NEAREST_INT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __m128i f16 = _mm256_maskz_cvt_roundps_ph(mask, f32, _MM_FROUND_TO_NEAREST_INT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _mm_mask_storeu_epi16(out, mask, f16);
</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;'>+ static QT_FUNCTION_TARGET(ARCH_SKYLAKE_AVX512)
</span></pre><pre style='margin:0'>
</pre>