<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/8e9fc400d8a6dee51041faed118bdd443212aef7">https://github.com/macports/macports-ports/commit/8e9fc400d8a6dee51041faed118bdd443212aef7</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 8e9fc400d8a qt6-qtmultimedia: prevent Xcode 15 build failure
</span>8e9fc400d8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8e9fc400d8a6dee51041faed118bdd443212aef7
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Sep 29 00:36:45 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt6-qtmultimedia: prevent Xcode 15 build failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/68276#comment:7
</span>---
aqua/qt6/Portfile | 3 +++
.../patch-qtmultimedia_no_std_unary_function.diff | 31 ++++++++++++++++++++++
2 files changed, 34 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 eb1cfd2b249..c4e254d7aa9 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;'>@@ -996,6 +996,9 @@ subport ${name}-qtmultimedia {
</span> # https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/plugins/multimedia/gstreamer/CMakeLists.txt
# https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/multimedia/configure.cmake
configure.args-append -no-gstreamer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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> }
subport ${name}-qt5compat {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-qtmultimedia_no_std_unary_function.diff b/aqua/qt6/files/patch-qtmultimedia_no_std_unary_function.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a21340f8be7
</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-qtmultimedia_no_std_unary_function.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 82f7f3de0e90bb7d1447cb710ffd2e1b315ae479 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Artem Dyomin <artem.dyomin@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 26 May 2023 15:15:52 +0200
</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;'>+Pick-to: 6.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-113782
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I4e330cd1f89dc14936acbccdeee8378ea4938870
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Lars Knoll <lars@knoll.priv.no>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io>
</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;'>+diff --git a/src/plugins/multimedia/darwin/camera/avfcamerautility.mm b/src/plugins/multimedia/darwin/camera/avfcamerautility.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4334613..fb73ba3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/multimedia/darwin/camera/avfcamerautility.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/multimedia/darwin/camera/avfcamerautility.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,9 +69,9 @@
</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></pre><pre style='margin:0'>
</pre>