oasis

commit: 703256a8b630b53bbc9bef6b10c98a40cf62ff63
parent f4cc7957aa7974a08f63883eea901142e869dcc7
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 18 Mar 2019 20:52:41 -0700

youtube-dl: Update to 2019.03.18

Diffstat:
M
pkg/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
22
+++++++++++-----------
M
pkg/youtube-dl/pylibs.txt
6
+-----
M
pkg/youtube-dl/ver
2
+-

3 files changed, 13 insertions(+), 17 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,4 +1,4 @@
-From 981bd911fa6e646b1b48038cb860370c8f028732 Mon Sep 17 00:00:00 2001
+From ef0127b80cf44dbf6bff8db0fbbbbe75cac62105 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable use of ctypes and dynamic loading
  2 files changed, 11 insertions(+), 190 deletions(-)
 
 diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
-index 7b770340f..8bcfa2cf3 100644
+index 7992a23ca..ef681b0d3 100644
 --- a/youtube_dl/compat.py
 +++ b/youtube_dl/compat.py
 @@ -4,7 +4,6 @@ from __future__ import unicode_literals
@@ -20,7 +20,7 @@ index 7b770340f..8bcfa2cf3 100644
  import email
  import getpass
  import io
-@@ -2940,24 +2939,6 @@ else:
+@@ -2949,24 +2948,6 @@ else:
      compat_b64decode = base64.b64decode
  
  
@@ -28,7 +28,7 @@ index 7b770340f..8bcfa2cf3 100644
 -    # 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
+-    # 2. https://github.com/ytdl-org/youtube-dl/pull/4392
 -    def compat_ctypes_WINFUNCTYPE(*args, **kwargs):
 -        real = ctypes.WINFUNCTYPE(*args, **kwargs)
 -
@@ -45,16 +45,16 @@ index 7b770340f..8bcfa2cf3 100644
  __all__ = [
      'compat_HTMLParseError',
      'compat_HTMLParser',
-@@ -2968,7 +2949,6 @@ __all__ = [
+@@ -2977,7 +2958,6 @@ __all__ = [
      'compat_chr',
      'compat_cookiejar',
      'compat_cookies',
 -    'compat_ctypes_WINFUNCTYPE',
+     'compat_etree_Element',
      'compat_etree_fromstring',
      'compat_etree_register_namespace',
-     'compat_expanduser',
 diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
-index 62e769fd5..e44384d41 100644
+index f2726a579..d4c086cd0 100644
 --- a/youtube_dl/utils.py
 +++ b/youtube_dl/utils.py
 @@ -8,7 +8,6 @@ import binascii
@@ -73,7 +73,7 @@ index 62e769fd5..e44384d41 100644
      compat_etree_fromstring,
      compat_expanduser,
      compat_html_entities,
-@@ -1390,90 +1388,11 @@ def platform_name():
+@@ -1406,90 +1404,11 @@ def platform_name():
      return res
  
  
@@ -164,7 +164,7 @@ index 62e769fd5..e44384d41 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')
-@@ -1503,78 +1422,22 @@ def intlist_to_bytes(xs):
+@@ -1519,78 +1438,22 @@ def intlist_to_bytes(xs):
  
  
  # Cross-platform file locking
@@ -253,7 +253,7 @@ index 62e769fd5..e44384d41 100644
  
  
  class locked_file(object):
-@@ -1812,29 +1675,7 @@ def fix_xml_ampersands(xml_str):
+@@ -1836,29 +1699,7 @@ def fix_xml_ampersands(xml_str):
  
  
  def setproctitle(title):
@@ -285,5 +285,5 @@ index 62e769fd5..e44384d41 100644
  
  def remove_start(s, start):
 -- 
-2.20.1
+2.21.0
 
diff --git a/pkg/youtube-dl/pylibs.txt b/pkg/youtube-dl/pylibs.txt
@@ -38,9 +38,7 @@ youtube_dl/extractor/amcnetworks.py
 youtube_dl/extractor/americastestkitchen.py
 youtube_dl/extractor/amp.py
 youtube_dl/extractor/animeondemand.py
-youtube_dl/extractor/anitube.py
 youtube_dl/extractor/anvato.py
-youtube_dl/extractor/anysex.py
 youtube_dl/extractor/aol.py
 youtube_dl/extractor/apa.py
 youtube_dl/extractor/aparat.py
@@ -500,7 +498,6 @@ youtube_dl/extractor/pornotube.py
 youtube_dl/extractor/pornovoisines.py
 youtube_dl/extractor/pornoxo.py
 youtube_dl/extractor/presstv.py
-youtube_dl/extractor/primesharetv.py
 youtube_dl/extractor/promptfile.py
 youtube_dl/extractor/prosiebensat1.py
 youtube_dl/extractor/puhutv.py
@@ -545,7 +542,6 @@ youtube_dl/extractor/rtvnh.py
 youtube_dl/extractor/rtvs.py
 youtube_dl/extractor/rudo.py
 youtube_dl/extractor/ruhd.py
-youtube_dl/extractor/ruleporn.py
 youtube_dl/extractor/rutube.py
 youtube_dl/extractor/rutv.py
 youtube_dl/extractor/ruutu.py
@@ -718,7 +714,6 @@ youtube_dl/extractor/viddler.py
 youtube_dl/extractor/videa.py
 youtube_dl/extractor/videodetective.py
 youtube_dl/extractor/videofyme.py
-youtube_dl/extractor/videomega.py
 youtube_dl/extractor/videomore.py
 youtube_dl/extractor/videopremium.py
 youtube_dl/extractor/videopress.py
@@ -786,6 +781,7 @@ youtube_dl/extractor/xxxymovies.py
 youtube_dl/extractor/yahoo.py
 youtube_dl/extractor/yandexdisk.py
 youtube_dl/extractor/yandexmusic.py
+youtube_dl/extractor/yandexvideo.py
 youtube_dl/extractor/yapfiles.py
 youtube_dl/extractor/yesjapan.py
 youtube_dl/extractor/yinyuetai.py
diff --git a/pkg/youtube-dl/ver b/pkg/youtube-dl/ver
@@ -1 +1 @@
-2019.03.01 r0
+2019.03.18 r0