<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/8cc475cb448ad5b044c5d9714eb27279a11ff11b">https://github.com/macports/macports-ports/commit/8cc475cb448ad5b044c5d9714eb27279a11ff11b</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 8cc475cb448 smtube: bump to 20.6.0
</span>8cc475cb448 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8cc475cb448ad5b044c5d9714eb27279a11ff11b
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Jul 6 15:27:49 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> smtube: bump to 20.6.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> minor change to patch
</span><span style='display:block; white-space:pre;color:#404040;'> uses youtube-dl now
</span>---
www/smtube/Portfile | 41 ++++++++++++++++++++------------
www/smtube/files/patch-smplayer.diff | 45 ++++++++++++++++++++++--------------
2 files changed, 54 insertions(+), 32 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 28e74619907..6e574ff2da2 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup qmake 1.0
name smtube
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20.6.0
</span>
categories www
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,28 +19,34 @@ long_description ${description}. Uses a media player, by default MPlayer, for
</span> master_sites sourceforge
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eac81ae468c0075bc075e2f6b6a4ccae0b512c92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bf1d4119fe8beac3faacc9bb208114f2ceb99ccb0b331a7286013403a67fa703 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 749306
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 adf6b148ba29ae55c98763b1a8383578e1743e86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 82f1eb06d2d8fa4304586a40c2e6dde6a44b2224e3157f039b16f3af5f51df42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 746094
</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:#e0ffe0;'>+
</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;'>+ port:youtube-dl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.dir ${worksrcpath}/src
patchfiles patch-smplayer.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/players.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${prefix}/bin/makeicns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -256 ./icons/smtube_256.png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -128 ./icons/smtube_128.png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -64 ./icons/smtube_64.png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -48 ./icons/smtube_48.png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -32 ./icons/smtube_32.png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -16 ./icons/smtube_16.png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -out src/smtube.icns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/players.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/retrieveyoutubeurl.cpp
</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;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${prefix}/bin/makeicns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -256 ./icons/smtube_256.png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -128 ./icons/smtube_128.png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -64 ./icons/smtube_64.png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -48 ./icons/smtube_48.png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -32 ./icons/smtube_32.png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -16 ./icons/smtube_16.png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -out src/smtube.icns"
</span> }
build.dir ${worksrcpath}/src
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,3 +62,8 @@ post-build {
</span> destroot {
copy ${worksrcpath}/src/smtube.app ${destroot}${applications_dir}/smtube.app
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The mechanism smtube uses has changed slightly. You may notice\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+a slight delay before the video starts to play.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</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 7ea6e02a3b6..0a7d1725905 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;'>@@ -1,27 +1,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reorder the default players, and pre-set the link to our mplayer executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also add an icon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> diff --git src/players.cpp src/players.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7291c8b..8e0547e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 21afed2..4b46c04 100644
</span> --- src/players.cpp
+++ src/players.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,10 +111,10 @@ Players::Players() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //list.push_back( Player("yoDownet", "yoDownet.exe", "%u -o %f", false, false, Player::VideoAudio) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,10 +105,10 @@ Players::Players() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << Player("SMPlayer (audio)", "smplayer.exe", "%u -media-title %t", true, false, Player::Audio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << Player("SMPlayer (add to playlist)", "smplayer.exe", "-add-to-playlist %u", true, true, Player::VideoAudio);
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list.push_back( Player("MPlayer", "@@PREFIX@@/bin/mplayer", "%u -title %t", false, false, Player::Video) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list.push_back( Player("SMPlayer", "smplayer", "%u", true, true, Player::Video) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list.push_back( Player("SMPlayer (audio)", "smplayer", "%u -media-title %t", true, false, Player::Audio) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list.push_back( Player("SMPlayer (add to playlist)", "smplayer", "-add-to-playlist %u", true, true, Player::VideoAudio) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list.push_back( Player("MPlayer", "mplayer", "%u -title %t", false, false, Player::Video) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list.push_back( Player("VLC", "vlc", "%u --meta-title=%t", false, true, Player::VideoAudio) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list.push_back( Player("Dragon Player", "dragon", "%u", false, false, Player::VideoAudio) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list.push_back( Player("Totem", "totem", "%u", false, false, Player::VideoAudio) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list << Player("SMPlayer", "smplayer", "%u", true, true, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list << Player("MPlayer", "@@PREFIX@@/bin/mplayer", "%u -title %t", false, false, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << Player("SMPlayer", "smplayer", "%u", true, true, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << Player("SMPlayer (audio)", "smplayer", "%u -media-title %t", true, false, Player::Audio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << Player("SMPlayer (add to playlist)", "smplayer", "-add-to-playlist %u", true, true, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << Player("MPlayer", "mplayer", "%u -title %t", false, false, Player::Video)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << Player("VLC", "vlc", "%u --meta-title=%t", false, true, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << Player("Dragon Player", "dragon", "%u", false, false, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ << Player("Totem", "totem", "%u", false, false, Player::VideoAudio)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/retrieveyoutubeurl.cpp src/retrieveyoutubeurl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 416956c..e2196cd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/retrieveyoutubeurl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/retrieveyoutubeurl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@ QString RetrieveYoutubeUrl::ytdlBin() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef Q_OS_WIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "mpv/youtube-dl.exe";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString bin = QDir::homePath() + "/bin/youtube-dl";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString bin = "@@PREFIX@@/bin/youtube-dl";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFileInfo fi(bin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!fi.exists() || !fi.isExecutable()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin = "youtube-dl";
</span> diff --git src/smtube.pro src/smtube.pro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 28bbdc0..4cc3bdd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00b84bf..f82a352 100644
</span> --- src/smtube.pro
+++ src/smtube.pro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,6 +88,8 @@ unix {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,6 +91,8 @@ unix {
</span> DEFINES += TRANSLATION_PATH=$(TRANSLATION_PATH)
}
</pre><pre style='margin:0'>
</pre>