Attachment #219080 for bug #250608




# $FreeBSD$

PORTNAME=	youtube_dlc
DISTVERSION=	2020.10.24-6
CATEGORIES=	www

# Implicit approval to commit trivial version updates.
MAINTAINER=	daniel.engberg.lists@pyret.net
COMMENT=	Program for downloading videos from various streaming services

LICENSE=	UNLICENSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		gmake python shebangfix
SHEBANG_GLOB=	devscripts/*.py
USE_GITHUB=	yes
GH_ACCOUNT=	blackjack4494
GH_PROJECT=	yt-dlc

MAKE_ARGS=	PYTHON=${PYTHON_CMD}
NO_ARCH=	yes

OPTIONS_DEFINE=		FFMPEG MANPAGES RTMPDUMP SYMLINK
OPTIONS_DEFAULT=	RTMPDUMP
OPTIONS_SUB=	yes

RTMPDUMP_DESC=	Use rtmpdump to download rtmp video streams
SYMLINK_DESC=	Install youtube-dl symbolic link for executable

FFMPEG_RUN_DEPENDS=	ffprobe:multimedia/ffmpeg
RTMPDUMP_RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump

MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc

post-patch-MANPAGES-on:
	@${PATCH} -d ${WRKSRC} -p0 < ${PATCHDIR}/extrapatch-manpages

post-install-SYMLINK-on:
	@${RLN} ${STAGEDIR}${PREFIX}/bin/youtube-dlc ${STAGEDIR}${PREFIX}/bin/youtube-dl

.include <bsd.port.mk>

Added Link Here

(-)b/www/youtube_dlc/distinfo (+3 lines)
1	TIMESTAMP = 1603544255
2	SHA256 (blackjack4494-yt-dlc-2020.10.24-6_GH0.tar.gz) = 252cc51baca7ceba21d0f5673a6ba72b058c8b6acf78c22db6509bac9760bae5
3	SIZE (blackjack4494-yt-dlc-2020.10.24-6_GH0.tar.gz) = 1492059




--- Makefile.orig	2020-10-25 01:01:48 UTC
+++ Makefile
@@ -1,4 +1,4 @@
-all: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
+all: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
 
 clean:
 	rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
@@ -20,8 +20,8 @@ MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d
 install: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
 	install -d $(DESTDIR)$(BINDIR)
 	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
-#	install -d $(DESTDIR)$(MANDIR)/man1
-#	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
+	install -d $(DESTDIR)$(MANDIR)/man1
+	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
 	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
 	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc.sh
 	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
@@ -91,10 +91,10 @@ supportedsites:
 #README.txt: README.md
 #	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-#youtube-dlc.1: README.md
-#	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
-#	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
-#	rm -f youtube-dlc.1.temp.md
+youtube-dlc.1: README.md
+	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
+	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
+	rm -f youtube-dlc.1.temp.md
 
 youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
 	$(PYTHON) devscripts/bash-completion.py




--- Makefile.orig	2020-10-24 05:32:48 UTC
+++ Makefile
@@ -1,4 +1,4 @@
-all: youtube-dlc README.md CONTRIBUTING.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
+all: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
 
 clean:
 	rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
@@ -12,22 +12,22 @@ SHAREDIR ?= $(PREFIX)/share
 PYTHON ?= /usr/bin/env python
 
 # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
-SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
+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)
 
-install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
+install: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
 	install -d $(DESTDIR)$(BINDIR)
 	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
-	install -d $(DESTDIR)$(MANDIR)/man1
-	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
+#	install -d $(DESTDIR)$(MANDIR)/man1
+#	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
 	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
-	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
+	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc.sh
 	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
 	install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc
-	install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
-	install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish
+	install -d $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d
+	install -m 644 youtube-dlc.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/youtube-dlc.fish
 
 codetest:
 	flake8 .
@@ -65,7 +65,7 @@ youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
 	done
 	touch -t 200001010101 zip/youtube_dlc/*.py zip/youtube_dlc/*/*.py
 	mv zip/youtube_dlc/__main__.py zip/
-	cd zip ; zip -q ../youtube-dlc youtube_dlc/*.py youtube_dlc/*/*.py __main__.py
+	cd zip ; bsdtar -a -cf ../youtube-dlc.zip youtube_dlc/*.py youtube_dlc/*/*.py __main__.py
 	rm -rf zip
 	echo '#!$(PYTHON)' > youtube-dlc
 	cat youtube-dlc.zip >> youtube-dlc
@@ -75,8 +75,8 @@ youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
 README.md: youtube_dlc/*.py youtube_dlc/*/*.py
 	COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.py
 
-CONTRIBUTING.md: README.md
-	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
+#CONTRIBUTING.md: README.md
+#	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
 
 issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dlc/version.py
 	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
@@ -88,13 +88,13 @@ issuetemplates: devscripts/make_issue_template.py .git
 supportedsites:
 	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
 
-README.txt: README.md
-	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
+#README.txt: README.md
+#	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
-youtube-dlc.1: README.md
-	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
-	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
-	rm -f youtube-dlc.1.temp.md
+#youtube-dlc.1: README.md
+#	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
+#	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
+#	rm -f youtube-dlc.1.temp.md
 
 youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
 	$(PYTHON) devscripts/bash-completion.py




--- youtube_dlc/__init__.py.orig	2020-10-24 05:32:48 UTC
+++ youtube_dlc/__init__.py
@@ -36,7 +36,6 @@ from .utils import (
     write_string,
     render_table,
 )
-from .update import update_self
 from .downloader import (
     FileDownloader,
 )
@@ -452,17 +451,13 @@ def _real_main(argv=None):
     }
 
     with YoutubeDL(ydl_opts) as ydl:
-        # Update version
-        if opts.update_self:
-            update_self(ydl.to_screen, opts.verbose, ydl._opener)
-
         # Remove cache dir
         if opts.rm_cachedir:
             ydl.cache.remove()
 
         # Maybe do nothing
         if (len(all_urls) < 1) and (opts.load_info_filename is None):
-            if opts.update_self or opts.rm_cachedir:
+            if opts.rm_cachedir:
                 sys.exit()
 
             ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)




--- youtube_dlc/options.py.orig	2020-10-24 05:32:48 UTC
+++ youtube_dlc/options.py
@@ -138,10 +138,6 @@ def parseOpts(overrideArguments=None):
         action='version',
         help='Print program version and exit')
     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)')
-    general.add_option(
         '-i', '--ignore-errors',
         action='store_true', dest='ignoreerrors', default=False,
         help='Continue on download errors, for example to skip unavailable videos in a playlist')

Added Link Here

(-)b/www/youtube_dlc/pkg-descr (+5 lines)
1	youtube-dlc is an active fork of youtube-dl with several enhancements.
2	It is a command-line program for downloading videos from YouTube.com and
3	other video streaming services.
4
5	WWW: https://github.com/blackjack4494/yt-dlc/

Added Link Here

(-)b/www/youtube_dlc/pkg-message (+8 lines)
1	[
2	{ type: install
3	message: <<EOM
4	If you want to use mp3 audio conversion please make sure multimedia/ffmpeg is
5	built with the "LAME" option enabled.
6	EOM
7	}
8	]

Added Link Here

(-)b/www/youtube_dlc/pkg-plist (-1 / +6 lines)
0	-	1	%%SYMLINK%%bin/youtube-dl
		2	bin/youtube-dlc
		3	etc/bash_completion.d/youtube-dlc.sh
		4	%%MANPAGES%%man/man1/youtube-dlc.1.gz
		5	share/fish/vendor_completions.d/youtube-dlc.fish
		6	share/zsh/site-functions/_youtube-dlc

Return to bug 250608

Added Link Here

(-)b/www/youtube_dlc/Makefile (+41 lines)
1	# $FreeBSD$
2
3	PORTNAME= youtube_dlc
4	DISTVERSION= 2020.10.24-6
5	CATEGORIES= www
6
7	# Implicit approval to commit trivial version updates.
8	MAINTAINER= daniel.engberg.lists@pyret.net
9	COMMENT= Program for downloading videos from various streaming services
10
11	LICENSE= UNLICENSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE
13
14	USES= gmake python shebangfix
15	SHEBANG_GLOB= devscripts/*.py
16	USE_GITHUB= yes
17	GH_ACCOUNT= blackjack4494
18	GH_PROJECT= yt-dlc
19
20	MAKE_ARGS= PYTHON=${PYTHON_CMD}
21	NO_ARCH= yes
22
23	OPTIONS_DEFINE= FFMPEG MANPAGES RTMPDUMP SYMLINK
24	OPTIONS_DEFAULT= RTMPDUMP
25	OPTIONS_SUB= yes
26
27	RTMPDUMP_DESC= Use rtmpdump to download rtmp video streams
28	SYMLINK_DESC= Install youtube-dl symbolic link for executable
29
30	FFMPEG_RUN_DEPENDS= ffprobe:multimedia/ffmpeg
31	RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump
32
33	MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc
34
35	post-patch-MANPAGES-on:
36	@${PATCH} -d ${WRKSRC} -p0 < ${PATCHDIR}/extrapatch-manpages
37
38	post-install-SYMLINK-on:
39	@${RLN} ${STAGEDIR}${PREFIX}/bin/youtube-dlc ${STAGEDIR}${PREFIX}/bin/youtube-dl
40
41	.include <bsd.port.mk>

Added Link Here

(-)b/www/youtube_dlc/files/extrapatch-manpages (+34 lines)
1	--- Makefile.orig 2020-10-25 01:01:48 UTC
2	+++ Makefile
3	@@ -1,4 +1,4 @@
4	-all: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
5	+all: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
6
7	clean:
8	rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py .dump .part* .ytdl .info.json .mp4 .m4a .flv .mp3 .avi .mkv .webm .3gp .wav .ape .swf .jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
9	@@ -20,8 +20,8 @@ MARKDOWN = $(shell if [ `pandoc -v \| head -n1 \| cut -d
10	install: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
11	install -d $(DESTDIR)$(BINDIR)
12	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
13	-# install -d $(DESTDIR)$(MANDIR)/man1
14	-# install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
15	+ install -d $(DESTDIR)$(MANDIR)/man1
16	+ install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
17	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
18	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc.sh
19	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
20	@@ -91,10 +91,10 @@ supportedsites:
21	#README.txt: README.md
22	# pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
23
24	-#youtube-dlc.1: README.md
25	-# $(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
26	-# pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
27	-# rm -f youtube-dlc.1.temp.md
28	+youtube-dlc.1: README.md
29	+ $(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
30	+ pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
31	+ rm -f youtube-dlc.1.temp.md
32
33	youtube-dlc.bash-completion: youtube_dlc/.py youtube_dlc//*.py devscripts/bash-completion.in
34	$(PYTHON) devscripts/bash-completion.py

Added Link Here

(-)b/www/youtube_dlc/files/patch-Makefile (+78 lines)
1	--- Makefile.orig 2020-10-24 05:32:48 UTC
2	+++ Makefile
3	@@ -1,4 +1,4 @@
4	-all: youtube-dlc README.md CONTRIBUTING.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
5	+all: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites
6
7	clean:
8	rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py .dump .part* .ytdl .info.json .mp4 .m4a .flv .mp3 .avi .mkv .webm .3gp .wav .ape .swf .jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe
9	@@ -12,22 +12,22 @@ SHAREDIR ?= $(PREFIX)/share
10	PYTHON ?= /usr/bin/env python
11
12	# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
13	-SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
14	+SYSCONFDIR ?= $(PREFIX)/etc
15
16	# set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
17	MARKDOWN = $(shell if [ `pandoc -v \| head -n1 \| cut -d" " -f2 \| head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
18
19	-install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
20	+install: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
21	install -d $(DESTDIR)$(BINDIR)
22	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
23	- install -d $(DESTDIR)$(MANDIR)/man1
24	- install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
25	+# install -d $(DESTDIR)$(MANDIR)/man1
26	+# install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
27	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
28	- install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
29	+ install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc.sh
30	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
31	install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc
32	- install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
33	- install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish
34	+ install -d $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d
35	+ install -m 644 youtube-dlc.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/youtube-dlc.fish
36
37	codetest:
38	flake8 .
39	@@ -65,7 +65,7 @@ youtube-dlc: youtube_dlc/.py youtube_dlc//*.py
40	done
41	touch -t 200001010101 zip/youtube_dlc/.py zip/youtube_dlc//*.py
42	mv zip/youtube_dlc/__main__.py zip/
43	- cd zip ; zip -q ../youtube-dlc youtube_dlc/.py youtube_dlc//*.py __main__.py
44	+ cd zip ; bsdtar -a -cf ../youtube-dlc.zip youtube_dlc/.py youtube_dlc//*.py __main__.py
45	rm -rf zip
46	echo '#!$(PYTHON)' > youtube-dlc
47	cat youtube-dlc.zip >> youtube-dlc
48	@@ -75,8 +75,8 @@ youtube-dlc: youtube_dlc/.py youtube_dlc//*.py
49	README.md: youtube_dlc/.py youtube_dlc//*.py
50	COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help \| $(PYTHON) devscripts/make_readme.py
51
52	-CONTRIBUTING.md: README.md
53	- $(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
54	+#CONTRIBUTING.md: README.md
55	+# $(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
56
57	issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dlc/version.py
58	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
59	@@ -88,13 +88,13 @@ issuetemplates: devscripts/make_issue_template.py .git
60	supportedsites:
61	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
62
63	-README.txt: README.md
64	- pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
65	+#README.txt: README.md
66	+# pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
67
68	-youtube-dlc.1: README.md
69	- $(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
70	- pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
71	- rm -f youtube-dlc.1.temp.md
72	+#youtube-dlc.1: README.md
73	+# $(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
74	+# pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
75	+# rm -f youtube-dlc.1.temp.md
76
77	youtube-dlc.bash-completion: youtube_dlc/.py youtube_dlc//*.py devscripts/bash-completion.in
78	$(PYTHON) devscripts/bash-completion.py

Added Link Here

(-)b/www/youtube_dlc/files/patch-youtube__dlc_____init____.py (+29 lines)
1	--- youtube_dlc/__init__.py.orig 2020-10-24 05:32:48 UTC
2	+++ youtube_dlc/__init__.py
3	@@ -36,7 +36,6 @@ from .utils import (
4	write_string,
5	render_table,
6	)
7	-from .update import update_self
8	from .downloader import (
9	FileDownloader,
10	)
11	@@ -452,17 +451,13 @@ def _real_main(argv=None):
12	}
13
14	with YoutubeDL(ydl_opts) as ydl:
15	- # Update version
16	- if opts.update_self:
17	- update_self(ydl.to_screen, opts.verbose, ydl._opener)
18	-
19	# Remove cache dir
20	if opts.rm_cachedir:
21	ydl.cache.remove()
22
23	# Maybe do nothing
24	if (len(all_urls) < 1) and (opts.load_info_filename is None):
25	- if opts.update_self or opts.rm_cachedir:
26	+ if opts.rm_cachedir:
27	sys.exit()
28
29	ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)

Added Link Here

(-)b/www/youtube_dlc/files/patch-youtube__dlc_options.py (+13 lines)
1	--- youtube_dlc/options.py.orig 2020-10-24 05:32:48 UTC
2	+++ youtube_dlc/options.py
3	@@ -138,10 +138,6 @@ def parseOpts(overrideArguments=None):
4	action='version',
5	help='Print program version and exit')
6	general.add_option(
7	- '-U', '--update',
8	- action='store_true', dest='update_self',
9	- help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
10	- general.add_option(
11	'-i', '--ignore-errors',
12	action='store_true', dest='ignoreerrors', default=False,
13	help='Continue on download errors, for example to skip unavailable videos in a playlist')