<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/54d7298b5cf8ff4e0f29d3865de013e77f6a8f1c">https://github.com/macports/macports-ports/commit/54d7298b5cf8ff4e0f29d3865de013e77f6a8f1c</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 54d7298b5cf yt-dlp: New port, version 2021.09.02
</span>54d7298b5cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 54d7298b5cf8ff4e0f29d3865de013e77f6a8f1c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Sep 23 17:09:45 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> yt-dlp: New port, version 2021.09.02
</span>---
net/youtube-dl/Portfile | 75 +++++++++++++++-------
...ation.diff => youtube-dl-config-location.patch} | 22 +++----
...e_dl-update.py.diff => youtube-dl-update.patch} | 0
net/youtube-dl/files/yt-dlp-config-location.patch | 33 ++++++++++
net/youtube-dl/files/yt-dlp-update.patch | 11 ++++
5 files changed, 106 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/youtube-dl/Portfile b/net/youtube-dl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0daad6a10a9..391bb082402 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/youtube-dl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/youtube-dl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,54 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ytdl-org youtube-dl 2021.06.06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24478101dbb1a9f5b634ed872e407c4e8d088041 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name youtube-dl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup ytdl-org ${subport} 2021.06.06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 24478101dbb1a9f5b634ed872e407c4e8d088041 \
</span> sha256 3ccb0e4db9fd172338ed1c32bae0be2f716458dca4143e55732ff55260b20ac3 \
size 3336227
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://youtube-dl.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set symlinks [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ etc/bash_completion.d/${subport}.bash-completion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ etc/fish/completions/${subport}.fish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share/man/man1/${subport}.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share/zsh/site-functions/_${subport} \
</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;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/ytdl-org/youtube-dl/issues/9231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${python.prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/youtube-dl.zsh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${python.prefix}/share/zsh/site-functions/_youtube-dl
</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;'>+ livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url ${homepage}/latest/version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {^([0-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;'>+subport yt-dlp {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup yt-dlp ${subport} 2021.09.02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 199a7c523dccecf42fd387e20057fe31ed5e3607 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6fd6a32ba43ea10ff12dd96c744b531c9b2a79a883b5f06f431a99e3bfc59598 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3693133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist_subdir ${subport}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set symlinks [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share/bash-completion/completions/${subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share/fish/vendor_completions.d/${subport}.fish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share/man/man1/${subport}.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ share/zsh/site-functions/_${subport} \
</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> categories net
platforms darwin
maintainers {ryandesign @ryandesign}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,38 +62,27 @@ installs_libs no
</span> description command-line program to download videos from YouTube.com and other sites
long_description ${name} is a small {*}${description}.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://youtube-dl.org
</span> github.tarball_from releases
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-config-location.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-youtube_dl-update.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append ${subport}-config-location.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport}-update.patch
</span>
post-patch {
reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- youtube_dl/options.py \
</span> README.md \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- youtube-dl.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport}.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [string map {- _} ${subport}]/options.py
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/ytdl-org/youtube-dl/issues/9231
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${python.prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/youtube-dl.zsh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${python.prefix}/share/zsh/site-functions/_youtube-dl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- etc/bash_completion.d/youtube-dl.bash-completion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- etc/fish/completions/youtube-dl.fish
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share/man/man1/youtube-dl.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- share/zsh/site-functions/_youtube-dl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${symlinks} {
</span> xinstall -d ${destroot}${prefix}/[file dirname ${f}]
ln -s ${python.prefix}/${f} ${destroot}${prefix}/${f}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${subport}
</span> xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} LICENSE README.md ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +121,3 @@ if {[variant_isset python27]} {
</span>
# WARNING: hlsnative has detected features it does not support, extraction will be delegated to ffmpeg
depends_lib-append port:py${python.version}-crypto
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/update/LATEST_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {^([0-9.]+)$}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/youtube-dl/files/patch-config-location.diff b/net/youtube-dl/files/youtube-dl-config-location.patch
</span>similarity index 100%
rename from net/youtube-dl/files/patch-config-location.diff
rename to net/youtube-dl/files/youtube-dl-config-location.patch
<span style='display:block; white-space:pre;color:#808080;'>index 1a0547566e7..51d4f116f44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/youtube-dl/files/patch-config-location.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/youtube-dl/files/youtube-dl-config-location.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- youtube_dl/options.py.orig 2021-01-24 04:59:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ youtube_dl/options.py 2021-01-30 20:00:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -903,7 +903,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif '--ignore-config' in command_line_conf:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system_conf = _readOptions('/etc/youtube-dl.conf')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system_conf = _readOptions('@PREFIX@/etc/youtube-dl.conf')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if '--ignore-config' not in system_conf:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user_conf = _readUserConf()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> --- README.md.orig 2021-01-24 05:11:19.000000000 -0600
+++ README.md 2021-01-30 20:05:10.000000000 -0600
@@ -82,7 +82,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,3 +38,14 @@
</span> \f[C]~/.config/youtube\-dl/config\f[].
On Windows, the user wide configuration file locations are
\f[C]%APPDATA%\\youtube\-dl\\config.txt\f[] or
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- youtube_dl/options.py.orig 2021-01-24 04:59:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ youtube_dl/options.py 2021-01-30 20:00:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -903,7 +903,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif '--ignore-config' in command_line_conf:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- system_conf = _readOptions('/etc/youtube-dl.conf')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ system_conf = _readOptions('@PREFIX@/etc/youtube-dl.conf')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if '--ignore-config' not in system_conf:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ user_conf = _readUserConf()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/youtube-dl/files/patch-youtube_dl-update.py.diff b/net/youtube-dl/files/youtube-dl-update.patch
</span>similarity index 100%
rename from net/youtube-dl/files/patch-youtube_dl-update.py.diff
rename to net/youtube-dl/files/youtube-dl-update.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/youtube-dl/files/yt-dlp-config-location.patch b/net/youtube-dl/files/yt-dlp-config-location.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3e1717dde8d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/youtube-dl/files/yt-dlp-config-location.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- README.md.orig 2021-09-01 19:02:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ README.md 2021-09-23 05:41:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -903,7 +903,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * `~/yt-dlp.conf.txt`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that `~` points to `C:\Users\<user name>` on windows. Also, `%XDG_CONFIG_HOME%` defaults to `~/.config` if undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-1. **System Configuration**: `/etc/yt-dlp.conf`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++1. **System Configuration**: `@PREFIX@/etc/yt-dlp.conf`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ For example, with the following configuration file yt-dlp will always extract the audio, not copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ```
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- yt-dlp.1.orig 2021-09-01 19:02:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ yt-dlp.1 2021-09-23 05:43:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1323,7 +1323,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .RE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "5." 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-\f[B]System Configuration\f[R]: \f[C]/etc/yt\-dlp.conf\f[R]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\f[B]System Configuration\f[R]: \f[C]@PREFIX@/etc/yt\-dlp.conf\f[R]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ For example, with the following configuration file yt\-dlp will always
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract the audio, not copy the mtime, use a proxy and save all videos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- yt_dlp/options.py.orig 2021-09-01 19:02:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ yt_dlp/options.py 2021-09-23 05:40:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1578,7 +1578,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if '--ignore-config' in configs['home']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configs['system'], paths['system'] = read_options('/etc')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configs['system'], paths['system'] = read_options('@PREFIX@/etc')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if '--ignore-config' in configs['system']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/youtube-dl/files/yt-dlp-update.patch b/net/youtube-dl/files/yt-dlp-update.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..22cbaaf97ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/youtube-dl/files/yt-dlp-update.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- yt_dlp/update.py.orig 2021-09-01 19:02:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ yt_dlp/update.py 2021-09-23 05:22:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif hasattr(sys, 'frozen'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err = 'It looks like you installed yt-dlp with a package manager, pip, setup.py or a tarball. Please use that to update'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err = 'It looks like you installed yt-dlp with MacPorts. Please use "sudo port selfupdate && sudo port upgrade yt-dlp" to update.'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if err:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return report_error(err, expected=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>