Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/net/youtube-dl/distinfo,v retrieving revision 1.68 diff -u -p -r1.68 distinfo --- distinfo 25 Feb 2016 19:07:59 -0000 1.68 +++ distinfo 5 Mar 2016 17:46:11 -0000 @@ -5,3 +5,4 @@ RMD160 (youtube-dl-2016.02.22.tar.gz) = SHA512 (youtube-dl-2016.02.22.tar.gz) = 9b1e5bf5cfe8aef0dd55093c046669358b7efc01d0a89abd8a75a4f3dd132dec90b74f1e7bddadf22d4ea21a91168f4962752739c9acd9c232c6757c2307054c Size (youtube-dl-2016.02.22.tar.gz) = 1971515 bytes SHA1 (patch-setup.py) = 31521d16e718cc8fc048acb695639f70de35f6f4 +SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 6c220e67ab138d1c00aa4f2bc02ac84548af7c30 Index: patches/patch-youtube__dl_postprocessor_ffmpeg.py =================================================================== RCS file: patches/patch-youtube__dl_postprocessor_ffmpeg.py diff -N patches/patch-youtube__dl_postprocessor_ffmpeg.py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-youtube__dl_postprocessor_ffmpeg.py 5 Mar 2016 17:46:11 -0000 @@ -0,0 +1,47 @@ +$NetBSD$ + +Also look and use ffmpeg[23] if possible. + +--- youtube_dl/postprocessor/ffmpeg.py.orig 2016-02-09 11:57:41.000000000 +0000 ++++ youtube_dl/postprocessor/ffmpeg.py +@@ -51,7 +51,7 @@ class FFmpegPostProcessor(PostProcessor) + return FFmpegPostProcessor(downloader)._versions + + def _determine_executables(self): +- programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe'] ++ programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg2', 'ffmpeg3', 'ffprobe', 'ffprobe2', 'ffprobe3'] + prefer_ffmpeg = False + + self.basename = None +@@ -79,7 +79,7 @@ class FFmpegPostProcessor(PostProcessor) + self._versions = {} + return None + location = os.path.dirname(os.path.abspath(location)) +- if basename in ('ffmpeg', 'ffprobe'): ++ if basename in ('ffmpeg', 'ffmpeg2', 'ffmpeg3', 'ffprobe', 'ffprobe2', 'ffprobe3'): + prefer_ffmpeg = True + + self._paths = dict( +@@ -93,18 +93,18 @@ class FFmpegPostProcessor(PostProcessor) + self._paths = dict((p, p) for p in programs) + + if prefer_ffmpeg: +- prefs = ('ffmpeg', 'avconv') ++ prefs = ('ffmpeg', 'ffmpeg2', 'ffmpeg3', 'avconv') + else: +- prefs = ('avconv', 'ffmpeg') ++ prefs = ('avconv', 'ffmpeg', 'ffmpeg2', 'ffmpeg3') + for p in prefs: + if self._versions[p]: + self.basename = p + break + + if prefer_ffmpeg: +- prefs = ('ffprobe', 'avprobe') ++ prefs = ('ffprobe', 'ffprobe2', 'ffprobe3', 'avprobe') + else: +- prefs = ('avprobe', 'ffprobe') ++ prefs = ('avprobe', 'ffprobe', 'ffprobe2', 'ffprobe3') + for p in prefs: + if self._versions[p]: + self.probe_basename = p