www/yt-dlp: Update 2022.04.08 -> 2022.05.18

3 files changed, 20 insertions, 28 deletions

diff --git a/www/yt-dlp/files/patch-Makefile b/www/yt-dlp/files/patch-Makefile
index 1baed35e2811..6040544260bd 100644
--- a/www/yt-dlp/files/patch-Makefile
+++ b/www/yt-dlp/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2022-01-21 11:57:11 UTC
+--- Makefile.orig	2022-05-18 03:37:32 UTC
 +++ Makefile
 @@ -1,15 +1,15 @@
 -all: lazy-extractors yt-dlp doc pypi-files
@@ -20,7 +20,7 @@
  
  .PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites
  
-@@ -37,17 +37,23 @@ SHAREDIR ?= $(PREFIX)/share
+@@ -39,16 +39,17 @@ SHAREDIR ?= $(PREFIX)/share
  PYTHON ?= /usr/bin/env python3
  
  # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
@@ -29,32 +29,24 @@
 +SYSCONFDIR = $(PREFIX)/etc
  
  # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
- MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
+ MARKDOWN = $(shell if [ "$(pandoc -v | head -n1 | cut -d" " -f2 | head -c1)" = "2" ]; then echo markdown-smart; else echo markdown; fi)
  
 -install: lazy-extractors yt-dlp yt-dlp.1 completions
 +install: lazy-extractors yt-dlp completions
- 	install -Dm755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp
--	install -Dm644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
--	install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
-+#	install -Dm644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
-+#	install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
-+	mkdir -p  $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
-+	install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/yt-dlp
-+	mkdir -p $(DESTDIR)$(SHAREDIR)/zsh/site-functions
- 	install -Dm644 completions/zsh/_yt-dlp $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp
--	install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
-+#	install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish
-+	mkdir -p $(DESTDIR)$(SYSCONFDIR)/fish/completions
-+	install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/yt-dlp.fish
- 
- codetest:
- 	flake8 .
-@@ -67,37 +73,38 @@ yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	install -m755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1
+-	install -m644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
++	#install -m644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1
+ 	mkdir -p $(DESTDIR)$(SHAREDIR)/bash-completion/completions
+ 	install -m644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp
+ 	mkdir -p $(DESTDIR)$(SHAREDIR)/zsh/site-functions
+@@ -84,37 +85,38 @@ yt-dlp: yt_dlp/*.py yt_dlp/*/*.py
  	done
- 	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py
+ 	touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py zip/yt_dlp/*/*/*.py
  	mv zip/yt_dlp/__main__.py zip/
--	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py
-+#	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py
+-	cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py yt_dlp/*/*/*.py __main__.py
++	#cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py yt_dlp/*/*/*.py __main__.py
 +	cd zip ; bsdtar -a -cf ../yt-dlp.zip yt_dlp/*.py yt_dlp/*/*.py __main__.py
  	rm -rf zip
  	echo '#!$(PYTHON)' > yt-dlp
diff --git a/www/yt-dlp/files/patch-yt__dlp_cookies.py b/www/yt-dlp/files/patch-yt__dlp_cookies.py
index b9562230e38b..e298f7b0c119 100644
--- a/www/yt-dlp/files/patch-yt__dlp_cookies.py
+++ b/www/yt-dlp/files/patch-yt__dlp_cookies.py
@@ -1,6 +1,6 @@
---- yt_dlp/cookies.py.orig	2022-05-14 11:34:22.365323000 -0400
-+++ yt_dlp/cookies.py	2022-05-14 11:34:52.544340000 -0400
-@@ -140,7 +140,7 @@
+--- yt_dlp/cookies.py.orig	2022-05-18 03:37:32 UTC
++++ yt_dlp/cookies.py
+@@ -156,7 +156,7 @@ def _extract_firefox_cookies(profile, logger):
  
  
  def _firefox_browser_dir():
@@ -8,4 +8,4 @@
 +    if sys.platform in ('linux', 'linux2','freebsd13','freebsd14'):
          return os.path.expanduser('~/.mozilla/firefox')
      elif sys.platform == 'win32':
-         return os.path.expandvars(r'%APPDATA%\Mozilla\Firefox\Profiles')
+         return os.path.expandvars(R'%APPDATA%\Mozilla\Firefox\Profiles')
diff --git a/www/yt-dlp/files/patch-yt__dlp_options.py b/www/yt-dlp/files/patch-yt__dlp_options.py
index 00a8b6fe81f6..7adce2d76943 100644
--- a/www/yt-dlp/files/patch-yt__dlp_options.py
+++ b/www/yt-dlp/files/patch-yt__dlp_options.py
@@ -6,7 +6,7 @@
      general.add_option(
 -        '-U', '--update',
 -        action='store_true', dest='update_self',
--        help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
+-        help='Update this program to latest version')
 -    general.add_option(
          '-i', '--ignore-errors',
          action='store_true', dest='ignoreerrors',