diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile index 563af471fc6e..d4d4f45d57f4 100644 --- a/www/yt-dlp/Makefile +++ b/www/yt-dlp/Makefile @@ -1,36 +1,38 @@ PORTNAME= yt-dlp -DISTVERSION= 2021.05.20 +DISTVERSION= 2021.06.01 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org COMMENT= Command-line program for downloading videos from various platforms LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} + USES= gmake python shebangfix SHEBANG_GLOB= devscripts/*.py USE_GITHUB= yes MAKE_ARGS= PYTHON=${PYTHON_CMD} NO_ARCH= yes OPTIONS_DEFINE= FFMPEG MUTAGEN RTMPDUMP SYMLINK OPTIONS_DEFAULT= FFMPEG RTMPDUMP OPTIONS_SUB= yes MUTAGEN_DESC= Thumbnail support via Mutagen RTMPDUMP_DESC= Use rtmpdump to download rtmp video streams SYMLINK_DESC= Install youtube-dl symbolic link for executable FFMPEG_RUN_DEPENDS= ffprobe:multimedia/ffmpeg MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump SYMLINK_CONFLICTS= youtube_dl post-install-SYMLINK-on: @${RLN} ${STAGEDIR}${PREFIX}/bin/yt-dlp ${STAGEDIR}${PREFIX}/bin/youtube-dl .include diff --git a/www/yt-dlp/distinfo b/www/yt-dlp/distinfo index f0751c08f242..e13e7cb45f56 100644 --- a/www/yt-dlp/distinfo +++ b/www/yt-dlp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621529609 -SHA256 (yt-dlp-yt-dlp-2021.05.20_GH0.tar.gz) = b1def2006482deb07005f3b9c61e571e8a7e780adc12e764ab042c97d0d821b4 -SIZE (yt-dlp-yt-dlp-2021.05.20_GH0.tar.gz) = 1631042 +TIMESTAMP = 1622618435 +SHA256 (yt-dlp-yt-dlp-2021.06.01_GH0.tar.gz) = 37992c9116901a6213e3157a6119d2af41d396483bd5260bf377acc80550ddef +SIZE (yt-dlp-yt-dlp-2021.06.01_GH0.tar.gz) = 1647481 diff --git a/www/yt-dlp/files/patch-yt__dlp_____init____.py b/www/yt-dlp/files/patch-yt__dlp_____init____.py index 0f0d7f8b322c..84d6918d6d66 100644 --- a/www/yt-dlp/files/patch-yt__dlp_____init____.py +++ b/www/yt-dlp/files/patch-yt__dlp_____init____.py @@ -1,29 +1,21 @@ ---- yt_dlp/__init__.py.orig 2021-03-18 03:08:48 UTC +--- yt_dlp/__init__.py.orig 2021-06-01 14:59:03 UTC +++ yt_dlp/__init__.py -@@ -38,7 +38,6 @@ from .utils import ( - std_headers, - write_string, - ) --from .update import update_self - from .downloader import ( - FileDownloader, - ) -@@ -580,17 +579,9 @@ def _real_main(argv=None): +@@ -660,17 +660,9 @@ def _real_main(argv=None): if opts.rm_cachedir: ydl.cache.remove() - # Update version - if opts.update_self: - # If updater returns True, exit. Required for windows -- if update_self(ydl.to_screen, opts.verbose, ydl._opener): +- if run_update(ydl): - if actual_use: - sys.exit('ERROR: The program must exit for the update to complete') - sys.exit() - # Maybe do nothing if not actual_use: - if opts.update_self or opts.rm_cachedir: + if opts.rm_cachedir: sys.exit() ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)