summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-03-03 17:44:40 -0600
committerMax Rees <maxcrees@me.com>2020-03-17 00:32:04 -0500
commit715edb8c773882b2ea2445c53185b56f542df6cc (patch)
tree8709371b416f7f661db24637f7793335ab607636
parente8e00a3795ef76efadfdd9cf171f037d6f9ebd7e (diff)
downloadpackages-715edb8c773882b2ea2445c53185b56f542df6cc.tar.gz
packages-715edb8c773882b2ea2445c53185b56f542df6cc.tar.bz2
packages-715edb8c773882b2ea2445c53185b56f542df6cc.tar.xz
packages-715edb8c773882b2ea2445c53185b56f542df6cc.zip
user/youtube-dl: bump to 2020.03.08
-rw-r--r--user/youtube-dl/APKBUILD9
-rw-r--r--user/youtube-dl/tumblr.patch49
2 files changed, 55 insertions, 3 deletions
diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD
index 70c5800f9..ed99fcb7b 100644
--- a/user/youtube-dl/APKBUILD
+++ b/user/youtube-dl/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=youtube-dl
-pkgver=2019.11.28
+pkgver=2020.03.08
pkgrel=0
pkgdesc="Command-line program to download videos from YouTube and many other sites"
url="https://youtube-dl.org"
@@ -16,7 +16,9 @@ subpackages="$pkgname-doc
$pkgname-zsh-completion:zshcomp
$pkgname-bash-completion:bashcomp
$pkgname-fish-completion:fishcomp"
-source="https://github.com/rg3/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/rg3/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
+ tumblr.patch
+ "
builddir="$srcdir/$pkgname"
prepare() {
@@ -64,4 +66,5 @@ fishcomp() {
"$subpkgdir/usr/share/fish/completions/"
}
-sha512sums="fd3fc9658428ecf96d681dd699db49e02f94343e5c49e370cb68a5764e8ecebc14b3ce5bc44db0a829b0d3c4fbffc96a1f8288fb24cbd21add6e9c7852b0915d youtube-dl-2019.11.28.tar.gz"
+sha512sums="09636e3ec526dbcb043cf61ed4dda5c5c00fac2ecd741bf3cb338ca8de72d1395a95a6189bccced140ca1c37eb3f693332e757ff01eb1a25279b100ccdf39b65 youtube-dl-2020.03.08.tar.gz
+5760d06e6bbc1eee2c6be2d1f580f86b3cfa5f4bc44a62fb8145ce1cd41352ecf2f65d65d79a2d7f1ec129a34c28a7ec3d0d328c907e743bfcea54c65c71285d tumblr.patch"
diff --git a/user/youtube-dl/tumblr.patch b/user/youtube-dl/tumblr.patch
new file mode 100644
index 000000000..d34a79da6
--- /dev/null
+++ b/user/youtube-dl/tumblr.patch
@@ -0,0 +1,49 @@
+From a4a199b4dcc3e778621c4268a5dba615cf6f44ba Mon Sep 17 00:00:00 2001
+From: rafinetiz <rafii.netizz@gmail.com>
+Date: Fri, 18 Oct 2019 21:17:00 +0700
+Subject: [PATCH 1/2] Fix tumblr permission denied #22755
+
+---
+ youtube_dl/extractor/tumblr.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
+index edbb0aa6944b..71ced801859e 100644
+--- a/youtube_dl/extractor/tumblr.py
++++ b/youtube_dl/extractor/tumblr.py
+@@ -165,7 +165,8 @@ def _real_extract(self, url):
+ if iframe_url is None:
+ return self.url_result(redirect_url, 'Generic')
+
+- iframe = self._download_webpage(iframe_url, video_id, 'Downloading iframe page')
++ iframe = self._download_webpage(iframe_url, video_id, 'Downloading iframe page',
++ headers={'Referer': url})
+
+ duration = None
+ sources = []
+
+From 43a19105d78c5c297d91936798d341f89919e9b1 Mon Sep 17 00:00:00 2001
+From: rafinetiz <rafii.netizz@gmail.com>
+Date: Fri, 18 Oct 2019 21:45:12 +0700
+Subject: [PATCH 2/2] Fix coding style
+
+---
+ youtube_dl/extractor/tumblr.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
+index 71ced801859e..61b0c1db65fe 100644
+--- a/youtube_dl/extractor/tumblr.py
++++ b/youtube_dl/extractor/tumblr.py
+@@ -165,7 +165,10 @@ def _real_extract(self, url):
+ if iframe_url is None:
+ return self.url_result(redirect_url, 'Generic')
+
+- iframe = self._download_webpage(iframe_url, video_id, 'Downloading iframe page',
++ iframe = self._download_webpage(
++ iframe_url,
++ video_id,
++ 'Downloading iframe page',
+ headers={'Referer': url})
+
+ duration = None