youtube-dl: Update to 2016.10.12

4 files changed, 15 insertions, 11 deletions

diff --git a/media/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch b/media/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
index 6252b506..3b8a089b 100644
--- a/media/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
+++ b/media/youtube-dl/patch/0001-Disable-use-of-ctypes-and-dynamic-loading.patch
@@ -1,4 +1,4 @@
-From b9ed9ab4adfe94e3d31c47c45a2992e78fd46304 Mon Sep 17 00:00:00 2001
+From 47223fe0bd580c17c31681423d94b728a9dd879f 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable use of ctypes and dynamic loading
  1 file changed, 11 insertions(+), 164 deletions(-)
 
 diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
-index 69ca88c..542f216 100644
+index 0569d23..e1e4bff 100644
 --- a/youtube_dl/utils.py
 +++ b/youtube_dl/utils.py
 @@ -8,7 +8,6 @@ import binascii
@@ -19,7 +19,7 @@ index 69ca88c..542f216 100644
  import datetime
  import email.utils
  import errno
-@@ -1224,90 +1223,11 @@ def platform_name():
+@@ -1247,90 +1246,11 @@ def platform_name():
      return res
  
  
@@ -110,7 +110,7 @@ index 69ca88c..542f216 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')
-@@ -1337,78 +1257,22 @@ def intlist_to_bytes(xs):
+@@ -1360,78 +1280,22 @@ def intlist_to_bytes(xs):
  
  
  # Cross-platform file locking
@@ -175,13 +175,13 @@ index 69ca88c..542f216 100644
 -    # Some platforms, such as Jython, is missing fcntl
 -    try:
 -        import fcntl
+-
+-        def _lock_file(f, exclusive):
+-            fcntl.flock(f, fcntl.LOCK_EX if exclusive else fcntl.LOCK_SH)
 +        fcntl.flock(f, fcntl.LOCK_UN)
 +except ImportError:
 +    UNSUPPORTED_MSG = 'file locking is not supported on this platform'
  
--        def _lock_file(f, exclusive):
--            fcntl.flock(f, fcntl.LOCK_EX if exclusive else fcntl.LOCK_SH)
--
 -        def _unlock_file(f):
 -            fcntl.flock(f, fcntl.LOCK_UN)
 -    except ImportError:
@@ -199,7 +199,7 @@ index 69ca88c..542f216 100644
  
  
  class locked_file(object):
-@@ -1624,24 +1488,7 @@ def fix_xml_ampersands(xml_str):
+@@ -1647,24 +1511,7 @@ def fix_xml_ampersands(xml_str):
  
  
  def setproctitle(title):
@@ -226,5 +226,5 @@ index 69ca88c..542f216 100644
  
  def remove_start(s, start):
 -- 
-2.10.0
+2.10.1
 
diff --git a/media/youtube-dl/pylibs.txt b/media/youtube-dl/pylibs.txt
index cc96620f..1a2d8838 100644
--- a/media/youtube-dl/pylibs.txt
+++ b/media/youtube-dl/pylibs.txt
@@ -307,12 +307,12 @@ youtube_dl/extractor/viddler.py
 youtube_dl/extractor/tunein.py
 youtube_dl/extractor/nowtv.py
 youtube_dl/extractor/revision3.py
+youtube_dl/extractor/thisoldhouse.py
 youtube_dl/extractor/clubic.py
 youtube_dl/extractor/discoverygo.py
 youtube_dl/extractor/canvas.py
 youtube_dl/extractor/sportdeutschland.py
 youtube_dl/extractor/anysex.py
-youtube_dl/extractor/aftonbladet.py
 youtube_dl/extractor/bandcamp.py
 youtube_dl/extractor/bbc.py
 youtube_dl/extractor/tnaflix.py
@@ -326,6 +326,7 @@ youtube_dl/extractor/thisav.py
 youtube_dl/extractor/jwplatform.py
 youtube_dl/extractor/amcnetworks.py
 youtube_dl/extractor/usanetwork.py
+youtube_dl/extractor/lego.py
 youtube_dl/extractor/democracynow.py
 youtube_dl/extractor/dotsub.py
 youtube_dl/extractor/pladform.py
@@ -346,6 +347,7 @@ youtube_dl/extractor/skysports.py
 youtube_dl/extractor/khanacademy.py
 youtube_dl/extractor/kanalplay.py
 youtube_dl/extractor/breakcom.py
+youtube_dl/extractor/tonline.py
 youtube_dl/extractor/jpopsukitv.py
 youtube_dl/extractor/mailru.py
 youtube_dl/extractor/gameinformer.py
@@ -481,6 +483,7 @@ youtube_dl/extractor/canalc2.py
 youtube_dl/extractor/nova.py
 youtube_dl/extractor/normalboots.py
 youtube_dl/extractor/soundcloud.py
+youtube_dl/extractor/theweatherchannel.py
 youtube_dl/extractor/arkena.py
 youtube_dl/extractor/streamcloud.py
 youtube_dl/extractor/eporner.py
@@ -614,6 +617,7 @@ youtube_dl/extractor/vrt.py
 youtube_dl/extractor/gfycat.py
 youtube_dl/extractor/miaopai.py
 youtube_dl/extractor/clyp.py
+youtube_dl/extractor/nzz.py
 youtube_dl/extractor/moviezine.py
 youtube_dl/extractor/sina.py
 youtube_dl/extractor/wsj.py
diff --git a/media/youtube-dl/rev b/media/youtube-dl/rev
index ec635144..f599e28b 100644
--- a/media/youtube-dl/rev
+++ b/media/youtube-dl/rev
@@ -1 +1 @@
-9
+10
diff --git a/media/youtube-dl/src b/media/youtube-dl/src
-Subproject 8f0cf20ab987019c3ba66c375450f80bb1cfe28
+Subproject 5c4bfd4da5d532bf8d5aaf1bb37396f7cfbc786