<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d66f21d94705a8c09a58c704a0997d97abe85183">https://github.com/macports/macports-ports/commit/d66f21d94705a8c09a58c704a0997d97abe85183</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 d66f21d9470 QMPlay2: fix port on systems where it failed; do not copy ffmpeg binary
</span>d66f21d9470 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d66f21d94705a8c09a58c704a0997d97abe85183
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Jan 2 04:27:54 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> QMPlay2: fix port on systems where it failed; do not copy ffmpeg binary
</span>---
multimedia/QMPlay2/Portfile | 67 ++++++++++++++++------
...-Fix-Qt-paths.patch => 1001-Fix-Qt-paths.patch} | 29 ++++------
multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch | 16 +++---
3 files changed, 67 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/QMPlay2/Portfile b/multimedia/QMPlay2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75323abd2eb..0ca16b64390 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/QMPlay2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/QMPlay2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ PortGroup cmake 1.1
</span>
name QMPlay2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Currently Qt5 is broken on 10.7.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> PortGroup qt4 1.0
github.setup zaps166 QMPlay2 b76e6ea46b4a32bb2becc9444ddc6f5fdff699cd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,17 +62,33 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span>
qt5.depends_component qtdeclarative qttools qttranslations
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup zaps166 QMPlay2 23.10.22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8a4c9db6811e577ebeae5c40c279fd64f550ece2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d81c5a81a8839ac441eb7466eb16931aab92f71fd784a3b3e1d709272c4237cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1442072
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${name}-src-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Support for Qt5 < 5.10 has been dropped in 21.03.09:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/zaps166/QMPlay2/commit/02684fec6217ac87a37dbd40d7b07683122e5997
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zaps166 QMPlay2 20.12.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 582ec7368e582b4b29280d6c76d4dc54d1fd0bb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d6a5425f552e33a70b254ed27631878f20ea92850ccf221c2f2322200783d278 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1564588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zaps166 QMPlay2 23.10.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 8a4c9db6811e577ebeae5c40c279fd64f550ece2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d81c5a81a8839ac441eb7466eb16931aab92f71fd784a3b3e1d709272c4237cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1442072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xz yes
</span>
configure.args-append \
-DCMAKE_LINK_DEPENDS_NO_SHARED=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +98,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> -DUSE_RUBBERBAND=ON \
-DUSE_UPDATES=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # VTBOpenGL.cpp: error: use of undeclared identifier 'kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_FFMPEG_VTB=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append \
port:rubberband
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,12 +115,22 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> system "install_name_tool -change ${prefix}/lib/libqmplay2.dylib \
${applications_dir}/${name}.app/Contents/MacOS/libqmplay2.dylib \
${destroot}${applications_dir}/${name}.app/Contents/MacOS/QMPlay2"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach so [ exec find ${destroot}${applications_dir}/${name}.app/Contents/MacOS/modules -name "\*.so" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regsub ":$" ${so} "" destroot_so_path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regsub ${destroot} ${destroot_so_path} "" so_path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${so_path} ${destroot_so_path}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change ${prefix}/lib/libqmplay2.dylib ${applications_dir}/${name}.app/Contents/MacOS/libqmplay2.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot_so_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib [ exec find ${destroot}${applications_dir}/${name}.app/Contents/MacOS/modules -name "\*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regsub ":$" ${dylib} "" destroot_dylib_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regsub ${destroot} ${destroot_dylib_path} "" dylib_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${dylib_path} ${destroot_dylib_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${prefix}/lib/libqmplay2.dylib ${applications_dir}/${name}.app/Contents/MacOS/libqmplay2.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot_dylib_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach so [ exec find ${destroot}${applications_dir}/${name}.app/Contents/MacOS/modules -name "\*.so" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regsub ":$" ${so} "" destroot_so_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regsub ${destroot} ${destroot_so_path} "" so_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${so_path} ${destroot_so_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${prefix}/lib/libqmplay2.dylib ${applications_dir}/${name}.app/Contents/MacOS/libqmplay2.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot_so_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch b/multimedia/QMPlay2/files/1001-Fix-Qt-paths.patch
</span>similarity index 64%
copy from multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch
copy to multimedia/QMPlay2/files/1001-Fix-Qt-paths.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4fb9a7fcfe5..44abcc25f5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/QMPlay2/files/1001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +1,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 3cbc61634d8b30a34166630d254ad84e747038b7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 25 Dec 2023 07:25:56 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix Qt paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/gui/CMakeLists.txt src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 33a67ac1..6bac8fa0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,8 +239,8 @@ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gui/CMakeLists.txt 2020-12-16 07:37:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/CMakeLists.txt 2023-12-29 15:08:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,8 +227,8 @@
</span> elseif(APPLE)
install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(QT_LIBS_DIR "${${QT_PREFIX}Widgets_DIR}/../..")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(QT_LIBS_DIR "${Qt5Widgets_DIR}/../..")
</span> - set(QT_PLUGINS_DIR "${QT_LIBS_DIR}/../plugins")
+ set(QT_LIBS_DIR "@qt_libs_dir@")
+ set(QT_PLUGINS_DIR "@qt_plugins_dir@")
install(FILES
"${QT_PLUGINS_DIR}/platforms/libqcocoa.dylib"
DESTINATION "${MAC_BUNDLE_PATH}/Contents/plugins/platforms")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,23 +261,14 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,23 +249,7 @@
</span> DESTINATION "${MAC_BUNDLE_PATH}/Contents"
FILES_MATCHING
PATTERN "qtbase_*.qm")
- if(EXISTS "/usr/local/bin/ffmpeg")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(EXISTS "@prefix@/bin/ffmpeg")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(PROGRAMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(PROGRAMS
</span> - "/usr/local/bin/ffmpeg"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@prefix@/bin/ffmpeg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION "${MAC_BUNDLE_PATH}/Contents/MacOS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(WARNING "FFmpeg executable not copied!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${MAC_BUNDLE_PATH}/Contents/MacOS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(WARNING "FFmpeg executable not copied!")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span> - install(CODE "
- include(BundleUtilities)
- set(BU_CHMOD_BUNDLE_ITEMS ON)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch b/multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fb9a7fcfe5..c9e44e95104 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/QMPlay2/files/2001-Fix-Qt-paths.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ diff --git src/gui/CMakeLists.txt src/gui/CMakeLists.txt
</span> index 33a67ac1..6bac8fa0 100644
--- src/gui/CMakeLists.txt
+++ src/gui/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,8 +239,8 @@ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,8 +237,8 @@
</span> elseif(APPLE)
install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,19 +18,17 @@ index 33a67ac1..6bac8fa0 100644
</span> install(FILES
"${QT_PLUGINS_DIR}/platforms/libqcocoa.dylib"
DESTINATION "${MAC_BUNDLE_PATH}/Contents/plugins/platforms")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,23 +261,14 @@ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -259,23 +259,7 @@
</span> DESTINATION "${MAC_BUNDLE_PATH}/Contents"
FILES_MATCHING
PATTERN "qtbase_*.qm")
- if(EXISTS "/usr/local/bin/ffmpeg")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(EXISTS "@prefix@/bin/ffmpeg")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(PROGRAMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(PROGRAMS
</span> - "/usr/local/bin/ffmpeg"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@prefix@/bin/ffmpeg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION "${MAC_BUNDLE_PATH}/Contents/MacOS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(WARNING "FFmpeg executable not copied!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION "${MAC_BUNDLE_PATH}/Contents/MacOS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(WARNING "FFmpeg executable not copied!")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span> - install(CODE "
- include(BundleUtilities)
- set(BU_CHMOD_BUNDLE_ITEMS ON)
</pre><pre style='margin:0'>
</pre>