<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8ecd0ab2bd2fbc5766fbb915c22c3e3a79fff052">https://github.com/macports/macports-ports/commit/8ecd0ab2bd2fbc5766fbb915c22c3e3a79fff052</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8ecd0ab2bd2fbc5766fbb915c22c3e3a79fff052
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Jan 16 01:23:03 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> smtube: move MPlayer to a default variant, support QMPlay2
</span>---
www/smtube/Portfile | 20 ++++++++++++++++++--
www/smtube/files/patch-smplayer.diff | 18 +++++++++++++++---
2 files changed, 33 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/smtube/Portfile b/www/smtube/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f159e9da608..904e82de287 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/smtube/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/smtube/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +34,7 @@ checksums rmd160 febb3403f24f6f621870ffd243b3291666f0d87d \
</span> depends_build-append \
port:makeicns
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append path:${prefix}/bin/mplayer:MPlayer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:yt-dlp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:yt-dlp
</span>
configure.dir ${worksrcpath}/src
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +43,7 @@ patchfiles patch-smplayer.diff
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/players.cpp \
${worksrcpath}/src/retrieveyoutubeurl.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@APPLICATIONS@@|${applications_dir}|" ${worksrcpath}/src/players.cpp
</span> }
pre-build {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,3 +75,19 @@ notes "
</span> The mechanism smtube uses has changed slightly. You may notice\
a slight delay before the video starts to play.
"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mplayer description "Use MPlayer for playback" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append path:${prefix}/bin/mplayer:MPlayer
</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;'>+variant qmplay2 description "Use QMPlay2 for playback" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:QMPlay2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ To use QMPlay2 for playback, please launch ${name}, open Preferences>Players,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ click Add predefined players and move QMPlay2 to the top of the list.
</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;'>+# Notice, there is no conflict between variants, they merely add a runtime dep.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +mplayer
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/smtube/files/patch-smplayer.diff b/www/smtube/files/patch-smplayer.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 68ed3892d0c..1feb6176960 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/smtube/files/patch-smplayer.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/smtube/files/patch-smplayer.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,19 +2,31 @@ diff --git src/players.cpp src/players.cpp
</span> index 21afed2..4b46c04 100644
--- src/players.cpp
+++ src/players.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,10 +105,10 @@ Players::Players() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,16 +106,17 @@
</span> << Player("SMPlayer (audio)", "smplayer.exe", "%u -media-title %t", true, false, Player::Audio)
<< Player("SMPlayer (add to playlist)", "smplayer.exe", "-add-to-playlist %u", true, true, Player::VideoAudio);
#else
- list << Player("SMPlayer", "smplayer", "%u", true, true, Player::Video)
+ list << Player("MPlayer", "@@PREFIX@@/bin/mplayer", "%u -title %t", false, false, Player::Video)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << Player("SMPlayer", "smplayer", "%u", true, true, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << Player("mpv", "@@PREFIX@@/bin/mpv", "%u --title=%t", false, true, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << Player("mpv + youtube-dl", "@@PREFIX@@/bin/mpv", "--ytdl --ytdl-format=best %u", true, true, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << Player("VLC", "@@PREFIX@@/bin/vlc", "%u --meta-title=%t", false, true, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << Player("QMPlay2", "@@APPLICATIONS@@/QMPlay2.app/Contents/MacOS/QMPlay2", "%u", false, false, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << Player("SMPlayer", "smplayer", "%u", true, true, Player::Video)
</span> << Player("SMPlayer (audio)", "smplayer", "%u -media-title %t", true, false, Player::Audio)
<< Player("SMPlayer (add to playlist)", "smplayer", "-add-to-playlist %u", true, true, Player::VideoAudio)
- << Player("MPlayer", "mplayer", "%u -title %t", false, false, Player::Video)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- << Player("VLC", "vlc", "%u --meta-title=%t", false, true, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << Player("VLC", "vlc", "%u --meta-title=%t", false, true, Player::VideoAudio)
</span> << Player("Dragon Player", "dragon", "%u", false, false, Player::VideoAudio)
<< Player("Totem", "totem", "%u", false, false, Player::VideoAudio)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- << Player("GNOME-MPlayer", "gnome-mplayer", "%u", false, false, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << Player("mpv", "mpv", "%u --title=%t", false, true, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << Player("mpv + youtube-dl", "mpv", "--ytdl --ytdl-format=best %u", true, true, Player::Video);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << Player("GNOME-MPlayer", "gnome-mplayer", "%u", false, false, Player::VideoAudio);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef D_PLAYERS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list << Player("uget", "uget-gtk", "--quiet --folder=/tmp --filename=%f %u", false, false, Player::VideoAudio);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git src/retrieveyoutubeurl.cpp src/retrieveyoutubeurl.cpp
index 416956c..e2196cd 100644
--- src/retrieveyoutubeurl.cpp
</pre><pre style='margin:0'>
</pre>