commit: 986aa177d837eb2c7183f53c1fffed5b27c83441
parent 3f893685c1e856148df05e792548cee62997430b
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 17 Jan 2018 10:41:25 -0800
youtube-dl: Update to 2018.01.14
Diffstat:
3 files changed, 85 insertions(+), 25 deletions(-)
diff --git a/pkg/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch b/pkg/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
@@ -1,14 +1,59 @@
-From 2073548aa7dc28a77cf7db96fe084b860f30f78c Mon Sep 17 00:00:00 2001
+From f6849b11787c3518fccc4e52ea07b539fdfe3631 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 4 Jul 2016 16:14:18 -0700
Subject: [PATCH] Disable use of ctypes and dynamic loading
---
- youtube_dl/utils.py | 180 ++++------------------------------------------------
- 1 file changed, 11 insertions(+), 169 deletions(-)
+ youtube_dl/compat.py | 19 ------
+ youtube_dl/utils.py | 181 ++++-----------------------------------------------
+ 2 files changed, 11 insertions(+), 189 deletions(-)
+diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
+index 41ca9adf1..cff252b5f 100644
+--- a/youtube_dl/compat.py
++++ b/youtube_dl/compat.py
+@@ -3,7 +3,6 @@ from __future__ import unicode_literals
+
+ import binascii
+ import collections
+-import ctypes
+ import email
+ import getpass
+ import io
+@@ -2908,23 +2907,6 @@ except ImportError: # not 2.6+ or is 3.x
+ except ImportError:
+ compat_zip = zip
+
+-if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
+- # PyPy2 prior to version 5.4.0 expects byte strings as Windows function
+- # names, see the original PyPy issue [1] and the youtube-dl one [2].
+- # 1. https://bitbucket.org/pypy/pypy/issues/2360/windows-ctypescdll-typeerror-function-name
+- # 2. https://github.com/rg3/youtube-dl/pull/4392
+- def compat_ctypes_WINFUNCTYPE(*args, **kwargs):
+- real = ctypes.WINFUNCTYPE(*args, **kwargs)
+-
+- def resf(tpl, *args, **kwargs):
+- funcname, dll = tpl
+- return real((str(funcname), dll), *args, **kwargs)
+-
+- return resf
+-else:
+- def compat_ctypes_WINFUNCTYPE(*args, **kwargs):
+- return ctypes.WINFUNCTYPE(*args, **kwargs)
+-
+
+ __all__ = [
+ 'compat_HTMLParseError',
+@@ -2934,7 +2916,6 @@ __all__ = [
+ 'compat_chr',
+ 'compat_cookiejar',
+ 'compat_cookies',
+- 'compat_ctypes_WINFUNCTYPE',
+ 'compat_etree_fromstring',
+ 'compat_etree_register_namespace',
+ 'compat_expanduser',
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
-index 39860e9d1..baea0c329 100644
+index 386897a85..98d848b06 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -8,7 +8,6 @@ import binascii
@@ -19,7 +64,15 @@ index 39860e9d1..baea0c329 100644
import datetime
import email.utils
import email.header
-@@ -1304,90 +1303,11 @@ def platform_name():
+@@ -39,7 +38,6 @@ from .compat import (
+ compat_HTMLParser,
+ compat_basestring,
+ compat_chr,
+- compat_ctypes_WINFUNCTYPE,
+ compat_etree_fromstring,
+ compat_expanduser,
+ compat_html_entities,
+@@ -1307,90 +1305,11 @@ def platform_name():
return res
@@ -47,24 +100,24 @@ index 39860e9d1..baea0c329 100644
- if fileno not in WIN_OUTPUT_IDS:
- return False
-
-- GetStdHandle = ctypes.WINFUNCTYPE(
+- GetStdHandle = compat_ctypes_WINFUNCTYPE(
- ctypes.wintypes.HANDLE, ctypes.wintypes.DWORD)(
-- (b'GetStdHandle', ctypes.windll.kernel32))
+- ('GetStdHandle', ctypes.windll.kernel32))
- h = GetStdHandle(WIN_OUTPUT_IDS[fileno])
-
-- WriteConsoleW = ctypes.WINFUNCTYPE(
+- WriteConsoleW = compat_ctypes_WINFUNCTYPE(
- ctypes.wintypes.BOOL, ctypes.wintypes.HANDLE, ctypes.wintypes.LPWSTR,
- ctypes.wintypes.DWORD, ctypes.POINTER(ctypes.wintypes.DWORD),
-- ctypes.wintypes.LPVOID)((b'WriteConsoleW', ctypes.windll.kernel32))
+- ctypes.wintypes.LPVOID)(('WriteConsoleW', ctypes.windll.kernel32))
- written = ctypes.wintypes.DWORD(0)
-
-- GetFileType = ctypes.WINFUNCTYPE(ctypes.wintypes.DWORD, ctypes.wintypes.DWORD)((b'GetFileType', ctypes.windll.kernel32))
+- GetFileType = compat_ctypes_WINFUNCTYPE(ctypes.wintypes.DWORD, ctypes.wintypes.DWORD)(('GetFileType', ctypes.windll.kernel32))
- FILE_TYPE_CHAR = 0x0002
- FILE_TYPE_REMOTE = 0x8000
-- GetConsoleMode = ctypes.WINFUNCTYPE(
+- GetConsoleMode = compat_ctypes_WINFUNCTYPE(
- ctypes.wintypes.BOOL, ctypes.wintypes.HANDLE,
- ctypes.POINTER(ctypes.wintypes.DWORD))(
-- (b'GetConsoleMode', ctypes.windll.kernel32))
+- ('GetConsoleMode', ctypes.windll.kernel32))
- INVALID_HANDLE_VALUE = ctypes.wintypes.DWORD(-1).value
-
- def not_a_console(handle):
@@ -110,7 +163,7 @@ index 39860e9d1..baea0c329 100644
if ('b' in getattr(out, 'mode', '') or
sys.version_info[0] < 3): # Python 2 lies about mode of sys.stderr
byt = s.encode(encoding or preferredencoding(), 'ignore')
-@@ -1417,78 +1337,22 @@ def intlist_to_bytes(xs):
+@@ -1420,78 +1339,22 @@ def intlist_to_bytes(xs):
# Cross-platform file locking
@@ -199,7 +252,7 @@ index 39860e9d1..baea0c329 100644
class locked_file(object):
-@@ -1704,29 +1568,7 @@ def fix_xml_ampersands(xml_str):
+@@ -1707,29 +1570,7 @@ def fix_xml_ampersands(xml_str):
def setproctitle(title):
@@ -231,5 +284,5 @@ index 39860e9d1..baea0c329 100644
def remove_start(s, start):
--
-2.13.2
+2.15.1
diff --git a/pkg/youtube-dl/pylibs.txt b/pkg/youtube-dl/pylibs.txt
@@ -57,6 +57,7 @@ youtube_dl/extractor/audimedia.py
youtube_dl/extractor/audioboom.py
youtube_dl/extractor/audiomack.py
youtube_dl/extractor/awaan.py
+youtube_dl/extractor/aws.py
youtube_dl/extractor/azmedien.py
youtube_dl/extractor/baidu.py
youtube_dl/extractor/bambuser.py
@@ -122,7 +123,6 @@ youtube_dl/extractor/clyp.py
youtube_dl/extractor/cmt.py
youtube_dl/extractor/cnbc.py
youtube_dl/extractor/cnn.py
-youtube_dl/extractor/collegerama.py
youtube_dl/extractor/comcarcoff.py
youtube_dl/extractor/comedycentral.py
youtube_dl/extractor/common.py
@@ -153,6 +153,7 @@ youtube_dl/extractor/defense.py
youtube_dl/extractor/democracynow.py
youtube_dl/extractor/dfb.py
youtube_dl/extractor/dhm.py
+youtube_dl/extractor/digg.py
youtube_dl/extractor/digiteka.py
youtube_dl/extractor/discovery.py
youtube_dl/extractor/discoverygo.py
@@ -180,7 +181,7 @@ youtube_dl/extractor/ehow.py
youtube_dl/extractor/eighttracks.py
youtube_dl/extractor/einthusan.py
youtube_dl/extractor/eitb.py
-youtube_dl/extractor/ellentv.py
+youtube_dl/extractor/ellentube.py
youtube_dl/extractor/elpais.py
youtube_dl/extractor/embedly.py
youtube_dl/extractor/engadget.py
@@ -201,11 +202,10 @@ youtube_dl/extractor/faz.py
youtube_dl/extractor/fc2.py
youtube_dl/extractor/fczenit.py
youtube_dl/extractor/filmon.py
-youtube_dl/extractor/firstpost.py
+youtube_dl/extractor/filmweb.py
youtube_dl/extractor/firsttv.py
youtube_dl/extractor/fivemin.py
youtube_dl/extractor/fivetv.py
-youtube_dl/extractor/fktv.py
youtube_dl/extractor/flickr.py
youtube_dl/extractor/flipagram.py
youtube_dl/extractor/folketinget.py
@@ -230,7 +230,6 @@ youtube_dl/extractor/fusion.py
youtube_dl/extractor/fxnetworks.py
youtube_dl/extractor/gameinformer.py
youtube_dl/extractor/gameone.py
-youtube_dl/extractor/gamersyde.py
youtube_dl/extractor/gamespot.py
youtube_dl/extractor/gamestar.py
youtube_dl/extractor/gaskrank.py
@@ -282,6 +281,7 @@ youtube_dl/extractor/inc.py
youtube_dl/extractor/indavideo.py
youtube_dl/extractor/infoq.py
youtube_dl/extractor/instagram.py
+youtube_dl/extractor/internazionale.py
youtube_dl/extractor/internetvideoarchive.py
youtube_dl/extractor/iprima.py
youtube_dl/extractor/iqiyi.py
@@ -343,10 +343,12 @@ youtube_dl/extractor/makerschannel.py
youtube_dl/extractor/makertv.py
youtube_dl/extractor/mangomolo.py
youtube_dl/extractor/manyvids.py
+youtube_dl/extractor/massengeschmacktv.py
youtube_dl/extractor/matchtv.py
youtube_dl/extractor/mdr.py
youtube_dl/extractor/medialaan.py
youtube_dl/extractor/mediaset.py
+youtube_dl/extractor/mediasite.py
youtube_dl/extractor/medici.py
youtube_dl/extractor/megaphone.py
youtube_dl/extractor/meipai.py
@@ -419,7 +421,6 @@ youtube_dl/extractor/nosvideo.py
youtube_dl/extractor/nova.py
youtube_dl/extractor/novamov.py
youtube_dl/extractor/nowness.py
-youtube_dl/extractor/nowtv.py
youtube_dl/extractor/noz.py
youtube_dl/extractor/npo.py
youtube_dl/extractor/npr.py
@@ -449,6 +450,7 @@ youtube_dl/extractor/patreon.py
youtube_dl/extractor/pbs.py
youtube_dl/extractor/pearvideo.py
youtube_dl/extractor/people.py
+youtube_dl/extractor/performgroup.py
youtube_dl/extractor/periscope.py
youtube_dl/extractor/philharmoniedeparis.py
youtube_dl/extractor/phoenix.py
@@ -524,7 +526,6 @@ youtube_dl/extractor/rutv.py
youtube_dl/extractor/ruutu.py
youtube_dl/extractor/ruv.py
youtube_dl/extractor/safari.py
-youtube_dl/extractor/sandia.py
youtube_dl/extractor/sapo.py
youtube_dl/extractor/savefrom.py
youtube_dl/extractor/sbs.py
@@ -536,6 +537,7 @@ youtube_dl/extractor/senateisvp.py
youtube_dl/extractor/sendtonews.py
youtube_dl/extractor/servingsys.py
youtube_dl/extractor/servus.py
+youtube_dl/extractor/sevenplus.py
youtube_dl/extractor/sexu.py
youtube_dl/extractor/shahid.py
youtube_dl/extractor/shared.py
@@ -563,7 +565,6 @@ youtube_dl/extractor/spike.py
youtube_dl/extractor/sport5.py
youtube_dl/extractor/sportbox.py
youtube_dl/extractor/sportdeutschland.py
-youtube_dl/extractor/sportschau.py
youtube_dl/extractor/sprout.py
youtube_dl/extractor/srgssr.py
youtube_dl/extractor/srmediathek.py
@@ -575,6 +576,7 @@ youtube_dl/extractor/streamango.py
youtube_dl/extractor/streamcloud.py
youtube_dl/extractor/streamcz.py
youtube_dl/extractor/streetvoice.py
+youtube_dl/extractor/stretchinternet.py
youtube_dl/extractor/sunporno.py
youtube_dl/extractor/svt.py
youtube_dl/extractor/swrmediathek.py
@@ -644,18 +646,21 @@ youtube_dl/extractor/tvigle.py
youtube_dl/extractor/tvland.py
youtube_dl/extractor/tvn24.py
youtube_dl/extractor/tvnoe.py
+youtube_dl/extractor/tvnow.py
youtube_dl/extractor/tvp.py
youtube_dl/extractor/tvplay.py
youtube_dl/extractor/tvplayer.py
youtube_dl/extractor/tweakers.py
youtube_dl/extractor/twentyfourvideo.py
youtube_dl/extractor/twentymin.py
-youtube_dl/extractor/twentytwotracks.py
+youtube_dl/extractor/twentythreevideo.py
youtube_dl/extractor/twitch.py
youtube_dl/extractor/twitter.py
youtube_dl/extractor/udemy.py
youtube_dl/extractor/udn.py
+youtube_dl/extractor/ufctv.py
youtube_dl/extractor/uktvplay.py
+youtube_dl/extractor/umg.py
youtube_dl/extractor/unistra.py
youtube_dl/extractor/unity.py
youtube_dl/extractor/uol.py
@@ -725,6 +730,7 @@ youtube_dl/extractor/watchindianporn.py
youtube_dl/extractor/wdr.py
youtube_dl/extractor/webcaster.py
youtube_dl/extractor/webofstories.py
+youtube_dl/extractor/weibo.py
youtube_dl/extractor/weiqitv.py
youtube_dl/extractor/wimp.py
youtube_dl/extractor/wistia.py
@@ -736,6 +742,7 @@ youtube_dl/extractor/xboxclips.py
youtube_dl/extractor/xfileshare.py
youtube_dl/extractor/xhamster.py
youtube_dl/extractor/xiami.py
+youtube_dl/extractor/ximalaya.py
youtube_dl/extractor/xminus.py
youtube_dl/extractor/xnxx.py
youtube_dl/extractor/xstream.py
diff --git a/pkg/youtube-dl/rev b/pkg/youtube-dl/rev
@@ -1 +1 @@
-20
+21
