youtube-dl: Update net/youtube-dl to 20180501

pkgsrc changes:
 - Also try to use use ff{mpeg,proble}4 and while here better explain the
   rationale in patches/patch-youtube__dl_postprocessor_ffmpeg.py.
 - Update MESSAGE to also mention ffmpeg4.

Changes:
version 2018.05.01
Core
* [downloader/fragment] Restart download if .ytdl file is corrupt (#16312)
+ [extractor/common] Extract interaction statistic
+ [utils] Add merge_dicts
+ [extractor/common] Add _download_json_handle

Extractors
* [kaltura] Improve iframe embeds detection (#16337)
+ [udemy] Extract outputs renditions (#16289, #16291, #16320, #16321, #16334,
  #16335)
+ [zattoo] Add support for zattoo.com and mobiltv.quickline.com (#14668, #14676)
* [yandexmusic] Convert release_year to int
* [udemy] Override _download_webpage_handle instead of _download_webpage
* [xiami] Override _download_webpage_handle instead of _download_webpage
* [yandexmusic] Override _download_webpage_handle instead of _download_webpage
* [youtube] Correctly disable polymer on all requests (#16323, #16326)
* [generic] Prefer enclosures over links in RSS feeds (#16189)
+ [redditr] Add support for old.reddit.com URLs (#16274)
* [nrktv] Update API host (#16324)
+ [imdb] Extract all formats (#16249)
+ [vimeo] Extract JSON-LD (#16295)
* [funk:channel] Improve extraction (#16285)

5 files changed, 27 insertions, 22 deletions

diff --git a/net/youtube-dl/MESSAGE b/net/youtube-dl/MESSAGE
index aa5d91a5a50..c6fcf1485e7 100644
--- a/net/youtube-dl/MESSAGE
+++ b/net/youtube-dl/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2016/03/11 18:39:05 leot Exp $
+$NetBSD: MESSAGE,v 1.2 2018/05/06 10:22:59 leot Exp $
 
 youtube-dl works fine for most supported sites.
 
-For some extractors youtube-dl also needs
-multimedia/{ffmpeg,ffmpeg2,ffmpeg3}, net/rtmpdump and multimedia/mplayer or
-multimedia/mpv. All these packages are not automatically installed and it
-is needed to manually install them if required.
+For some extractors youtube-dl also needs multimedia/ffmpeg[234],
+net/rtmpdump and multimedia/mplayer or multimedia/mpv.
+All these packages are not automatically installed and it is needed to
+manually install them if required.
 ===========================================================================
diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile
index e93c1352587..b822e653be1 100644
--- a/net/youtube-dl/Makefile
+++ b/net/youtube-dl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.135 2018/04/25 15:42:12 leot Exp $
+# $NetBSD: Makefile,v 1.136 2018/05/06 10:22:59 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.04.25
+VERSION_DATE=	2018.05.01
 DISTNAME=	youtube-dl-${VERSION_DATE}
 PKGNAME=	${DISTNAME:S/.//:S/.//}
 CATEGORIES=	net
diff --git a/net/youtube-dl/PLIST b/net/youtube-dl/PLIST
index 2881304288b..72819580459 100644
--- a/net/youtube-dl/PLIST
+++ b/net/youtube-dl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.61 2018/04/25 15:42:12 leot Exp $
+@comment $NetBSD: PLIST,v 1.62 2018/05/06 10:22:59 leot Exp $
 bin/youtube-dl
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -2318,6 +2318,9 @@ ${PYSITELIB}/youtube_dl/extractor/zapiks.pyo
 ${PYSITELIB}/youtube_dl/extractor/zaq1.py
 ${PYSITELIB}/youtube_dl/extractor/zaq1.pyc
 ${PYSITELIB}/youtube_dl/extractor/zaq1.pyo
+${PYSITELIB}/youtube_dl/extractor/zattoo.py
+${PYSITELIB}/youtube_dl/extractor/zattoo.pyc
+${PYSITELIB}/youtube_dl/extractor/zattoo.pyo
 ${PYSITELIB}/youtube_dl/extractor/zdf.py
 ${PYSITELIB}/youtube_dl/extractor/zdf.pyc
 ${PYSITELIB}/youtube_dl/extractor/zdf.pyo
diff --git a/net/youtube-dl/distinfo b/net/youtube-dl/distinfo
index 6ee3dc29c16..6ee797e79f3 100644
--- a/net/youtube-dl/distinfo
+++ b/net/youtube-dl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.120 2018/04/25 15:42:12 leot Exp $
+$NetBSD: distinfo,v 1.121 2018/05/06 10:22:59 leot Exp $
 
-SHA1 (youtube-dl-2018.04.25.tar.gz) = 46547d9222ce02f6532e27119f7eec3a89f0035e
-RMD160 (youtube-dl-2018.04.25.tar.gz) = dd811d536fad95fe1ea2cc4a6a8e183b687eb406
-SHA512 (youtube-dl-2018.04.25.tar.gz) = 89eda20c45575bbf894138b2fd41e38abf3cc21504fe141754544c436bf6030fa94a1496abf6b8c4bfdc77bdf1c8c1d320bf0f1a0ecc2d007409ef9421922c15
-Size (youtube-dl-2018.04.25.tar.gz) = 2947762 bytes
+SHA1 (youtube-dl-2018.05.01.tar.gz) = ca284de14bedac1df75509368124e749f1124aea
+RMD160 (youtube-dl-2018.05.01.tar.gz) = ffe46e4159117117737232df1056842ca67cc7d2
+SHA512 (youtube-dl-2018.05.01.tar.gz) = 656a15a65d05bd59b188e95126325f9391800adb4b30a858549f190ab4f8b188b6e495456ebdde58c0997b0723e6effd4181183b9afbac11f7799171c4e3875d
+Size (youtube-dl-2018.05.01.tar.gz) = 2956847 bytes
 SHA1 (patch-setup.py) = a67074ae7cfe5e77847c2f610337ea553eddb69b
-SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 6833121cb60d3affbdccab6901fb5563accb119a
+SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 710c3c2a78f9b33a32fd92a1d7f1d2b46805635b
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 c6fafa97263..5e8c3af72de 100644
--- a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
+++ b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
@@ -1,6 +1,8 @@
-$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.2 2018/04/25 15:42:12 leot Exp $
+$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.3 2018/05/06 10:22:59 leot Exp $
 
-Also look and use ffmpeg[23] if possible.
+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
@@ -9,7 +11,7 @@ Also look and use ffmpeg[23] if possible.
  
      def _determine_executables(self):
 -        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
-+        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe3', 'ffprobe2']
++        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2']
          prefer_ffmpeg = False
  
          self.basename = None
@@ -18,7 +20,7 @@ Also look and use ffmpeg[23] if possible.
                          return None
                      location = os.path.dirname(os.path.abspath(location))
 -                    if basename in ('ffmpeg', 'ffprobe'):
-+                    if basename in ('ffmpeg', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe3', 'ffprobe2'):
++                    if basename in ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2'):
                          prefer_ffmpeg = True
  
                  self._paths = dict(
@@ -27,10 +29,10 @@ Also look and use ffmpeg[23] if possible.
  
          if prefer_ffmpeg:
 -            prefs = ('ffmpeg', 'avconv')
-+            prefs = ('ffmpeg', 'ffmpeg3', 'ffmpeg2', 'avconv')
++            prefs = ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'avconv')
          else:
 -            prefs = ('avconv', 'ffmpeg')
-+            prefs = ('avconv', 'ffmpeg', 'ffmpeg3', 'ffmpeg2')
++            prefs = ('avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2')
          for p in prefs:
              if self._versions[p]:
                  self.basename = p
@@ -38,10 +40,10 @@ Also look and use ffmpeg[23] if possible.
  
          if prefer_ffmpeg:
 -            prefs = ('ffprobe', 'avprobe')
-+            prefs = ('ffprobe', 'ffprobe3', 'ffprobe2', 'avprobe')
++            prefs = ('ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2', 'avprobe')
          else:
 -            prefs = ('avprobe', 'ffprobe')
-+            prefs = ('avprobe', 'ffprobe', 'ffprobe3', 'ffprobe2')
++            prefs = ('avprobe', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2')
          for p in prefs:
              if self._versions[p]:
                  self.probe_basename = p