CVS commit: pkgsrc/net/youtube-dl

["John Klos" <jklos%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jklos
Date:           Wed May 11 17:58:36 UTC 2022

Modified Files:
        pkgsrc/net/youtube-dl: Makefile distinfo
        pkgsrc/net/youtube-dl/patches:
            patch-youtube__dl_postprocessor_ffmpeg.py

Log Message:
Allow youtube-dl to make use of pkgsrc ffmpeg5.


To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 pkgsrc/net/youtube-dl/Makefile
cvs rdiff -u -r1.225 -r1.226 pkgsrc/net/youtube-dl/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/net/youtube-dl/patches/patch-youtube__dl_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/youtube-dl/Makefile
diff -u pkgsrc/net/youtube-dl/Makefile:1.245 pkgsrc/net/youtube-dl/Makefile:1.246
--- pkgsrc/net/youtube-dl/Makefile:1.245        Wed Jan  5 15:41:19 2022
+++ pkgsrc/net/youtube-dl/Makefile      Wed May 11 17:58:35 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.245 2022/01/05 15:41:19 wiz Exp $
+# $NetBSD: Makefile,v 1.246 2022/05/11 17:58:35 jklos 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=  2021.12.17
 DISTNAME=      youtube-dl-${VERSION_DATE}
 PKGNAME=       ${DISTNAME:S/.//:S/.//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  https://youtube-dl.org/downloads/${VERSION_DATE}/
 

Index: pkgsrc/net/youtube-dl/distinfo
diff -u pkgsrc/net/youtube-dl/distinfo:1.225 pkgsrc/net/youtube-dl/distinfo:1.226
--- pkgsrc/net/youtube-dl/distinfo:1.225        Thu Dec 16 19:12:09 2021
+++ pkgsrc/net/youtube-dl/distinfo      Wed May 11 17:58:35 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.225 2021/12/16 19:12:09 maya Exp $
+$NetBSD: distinfo,v 1.226 2022/05/11 17:58:35 jklos Exp $
 
 BLAKE2s (youtube-dl-2021.12.17.tar.gz) = f1ac93dbf5939d0956d195ca490b9ca7247fe15115329f83e5be283b11216170
 SHA512 (youtube-dl-2021.12.17.tar.gz) = bfc8280703b08f66e1108e9ebd9ab4689f064ac7cef03bd3d1fd2bc64928570e4376e389c9bc188eafdbcd74444cfc8aeccc83ee362ad4f478910efef3573ddb
 Size (youtube-dl-2021.12.17.tar.gz) = 3332299 bytes
 SHA1 (patch-setup.py) = 56115118d5a263f3b46ff0da0b8315a1459ad7d9
 SHA1 (patch-youtube__dl_extractor_la7.py) = 6c579f96e7ace1b64ef25fe8788b40bc4e7e67dd
-SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = f96676170a448d9205d542a7def4beca615a1490
+SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 6a10c4b894eff251f81be47b393e3e432c4cecf9

Index: pkgsrc/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
diff -u pkgsrc/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py:1.5 pkgsrc/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py:1.6
--- pkgsrc/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py:1.5 Tue Jan 15 21:15:30 2019
+++ pkgsrc/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py     Wed May 11 17:58:35 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.5 2019/01/15 21:15:30 leot Exp $
+$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.6 2022/05/11 17:58:35 jklos Exp $
 
 Also look and use ffmpeg[234]/ffprobe[234] if possible, preferring
 the unversioned one (i.e. selected via alternatives framework)
@@ -11,7 +11,7 @@ or the newest one.
  
      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']
          prefer_ffmpeg = True
  
          def get_ffmpeg_version(path):
@@ -20,7 +20,7 @@ or the newest one.
                          return None
                      location = 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(
@@ -29,10 +29,10 @@ or the newest one.
  
          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', 'ffmpeg4', 'ffmpeg5', 'ffmpeg3', 'ffmpeg2', 'avconv')
          for p in prefs:
              if self._versions[p]:
                  self.basename = p
@@ -40,10 +40,10 @@ or the newest one.
  
          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