From c064a17e214b0f613b3ed230746599bb1b5e9948 Mon Sep 17 00:00:00 2001 From: leot Date: Sat, 14 Jul 2018 11:27:05 +0000 Subject: [PATCH] youtube-dl: Update net/youtube-dl to 20180710 Changes: version 2018.07.10 Core * [utils] Share JSON-LD regular expression * [downloader/dash] Improve error handling (#16927) Extractors + [nrktv] Add support for new season and serie URL schema + [nrktv] Add support for new episode URL schema (#16909) + [frontendmasters] Add support for frontendmasters.com (#3661, #16328) * [funk] Fix extraction (#16918) * [watchbox] Fix extraction (#16904) * [dplayit] Sort formats * [dplayit] Fix extraction (#16901) * [youtube] Improve login error handling (#13822) version 2018.07.04 Core * [extractor/common] Properly escape % in MPD templates (#16867) * [extractor/common] Use source URL as Referer for HTML5 entries (16849) * Prefer ffmpeg over avconv by default (#8622) Extractors * [pluralsight] Switch to graphql (#16889, #16895, #16896, #16899) * [lynda] Simplify login and improve error capturing (#16891) + [go90] Add support for embed URLs (#16873) * [go90] Detect geo restriction error and pass geo verification headers (#16874) * [vlive] Fix live streams extraction (#16871) * [npo] Fix typo (#16872) + [mediaset] Add support for new videos and extract all formats (#16568) * [dctptv] Restore extraction based on REST API (#16850) * [svt] Improve extraction and add support for pages (#16802) * [porncom] Fix extraction (#16808) version 2018.06.25 Extractors * [joj] Relax URL regular expression (#16771) * [brightcove] Workaround sonyliv DRM protected videos (#16807) * [motherless] Fix extraction (#16786) * [itv] Make SOAP request non fatal and extract metadata from webpage (#16780) - [foxnews:insider] Remove extractor (#15810) + [foxnews] Add support for iframe embeds (#15810, #16711) version 2018.06.19 Core + [extractor/common] Introduce expected_status in _download_* methods for convenient accept of HTTP requests failed with non 2xx status codes + [compat] Introduce compat_integer_types Extractors * [peertube] Improve generic support (#16733) + [6play] Use geo verification headers * [rtbf] Fix extraction for python 3.2 * [vgtv] Improve HLS formats extraction + [vgtv] Add support for www.aftonbladet.se/tv URLs * [bbccouk] Use expected_status * [markiza] Expect 500 HTTP status code * [tvnow] Try all clear manifest URLs (#15361) --- net/youtube-dl/Makefile | 4 +-- net/youtube-dl/PLIST | 5 +++- net/youtube-dl/distinfo | 12 ++++---- .../patch-youtube__dl_postprocessor_ffmpeg.py | 28 +++++++++---------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile index a369474bbbe1..454408af5872 100644 --- a/net/youtube-dl/Makefile +++ b/net/youtube-dl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.139 2018/06/18 18:00:52 leot Exp $ +# $NetBSD: Makefile,v 1.140 2018/07/14 11:27:05 leot Exp $ # XXX: VERSION_DATE can contains also an optional part that indicates # XXX: possible same day revisions. PKGNAME preserves that dotted part as is. -VERSION_DATE= 2018.06.18 +VERSION_DATE= 2018.07.10 DISTNAME= youtube-dl-${VERSION_DATE} PKGNAME= ${DISTNAME:S/.//:S/.//} CATEGORIES= net diff --git a/net/youtube-dl/PLIST b/net/youtube-dl/PLIST index 486b09d76fc8..f4ce105f0ea7 100644 --- a/net/youtube-dl/PLIST +++ b/net/youtube-dl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.65 2018/06/18 18:00:52 leot Exp $ +@comment $NetBSD: PLIST,v 1.66 2018/07/14 11:27:05 leot Exp $ bin/youtube-dl ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt @@ -695,6 +695,9 @@ ${PYSITELIB}/youtube_dl/extractor/freespeech.pyo ${PYSITELIB}/youtube_dl/extractor/freshlive.py ${PYSITELIB}/youtube_dl/extractor/freshlive.pyc ${PYSITELIB}/youtube_dl/extractor/freshlive.pyo +${PYSITELIB}/youtube_dl/extractor/frontendmasters.py +${PYSITELIB}/youtube_dl/extractor/frontendmasters.pyc +${PYSITELIB}/youtube_dl/extractor/frontendmasters.pyo ${PYSITELIB}/youtube_dl/extractor/funimation.py ${PYSITELIB}/youtube_dl/extractor/funimation.pyc ${PYSITELIB}/youtube_dl/extractor/funimation.pyo diff --git a/net/youtube-dl/distinfo b/net/youtube-dl/distinfo index 4c63d3730db2..abc4d672f63d 100644 --- a/net/youtube-dl/distinfo +++ b/net/youtube-dl/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.124 2018/06/18 18:00:52 leot Exp $ +$NetBSD: distinfo,v 1.125 2018/07/14 11:27:05 leot Exp $ -SHA1 (youtube-dl-2018.06.18.tar.gz) = 9a71016aa9ba6e99368dd966ca4c3a1d717abec7 -RMD160 (youtube-dl-2018.06.18.tar.gz) = 9148e28be89c65e2e51f85a0165f72b1b9f6b8a9 -SHA512 (youtube-dl-2018.06.18.tar.gz) = 90a43fd5b3ba9c80839ebb6457890f11f02f709ffe4b5c2a450ea773c5be6e219b5b8abf7906f1eface75a128a6cce51c9ea00bb35751e7163169d464d05b50b -Size (youtube-dl-2018.06.18.tar.gz) = 2986351 bytes +SHA1 (youtube-dl-2018.07.10.tar.gz) = 7357134454d37ee4dc052276c844418d5b1dfbce +RMD160 (youtube-dl-2018.07.10.tar.gz) = 58e8a88f1ba09184c3ea96a441a744c85269b13b +SHA512 (youtube-dl-2018.07.10.tar.gz) = 4f83bc02002d31bd04d9319d798c1b190b5a357864daca9661bcdeef3f71b258fb9b4b76ae1c19a0901ba5b0e56b834f0124353a4e4e3c6d0554a8f4f967c246 +Size (youtube-dl-2018.07.10.tar.gz) = 3001810 bytes SHA1 (patch-setup.py) = a67074ae7cfe5e77847c2f610337ea553eddb69b -SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 710c3c2a78f9b33a32fd92a1d7f1d2b46805635b +SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = c516d23cf14811b29ef593893741ed0fb4e17f22 diff --git a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py index 5e8c3af72de9..637bb334414d 100644 --- a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py +++ b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py @@ -1,21 +1,21 @@ -$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.3 2018/05/06 10:22:59 leot Exp $ +$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.4 2018/07/14 11:27:05 leot Exp $ Also look and use ffmpeg[234]/ffproble[234] if possible, preferring the unversioned one (i.e. selected via alternatives framework) or the newest one. ---- youtube_dl/postprocessor/ffmpeg.py.orig 2016-02-09 11:57:41.000000000 +0000 +--- youtube_dl/postprocessor/ffmpeg.py.orig 2018-07-03 22:29:01.000000000 +0000 +++ youtube_dl/postprocessor/ffmpeg.py -@@ -51,7 +51,7 @@ class FFmpegPostProcessor(PostProcessor) +@@ -76,7 +76,7 @@ class FFmpegPostProcessor(PostProcessor) return FFmpegPostProcessor(downloader)._versions def _determine_executables(self): - programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe'] + programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2'] - prefer_ffmpeg = False + prefer_ffmpeg = True self.basename = None -@@ -79,7 +79,7 @@ class FFmpegPostProcessor(PostProcessor) +@@ -104,7 +104,7 @@ class FFmpegPostProcessor(PostProcessor) self._versions = {} return None location = os.path.dirname(os.path.abspath(location)) @@ -24,26 +24,26 @@ or the newest one. prefer_ffmpeg = True self._paths = dict( -@@ -93,18 +93,18 @@ class FFmpegPostProcessor(PostProcessor) +@@ -118,18 +118,18 @@ class FFmpegPostProcessor(PostProcessor) self._paths = dict((p, p) for p in programs) - if prefer_ffmpeg: -- prefs = ('ffmpeg', 'avconv') -+ prefs = ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'avconv') - else: + if prefer_ffmpeg is False: - prefs = ('avconv', 'ffmpeg') + prefs = ('avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2') + else: +- prefs = ('ffmpeg', 'avconv') ++ prefs = ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'avconv') for p in prefs: if self._versions[p]: self.basename = p break - if prefer_ffmpeg: -- prefs = ('ffprobe', 'avprobe') -+ prefs = ('ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2', 'avprobe') - else: + if prefer_ffmpeg is False: - prefs = ('avprobe', 'ffprobe') + prefs = ('avprobe', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2') + else: +- prefs = ('ffprobe', 'avprobe') ++ prefs = ('ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2', 'avprobe') for p in prefs: if self._versions[p]: self.probe_basename = p