CVS commit: pkgsrc/net/yt-dlp

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jan 31 23:27:20 UTC 2022

Modified Files:
        pkgsrc/net/yt-dlp: MESSAGE Makefile distinfo
        pkgsrc/net/yt-dlp/patches: patch-yt__dlp_postprocessor_ffmpeg.py

Log Message:
yt-dlp: Add ffmpeg5 as supported ffmpeg

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/yt-dlp/MESSAGE
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/yt-dlp/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/yt-dlp/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/yt-dlp/patches/patch-yt__dlp_postprocessor_ffmpeg.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/yt-dlp/MESSAGE
diff -u pkgsrc/net/yt-dlp/MESSAGE:1.1 pkgsrc/net/yt-dlp/MESSAGE:1.2
--- pkgsrc/net/yt-dlp/MESSAGE:1.1       Mon Nov  8 10:28:03 2021
+++ pkgsrc/net/yt-dlp/MESSAGE   Mon Jan 31 23:27:20 2022
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2021/11/08 10:28:03 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2022/01/31 23:27:20 ryoon Exp $
 
-yt-dlp works fine for most supported sites. At least multimedia/ffmpeg[234]
+yt-dlp works fine for most supported sites. At least multimedia/ffmpeg[2345
 is highly recommended for some extractors, as well as net/rtmpdump and
 multimedia/mplayer or multimedia/mpv.
 You also want to install audio/py-mutagen, security/py-cryptodome,

Index: pkgsrc/net/yt-dlp/Makefile
diff -u pkgsrc/net/yt-dlp/Makefile:1.9 pkgsrc/net/yt-dlp/Makefile:1.10
--- pkgsrc/net/yt-dlp/Makefile:1.9      Sat Jan 22 13:48:34 2022
+++ pkgsrc/net/yt-dlp/Makefile  Mon Jan 31 23:27:20 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2022/01/22 13:48:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/31 23:27:20 ryoon Exp $
 
 DISTNAME=      yt-dlp-2022.1.21
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_PYPI:=y/yt-dlp/}
 # \TODO: create symlink, as mpv makes use of youtube-dl?

Index: pkgsrc/net/yt-dlp/distinfo
diff -u pkgsrc/net/yt-dlp/distinfo:1.7 pkgsrc/net/yt-dlp/distinfo:1.8
--- pkgsrc/net/yt-dlp/distinfo:1.7      Sat Jan 22 13:48:34 2022
+++ pkgsrc/net/yt-dlp/distinfo  Mon Jan 31 23:27:20 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2022/01/22 13:48:34 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2022/01/31 23:27:20 ryoon Exp $
 
 BLAKE2s (yt-dlp-2022.1.21.tar.gz) = dcc461bfe4a540b0652ec975aaef4bfc69aa369d3bd07442acc0c65ca5aaa01c
 SHA512 (yt-dlp-2022.1.21.tar.gz) = 5844d49dbf50842d4d51dbb00c16efea816322888d16a8dbce16f976f0dd1625ec8243fcdc07e721180a2f02cf14ebaa0d83a1437e331b4aa68c404db3f1e9f4
 Size (yt-dlp-2022.1.21.tar.gz) = 2160713 bytes
 SHA1 (patch-setup.py) = 7f3394a2b9737424e4c47c0f31488a8b2fef0bcb
-SHA1 (patch-yt__dlp_postprocessor_ffmpeg.py) = ccc67f26bc7ac2e6d0de9be38428134ffc9d2efd
+SHA1 (patch-yt__dlp_postprocessor_ffmpeg.py) = ae4eefe477a1517d753ed49c27e37f691c2fc59e

Index: pkgsrc/net/yt-dlp/patches/patch-yt__dlp_postprocessor_ffmpeg.py
diff -u pkgsrc/net/yt-dlp/patches/patch-yt__dlp_postprocessor_ffmpeg.py:1.3 pkgsrc/net/yt-dlp/patches/patch-yt__dlp_postprocessor_ffmpeg.py:1.4
--- pkgsrc/net/yt-dlp/patches/patch-yt__dlp_postprocessor_ffmpeg.py:1.3 Sat Jan 22 13:48:34 2022
+++ pkgsrc/net/yt-dlp/patches/patch-yt__dlp_postprocessor_ffmpeg.py     Mon Jan 31 23:27:20 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-yt__dlp_postprocessor_ffmpeg.py,v 1.3 2022/01/22 13:48:34 ryoon Exp $
+$NetBSD: patch-yt__dlp_postprocessor_ffmpeg.py,v 1.4 2022/01/31 23:27:20 ryoon Exp $
 
 Also look and use ffmpeg[234]/ffprobe[234] if possible, preferring
 the unversioned one (i.e. selected via alternatives framework)
@@ -12,7 +12,7 @@ From: pkgsrc/net/youtube-dl
  
      def _determine_executables(self):
 -        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
-+        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2']
++        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg5', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe5', 'ffprobe4', 'ffprobe3', 'ffprobe2']
  
          def get_ffmpeg_version(path, prog):
              out = _get_exe_version_output(path, ['-bsfs'])
@@ -21,7 +21,7 @@ From: pkgsrc/net/youtube-dl
                  basename = next((p for p in programs if basename.startswith(p)), 'ffmpeg')
                  dirname = os.path.dirname(os.path.abspath(location))
 -                if basename in ('ffmpeg', 'ffprobe'):
-+                if basename in ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2'):
++                if basename in ('ffmpeg', 'ffmpeg5', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe5', 'ffprobe4', 'ffprobe3', 'ffprobe2'):
                      prefer_ffmpeg = True
  
              self._paths = dict(
@@ -30,10 +30,10 @@ From: pkgsrc/net/youtube-dl
  
          if prefer_ffmpeg is False:
 -            prefs = ('avconv', 'ffmpeg')
-+            prefs = ('avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2')
++            prefs = ('avconv', 'ffmpeg', 'ffmpeg5', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2')
          else:
 -            prefs = ('ffmpeg', 'avconv')
-+            prefs = ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'avconv')
++            prefs = ('ffmpeg', 'ffmpeg5', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'avconv')
          for p in prefs:
              if self._versions[p]:
                  self.basename = p
@@ -41,10 +41,10 @@ From: pkgsrc/net/youtube-dl
  
          if prefer_ffmpeg is False:
 -            prefs = ('avprobe', 'ffprobe')
-+            prefs = ('avprobe', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2')
++            prefs = ('avprobe', 'ffprobe', 'ffprobe5', 'ffprobe4', 'ffprobe3', 'ffprobe2')
          else:
 -            prefs = ('ffprobe', 'avprobe')
-+            prefs = ('ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2', 'avprobe')
++            prefs = ('ffprobe', 'ffprobe5', 'ffprobe4', 'ffprobe3', 'ffprobe2', 'avprobe')
          for p in prefs:
              if self._versions[p]:
                  self.probe_basename = p