youtube-dl: Update net/youtube-dl to 20180908 Changes: version 2018.09.08 Extractors * [youtube] Fix extraction (#17457, #17464) + [pornhub:uservideos] Add support for new URLs (#17388) * [iprima] Confirm adult check (#17437) * [slideslive] Make check for video service name case-insensitive (#17429) * [radiojavan] Fix extraction (#17151) * [generic] Skip unsuccessful jwplayer extraction (#16735) version 2018.09.01 Core * [utils] Skip remote IP addresses non matching to source address' IP version when creating a connection (#13422, #17362) Extractors + [ard] Add support for one.ard.de (#17397) * [niconico] Fix extraction on python3 (#17393, #17407) * [ard] Extract f4m formats * [crunchyroll] Parse vilos media data (#17343) + [ard] Add support for Beta ARD Mediathek + [bandcamp] Extract more metadata (#13197) * [internazionale] Fix extraction of non-available-abroad videos (#17386) version 2018.08.28 Extractors + [youtube:playlist] Add support for music album playlists (OLAK5uy_ prefix) (#17361) * [bitchute] Fix extraction by pass custom User-Agent (#17360) * [webofstories:playlist] Fix extraction (#16914) + [tvplayhome] Add support for new tvplay URLs (#17344) + [generic] Allow relative src for videojs embeds (#17324) + [xfileshare] Add support for vidto.se (#17317) + [vidzi] Add support for vidzi.nu (#17316) + [nova:embed] Add support for media.cms.nova.cz (#17282) version 2018.08.22 Core * [utils] Use pure browser header for User-Agent (#17236) Extractors + [kinopoisk] Add support for kinopoisk.ru (#17283) + [yourporn] Add support for yourporn.sexy (#17298) + [go] Add support for disneynow.go.com (#16299, #17264) + [6play] Add support for play.rtl.hr (#17249) * [anvato] Fallback to generic API key for access-key-to-API-key lookup (#16788, #17254) * [lci] Fix extraction (#17274) * [bbccouk] Extend id URL regular expression (#17270) * [cwtv] Fix extraction (#17256) * [nova] Fix extraction (#17241) + [generic] Add support for expressen embeds * [raywenderlich] Adapt to site redesign (#17225) + [redbulltv] Add support redbull.com tv URLs (#17218) + [bitchute] Add support for bitchute.com (#14052) + [clyp] Add support for token protected media (#17184) * [imdb] Fix extension extraction (#17167) version 2018.08.04 Extractors * [funk:channel] Improve byChannelAlias extraction (#17142) * [twitch] Fix authentication (#17024, #17126) * [twitch:vod] Improve URL regular expression (#17135) * [watchbox] Fix extraction (#17107) * [pbs] Fix extraction (#17109) * [theplatform] Relax URL regular expression (#16181, #17097) + [viqeo] Add support for viqeo.tv (#17066) version 2018.07.29 Extractors * [crunchyroll:playlist] Restrict URL regular expression (#17069, #17076) + [pornhub] Add support for subtitles (#16924, #17088) * [ceskatelevize] Use https for API call (#16997, #16999) * [dailymotion:playlist] Fix extraction (#16894) * [ted] Improve extraction * [ted] Fix extraction for videos without nativeDownloads (#16756, #17085) * [telecinco] Fix extraction (#17080) * [mitele] Reduce number of requests * [rai] Return non HTTP relinker URL intact (#17055) * [vk] Fix extraction for inline only videos (#16923) * [streamcloud] Fix extraction (#17054) * [facebook] Fix tahoe player extraction with authentication (#16655) + [puhutv] Add support for puhutv.com (#12712, #16010, #16269) version 2018.07.21 Core + [utils] Introduce url_or_none * [utils] Allow JSONP without function name (#17028) + [extractor/common] Extract DASH and MSS formats from SMIL manifests Extractors + [bbc] Add support for BBC Radio Play pages (#17022) * [iwara] Fix download URLs (#17026) * [vrtnu] Relax title extraction and extract JSON-LD (#17018) + [viu] Pass Referer and Origin headers and area id (#16992) + [vimeo] Add another config regular expression (#17013) + [facebook] Extract view count (#16942) * [dailymotion] Improve description extraction (#16984) * [slutload] Fix and improve extraction (#17001) * [mediaset] Fix extraction (#16977) + [theplatform] Add support for theplatform TLD customization (#16977) * [imgur] Relax URL regular expression (#16987) * [pornhub] Improve extraction and extract all formats (#12166, #15891, #16262, #16959) 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) Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/youtube-dl/Makefile,v retrieving revision 1.139 retrieving revision 1.145 diff -u -p -r1.139 -r1.145 --- Makefile 18 Jun 2018 18:00:52 -0000 1.139 +++ Makefile 8 Sep 2018 16:24:35 -0000 1.145 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.139 2018/06/18 18:00:52 leot Exp $ +# $NetBSD: Makefile,v 1.145 2018/09/08 16:24:35 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.09.08 DISTNAME= youtube-dl-${VERSION_DATE} PKGNAME= ${DISTNAME:S/.//:S/.//} CATEGORIES= net Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/net/youtube-dl/PLIST,v retrieving revision 1.65 retrieving revision 1.68 diff -u -p -r1.65 -r1.68 --- PLIST 18 Jun 2018 18:00:52 -0000 1.65 +++ PLIST 22 Aug 2018 10:57:11 -0000 1.68 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.65 2018/06/18 18:00:52 leot Exp $ +@comment $NetBSD: PLIST,v 1.68 2018/08/22 10:57:11 leot Exp $ bin/youtube-dl ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt @@ -233,6 +233,9 @@ ${PYSITELIB}/youtube_dl/extractor/biobio ${PYSITELIB}/youtube_dl/extractor/biqle.py ${PYSITELIB}/youtube_dl/extractor/biqle.pyc ${PYSITELIB}/youtube_dl/extractor/biqle.pyo +${PYSITELIB}/youtube_dl/extractor/bitchute.py +${PYSITELIB}/youtube_dl/extractor/bitchute.pyc +${PYSITELIB}/youtube_dl/extractor/bitchute.pyo ${PYSITELIB}/youtube_dl/extractor/bleacherreport.py ${PYSITELIB}/youtube_dl/extractor/bleacherreport.pyc ${PYSITELIB}/youtube_dl/extractor/bleacherreport.pyo @@ -695,6 +698,9 @@ ${PYSITELIB}/youtube_dl/extractor/freesp ${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 @@ -953,6 +959,9 @@ ${PYSITELIB}/youtube_dl/extractor/khanac ${PYSITELIB}/youtube_dl/extractor/kickstarter.py ${PYSITELIB}/youtube_dl/extractor/kickstarter.pyc ${PYSITELIB}/youtube_dl/extractor/kickstarter.pyo +${PYSITELIB}/youtube_dl/extractor/kinopoisk.py +${PYSITELIB}/youtube_dl/extractor/kinopoisk.pyc +${PYSITELIB}/youtube_dl/extractor/kinopoisk.pyo ${PYSITELIB}/youtube_dl/extractor/konserthusetplay.py ${PYSITELIB}/youtube_dl/extractor/konserthusetplay.pyc ${PYSITELIB}/youtube_dl/extractor/konserthusetplay.pyo @@ -1478,6 +1487,9 @@ ${PYSITELIB}/youtube_dl/extractor/prompt ${PYSITELIB}/youtube_dl/extractor/prosiebensat1.py ${PYSITELIB}/youtube_dl/extractor/prosiebensat1.pyc ${PYSITELIB}/youtube_dl/extractor/prosiebensat1.pyo +${PYSITELIB}/youtube_dl/extractor/puhutv.py +${PYSITELIB}/youtube_dl/extractor/puhutv.pyc +${PYSITELIB}/youtube_dl/extractor/puhutv.pyo ${PYSITELIB}/youtube_dl/extractor/puls4.py ${PYSITELIB}/youtube_dl/extractor/puls4.pyc ${PYSITELIB}/youtube_dl/extractor/puls4.pyo @@ -2159,6 +2171,9 @@ ${PYSITELIB}/youtube_dl/extractor/vimple ${PYSITELIB}/youtube_dl/extractor/vine.py ${PYSITELIB}/youtube_dl/extractor/vine.pyc ${PYSITELIB}/youtube_dl/extractor/vine.pyo +${PYSITELIB}/youtube_dl/extractor/viqeo.py +${PYSITELIB}/youtube_dl/extractor/viqeo.pyc +${PYSITELIB}/youtube_dl/extractor/viqeo.pyo ${PYSITELIB}/youtube_dl/extractor/viu.py ${PYSITELIB}/youtube_dl/extractor/viu.pyc ${PYSITELIB}/youtube_dl/extractor/viu.pyo @@ -2333,6 +2348,9 @@ ${PYSITELIB}/youtube_dl/extractor/younow ${PYSITELIB}/youtube_dl/extractor/youporn.py ${PYSITELIB}/youtube_dl/extractor/youporn.pyc ${PYSITELIB}/youtube_dl/extractor/youporn.pyo +${PYSITELIB}/youtube_dl/extractor/yourporn.py +${PYSITELIB}/youtube_dl/extractor/yourporn.pyc +${PYSITELIB}/youtube_dl/extractor/yourporn.pyo ${PYSITELIB}/youtube_dl/extractor/yourupload.py ${PYSITELIB}/youtube_dl/extractor/yourupload.pyc ${PYSITELIB}/youtube_dl/extractor/yourupload.pyo Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/net/youtube-dl/distinfo,v retrieving revision 1.124 retrieving revision 1.130 diff -u -p -r1.124 -r1.130 --- distinfo 18 Jun 2018 18:00:52 -0000 1.124 +++ distinfo 8 Sep 2018 16:24:35 -0000 1.130 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.124 2018/06/18 18:00:52 leot Exp $ +$NetBSD: distinfo,v 1.130 2018/09/08 16:24:35 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.09.08.tar.gz) = 7380c84358cb2e3e29c41b0cbcfc67912194ecc0 +RMD160 (youtube-dl-2018.09.08.tar.gz) = a1e58a70f40fe9fcafbee1059fc154eeae6d69da +SHA512 (youtube-dl-2018.09.08.tar.gz) = c1cbf38a185d6ba1525eb08064f95aa252cf8d461f140cb48dc4a795e209f5d31bc1583f4d52c2ea9f1c15dac46c563603e46f72cc896a7fec54dcb2d0a49c0b +Size (youtube-dl-2018.09.08.tar.gz) = 3034241 bytes SHA1 (patch-setup.py) = a67074ae7cfe5e77847c2f610337ea553eddb69b -SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 710c3c2a78f9b33a32fd92a1d7f1d2b46805635b +SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = c516d23cf14811b29ef593893741ed0fb4e17f22 Index: patches/patch-youtube__dl_postprocessor_ffmpeg.py =================================================================== RCS file: /cvsroot/pkgsrc/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- patches/patch-youtube__dl_postprocessor_ffmpeg.py 6 May 2018 10:22:59 -0000 1.3 +++ patches/patch-youtube__dl_postprocessor_ffmpeg.py 14 Jul 2018 11:27:05 -0000 1.4 @@ -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