<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/90c8819f31d3c7e78ebf8e1516cbf6447c7d42bd">https://github.com/macports/macports-ports/commit/90c8819f31d3c7e78ebf8e1516cbf6447c7d42bd</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 90c8819f31d qt5-qtmultimedia: fix build in Xcode 15
</span>90c8819f31d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 90c8819f31d3c7e78ebf8e1516cbf6447c7d42bd
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Thu Sep 28 16:57:32 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtmultimedia: fix build in Xcode 15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In Xcode 15 clang in C++17 mode, std::unary_function, deprecated since
</span><span style='display:block; white-space:pre;color:#404040;'> C++11, has been removed.
</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/68276
</span>---
aqua/qt5/Portfile | 3 ++
.../patch-qtmultimedia_no_std_unary_function.diff | 32 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e33ef78831..25275dcc56c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1869,6 +1869,9 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/54592
patchfiles-append patch-qtmultimedia_no_macports_openal.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # std::unary_function removed in Xcode clang 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtmultimedia_no_std_unary_function.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant pulseaudio description {Compile PulseAudio support} {
depends_lib-append port:pulseaudio
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtmultimedia_no_std_unary_function.diff b/aqua/qt5/files/patch-qtmultimedia_no_std_unary_function.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1035776b0cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtmultimedia_no_std_unary_function.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a277b9216b09efe8ee4b04a66e43b235b4783354 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mark Mentovai <mark@mentovai.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 28 Sep 2023 16:55:37 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Remove std::unary_function usage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+std::unary_function was removed with c++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is a backport of 82f7f3de0e90 to 5.15. The patch applies directly,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+but the path to avfcamerautility.mm is different.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/plugins/avfoundation/camera/avfcamerautility.mm | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/plugins/avfoundation/camera/avfcamerautility.mm src/plugins/avfoundation/camera/avfcamerautility.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 25ccc4b01cc3..3f7f078bfc25 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/avfoundation/camera/avfcamerautility.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/avfoundation/camera/avfcamerautility.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,9 +101,9 @@ struct ByResolution
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct FormatHasNoFPSRange
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool operator() (AVCaptureDeviceFormat *format)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool operator() (AVCaptureDeviceFormat *format) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT(format);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return !format.videoSupportedFrameRateRanges || !format.videoSupportedFrameRateRanges.count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.42.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>