<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/dff67699704b05231a91bd834d7d944d4823aafb">https://github.com/macports/macports-ports/commit/dff67699704b05231a91bd834d7d944d4823aafb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dff67699704b05231a91bd834d7d944d4823aafb
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Dec 29 20:17:35 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qt6*-qtmultimedia: fix hardcoded /opt/local
</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/71673
</span>---
 aqua/qt6/Portfile  | 14 +++++++-------
 aqua/qt64/Portfile | 14 +++++++-------
 aqua/qt67/Portfile | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

<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 44a26ba7b7c..f69c84a73d0 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;'>@@ -1043,13 +1043,13 @@ subport ${name}-qtmultimedia {
</span>     #     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:#ffe0e0;'>-    configure.post_args-append      -DFFMPEG_DIR=/opt/local/libexec/ffmpeg7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVCODEC_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVCODEC_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavcodec.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVFORMAT_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVFORMAT_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavformat.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVUTIL_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVUTIL_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavutil.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.post_args-append      -DFFMPEG_DIR=${prefix}/libexec/ffmpeg7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVCODEC_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVCODEC_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavcodec.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVFORMAT_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVFORMAT_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavformat.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVUTIL_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVUTIL_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavutil.dylib
</span> }
 
 subport ${name}-qt5compat {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt64/Portfile b/aqua/qt64/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 816ee1a9c66..0698753eadd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1003,13 +1003,13 @@ subport ${name}-qtmultimedia {
</span>     #     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:#ffe0e0;'>-    configure.post_args-append      -DFFMPEG_DIR=/opt/local/libexec/ffmpeg7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVCODEC_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVCODEC_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavcodec.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVFORMAT_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVFORMAT_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavformat.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVUTIL_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVUTIL_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavutil.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.post_args-append      -DFFMPEG_DIR=${prefix}/libexec/ffmpeg7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVCODEC_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVCODEC_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavcodec.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVFORMAT_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVFORMAT_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavformat.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVUTIL_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVUTIL_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavutil.dylib
</span> 
     # std::unary_function removed in Xcode clang 15
     patchfiles-append patch-qtmultimedia_no_std_unary_function.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt67/Portfile b/aqua/qt67/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f57b136be1c..5a80e31c9e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt67/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt67/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1042,13 +1042,13 @@ subport ${name}-qtmultimedia {
</span>     #     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:#ffe0e0;'>-    configure.post_args-append      -DFFMPEG_DIR=/opt/local/libexec/ffmpeg7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVCODEC_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVCODEC_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavcodec.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVFORMAT_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVFORMAT_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavformat.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVUTIL_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    -DAVUTIL_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavutil.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.post_args-append      -DFFMPEG_DIR=${prefix}/libexec/ffmpeg7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVCODEC_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVCODEC_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavcodec.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVFORMAT_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVFORMAT_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavformat.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVUTIL_INCLUDE_DIR=${prefix}/libexec/ffmpeg7/include\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    -DAVUTIL_LIBRARY=${prefix}/libexec/ffmpeg7/lib/libavutil.dylib
</span> }
 
 subport ${name}-qt5compat {
</pre><pre style='margin:0'>

</pre>