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)

1 files changed, 10 insertions, 8 deletions

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