Explorar o código

MVK: update libvlc

Felix Paul Kühne %!s(int64=7) %!d(string=hai) anos
pai
achega
327c414841

+ 3 - 3
Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch

@@ -1,7 +1,7 @@
-From bfa34e1b7df1d80c08a115dbb3b44d1476b78a96 Mon Sep 17 00:00:00 2001
+From 668dc94771938e10e81d403b171774cb58d55c86 Mon Sep 17 00:00:00 2001
 From: David Geldreich <david.geldreich@free.fr>
 From: David Geldreich <david.geldreich@free.fr>
 Date: Fri, 20 Apr 2012 16:41:19 +0200
 Date: Fri, 20 Apr 2012 16:41:19 +0200
-Subject: [PATCH 01/14] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/15] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
  prefix for the iOS ARM ABI
 
 
 ---
 ---
@@ -65,5 +65,5 @@ index 0000000000..d853255fec
 +.endm
 +.endm
 +
 +
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,7 +1,7 @@
-From 705363bb70efd67a6e6af4fa501c12cd31f043e7 Mon Sep 17 00:00:00 2001
+From f1a8fd5633d481c826b9333cd242b9dcb0dd8744 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Aug 2012 16:02:07 +0200
 Date: Fri, 10 Aug 2012 16:02:07 +0200
-Subject: [PATCH 02/14] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 02/15] deinterlace/merge: use a macro to fix compilation for
  iOS
  iOS
 
 
 ---
 ---
@@ -82,5 +82,5 @@ index dd779029ae..03e5042b28 100644
  	b		1b
  	b		1b
 +endfunc
 +endfunc
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch

@@ -1,7 +1,7 @@
-From af01161e7a035b6b5355dfb4cd6059288c57faaa Mon Sep 17 00:00:00 2001
+From 6d31c618f3fbf3b69e3794462b69e3e3bc2fe772 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Dec 2014 22:14:55 +0100
 Date: Thu, 18 Dec 2014 22:14:55 +0100
-Subject: [PATCH 03/14] arm_neon: work-around libtool issue
+Subject: [PATCH 03/15] arm_neon: work-around libtool issue
 
 
 ---
 ---
  modules/arm_neon/Makefile.am | 2 ++
  modules/arm_neon/Makefile.am | 2 ++
@@ -18,5 +18,5 @@ index db81ec0b84..e67e07e61c 100644
  
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch

@@ -1,7 +1,7 @@
-From 56e92e9c436cfa07998285ffc134958181a2a7c0 Mon Sep 17 00:00:00 2001
+From ad1469ad125d3730fe017e90d2d35fcdd0976de5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 04/14] arm_neon: fix iOS linking
+Subject: [PATCH 04/15] arm_neon: fix iOS linking
 
 
 ---
 ---
  modules/arm_neon/amplify.S              |  7 ++---
  modules/arm_neon/amplify.S              |  7 ++---
@@ -194,5 +194,5 @@ index a94ae8539f..54b43a79e3 100644
  	pop {r4,pc}
  	pop {r4,pc}
 +endfunc
 +endfunc
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch

@@ -1,7 +1,7 @@
-From eb0d3b6becaa92768d62c873fa9dcdc9f6eab246 Mon Sep 17 00:00:00 2001
+From 376eaa77acbe6e82e528b693d60d93aea8b040e8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 05/14] disable neon volume plugin
+Subject: [PATCH 05/15] disable neon volume plugin
 
 
 ---
 ---
  modules/arm_neon/Makefile.am | 1 -
  modules/arm_neon/Makefile.am | 1 -
@@ -19,5 +19,5 @@ index e67e07e61c..690975235f 100644
  	libyuv_rgb_neon_plugin.la
  	libyuv_rgb_neon_plugin.la
  endif
  endif
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch

@@ -1,7 +1,7 @@
-From cf74a8c7973a1632dabdbf29717d01efbdd77d98 Mon Sep 17 00:00:00 2001
+From c5d0ba9169d60ec8ce2dcc46d17ec8830a84af95 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 22 Jul 2016 11:11:44 +0200
 Date: Fri, 22 Jul 2016 11:11:44 +0200
-Subject: [PATCH 06/14] Enable System DL
+Subject: [PATCH 06/15] Enable System DL
 
 
 ---
 ---
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
@@ -58,5 +58,5 @@ index 41d16a4fb2..3e5f910e99 100644
  
  
  .ffmpeg: ffmpeg
  .ffmpeg: ffmpeg
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch

@@ -1,7 +1,7 @@
-From 74f0dadd51c8fcd96044a3660665867c61a4702f Mon Sep 17 00:00:00 2001
+From 78de05ed1914bc1908c73e6fcc3e1657153006fa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:04:05 +0200
 Date: Mon, 12 Sep 2016 17:04:05 +0200
-Subject: [PATCH 07/14] deinterlace-merge-arm64: fix linking on appleOS
+Subject: [PATCH 07/15] deinterlace-merge-arm64: fix linking on appleOS
 
 
 ---
 ---
  modules/arm_neon/asm64.S                       | 46 ++++++++++++++++++++++++++
  modules/arm_neon/asm64.S                       | 46 ++++++++++++++++++++++++++
@@ -107,5 +107,5 @@ index db19e54caf..63c04d3fdd 100644
  	ret
  	ret
 +endfunc
 +endfunc
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 4 - 4
Resources/MobileVLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch

@@ -1,7 +1,7 @@
-From 544391ca227ed3fd2d952a1793ae07e8aae8fd95 Mon Sep 17 00:00:00 2001
+From 355cea0bf383e528886c6d3ca4de1c39547281d1 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
 Date: Fri, 16 Sep 2016 15:51:10 +0200
-Subject: [PATCH 08/14] http: add vlc_http_cookies_clear
+Subject: [PATCH 08/15] http: add vlc_http_cookies_clear
 
 
 Clear all cookies without deleting the jar.
 Clear all cookies without deleting the jar.
 ---
 ---
@@ -35,7 +35,7 @@ index 5b1a8bfee8..39e8b59cc7 100644
  vlc_http_cookies_fetch
  vlc_http_cookies_fetch
  httpd_ClientIP
  httpd_ClientIP
 diff --git a/src/misc/httpcookies.c b/src/misc/httpcookies.c
 diff --git a/src/misc/httpcookies.c b/src/misc/httpcookies.c
-index 2e4d3a8663..0929758f62 100644
+index 77ab852b15..f229b85dea 100644
 --- a/src/misc/httpcookies.c
 --- a/src/misc/httpcookies.c
 +++ b/src/misc/httpcookies.c
 +++ b/src/misc/httpcookies.c
 @@ -281,7 +281,7 @@ vlc_http_cookie_jar_t * vlc_http_cookies_new(void)
 @@ -281,7 +281,7 @@ vlc_http_cookie_jar_t * vlc_http_cookies_new(void)
@@ -61,5 +61,5 @@ index 2e4d3a8663..0929758f62 100644
  }
  }
  
  
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 6 - 6
Resources/MobileVLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch

@@ -1,7 +1,7 @@
-From 33b5c11f4bd689e6f4637fe5642403581cf7afcf Mon Sep 17 00:00:00 2001
+From e029a25646d1f456f59ea93836dd17af47aab099 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
 Date: Fri, 16 Sep 2016 15:51:11 +0200
-Subject: [PATCH 09/14] libvlc_media: add cookie_jar API
+Subject: [PATCH 09/15] libvlc_media: add cookie_jar API
 
 
 ---
 ---
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
@@ -71,7 +71,7 @@ index caa55981bf..c0d5754abf 100644
  libvlc_playlist_play
  libvlc_playlist_play
  libvlc_release
  libvlc_release
 diff --git a/lib/media.c b/lib/media.c
 diff --git a/lib/media.c b/lib/media.c
-index 30e5bd55f4..1b31b948a0 100644
+index 8da5a130e2..167b3d733d 100644
 --- a/lib/media.c
 --- a/lib/media.c
 +++ b/lib/media.c
 +++ b/lib/media.c
 @@ -406,6 +406,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
 @@ -406,6 +406,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
@@ -92,7 +92,7 @@ index 30e5bd55f4..1b31b948a0 100644
      vlc_cond_destroy( &p_md->parsed_cond );
      vlc_cond_destroy( &p_md->parsed_cond );
      vlc_mutex_destroy( &p_md->parsed_lock );
      vlc_mutex_destroy( &p_md->parsed_lock );
      vlc_mutex_destroy( &p_md->subitems_lock );
      vlc_mutex_destroy( &p_md->subitems_lock );
-@@ -1278,3 +1282,24 @@ void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
+@@ -1277,3 +1281,24 @@ void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
      }
      }
      free( pp_slaves );
      free( pp_slaves );
  }
  }
@@ -138,7 +138,7 @@ index 5a67e9ff60..0f0341e260 100644
  
  
  /* Media Descriptor */
  /* Media Descriptor */
 diff --git a/lib/media_player.c b/lib/media_player.c
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 7da1bf25a8..94c9e8064d 100644
+index ef34125aa5..b0d8c65c93 100644
 --- a/lib/media_player.c
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -620,6 +620,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
 @@ -620,6 +620,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -163,5 +163,5 @@ index 7da1bf25a8..94c9e8064d 100644
  
  
      p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
      p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,7 +1,7 @@
-From 6f41c200ccc274a255cd727cbcbcbfb581c574ac Mon Sep 17 00:00:00 2001
+From 47bc822d8f213e1bb1a632ea3bf1536b45e1fc92 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 7 Dec 2014 20:02:18 +0100
 Date: Sun, 7 Dec 2014 20:02:18 +0100
-Subject: [PATCH 10/14] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 10/15] contrib/gcrypt: work-around a libtool limitation
 
 
 ---
 ---
  contrib/src/gcrypt/rules.mak                       |  1 +
  contrib/src/gcrypt/rules.mak                       |  1 +
@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 + 
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,7 +1,7 @@
-From 6a38ccb497cf1b0b36dfb2899b6cff6108b1644b Mon Sep 17 00:00:00 2001
+From 2cf678883254de618a1b6cb89619f70bc3d89639 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 3 Oct 2015 22:45:14 +0200
 Date: Sat, 3 Oct 2015 22:45:14 +0200
-Subject: [PATCH 11/14] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 11/15] contrib/gcrypt: fix tvOS compilation
 
 
 ---
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
@@ -56,5 +56,5 @@ index c2d4b934f4..dbd556be61 100644
  GCRYPT_CONF += --disable-aesni-support
  GCRYPT_CONF += --disable-aesni-support
  else
  else
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch

@@ -1,7 +1,7 @@
-From e47d63e4a7331d95fe30e71b7dbf215f53c55e51 Mon Sep 17 00:00:00 2001
+From 39412b3ad9228f1cefa846ed451951c1a99d488b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:03:37 +0200
 Date: Mon, 12 Sep 2016 17:03:37 +0200
-Subject: [PATCH 12/14] contrib/gcrypt: update patches
+Subject: [PATCH 12/15] contrib/gcrypt: update patches
 
 
 ---
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch  | 308 ++++++++++++++++++++-
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch  | 308 ++++++++++++++++++++-
@@ -363,5 +363,5 @@ index df97ffb488..957f268ad2 100644
   
   
   # Need to include ../src in addition to top_srcdir because gcrypt.h is
   # Need to include ../src in addition to top_srcdir because gcrypt.h is
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 8 - 8
Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch

@@ -1,7 +1,7 @@
-From 13e9a60f4e52df7012ca26ce54fef82ebca1ac7c Mon Sep 17 00:00:00 2001
+From bd286c30447867086bbeed1f988f73d6b4269da0 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Tue, 11 Apr 2017 15:15:26 +0200
 Date: Tue, 11 Apr 2017 15:15:26 +0200
-Subject: [PATCH 13/14] build: rename exported symbols by module
+Subject: [PATCH 13/15] build: rename exported symbols by module
 
 
 This is quite ugly and temporary. Ideally we should rename symbols in binaries like the Android script do.
 This is quite ugly and temporary. Ideally we should rename symbols in binaries like the Android script do.
 ---
 ---
@@ -17,16 +17,16 @@ This is quite ugly and temporary. Ideally we should rename symbols in binaries l
  9 files changed, 34 insertions(+), 34 deletions(-)
  9 files changed, 34 insertions(+), 34 deletions(-)
 
 
 diff --git a/modules/codec/ttml/ttml.c b/modules/codec/ttml/ttml.c
 diff --git a/modules/codec/ttml/ttml.c b/modules/codec/ttml/ttml.c
-index 4727b28cbf..97631276e5 100644
+index 24b1050d5a..9b0abbbf26 100644
 --- a/modules/codec/ttml/ttml.c
 --- a/modules/codec/ttml/ttml.c
 +++ b/modules/codec/ttml/ttml.c
 +++ b/modules/codec/ttml/ttml.c
 @@ -54,7 +54,7 @@ vlc_module_begin ()
 @@ -54,7 +54,7 @@ vlc_module_begin ()
-         set_capability( "demux", 2 )
+         set_capability( "demux", 3 )
          set_category( CAT_INPUT )
          set_category( CAT_INPUT )
          set_subcategory( SUBCAT_INPUT_DEMUX )
          set_subcategory( SUBCAT_INPUT_DEMUX )
 -        set_callbacks( OpenDemux, CloseDemux )
 -        set_callbacks( OpenDemux, CloseDemux )
 +        set_callbacks( OpenDemux__ttml, CloseDemux__ttml )
 +        set_callbacks( OpenDemux__ttml, CloseDemux__ttml )
-         add_shortcut( "ttml", "subtitle" )
+         add_shortcut( "ttml" )
  
  
  vlc_module_end ()
  vlc_module_end ()
 diff --git a/modules/codec/ttml/ttml.h b/modules/codec/ttml/ttml.h
 diff --git a/modules/codec/ttml/ttml.h b/modules/codec/ttml/ttml.h
@@ -88,7 +88,7 @@ index 5105dd1efd..7c97fc842a 100644
  #define MUX_TEXT N_("Avformat mux")
  #define MUX_TEXT N_("Avformat mux")
  #define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
  #define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
 diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
 diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
-index 783220df78..b712fa16a1 100644
+index e99a9aa750..ac50c4b0d8 100644
 --- a/modules/demux/avformat/demux.c
 --- a/modules/demux/avformat/demux.c
 +++ b/modules/demux/avformat/demux.c
 +++ b/modules/demux/avformat/demux.c
 @@ -143,7 +143,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
 @@ -143,7 +143,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
@@ -136,7 +136,7 @@ index 783220df78..b712fa16a1 100644
          return VLC_EGENERIC;
          return VLC_EGENERIC;
      }
      }
      free( psz_url );
      free( psz_url );
-@@ -665,7 +665,7 @@ int OpenDemux( vlc_object_t *p_this )
+@@ -672,7 +672,7 @@ int OpenDemux( vlc_object_t *p_this )
  /*****************************************************************************
  /*****************************************************************************
   * Close
   * Close
   *****************************************************************************/
   *****************************************************************************/
@@ -319,5 +319,5 @@ index ecc26e0d60..0c71cda6d2 100644
   * frames, each algorithm is responsible for setting the offset correctly.
   * frames, each algorithm is responsible for setting the offset correctly.
   * (The default is 0, so if that is correct, there's no need to do anything.)
   * (The default is 0, so if that is correct, there's no need to do anything.)
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 4 - 4
Resources/MobileVLCKit/patches/0014-Replace-thread-local-with-pthread-TSD.patch

@@ -1,7 +1,7 @@
-From bbe96651ce201e069d28c6113d0729baf7f554b1 Mon Sep 17 00:00:00 2001
+From 75592fe271e36b6a21c818d3bf29052bcad8091d Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Mon, 17 Jul 2017 17:03:24 +0200
 Date: Mon, 17 Jul 2017 17:03:24 +0200
-Subject: [PATCH 14/14] Replace thread local with pthread TSD
+Subject: [PATCH 14/15] Replace thread local with pthread TSD
 
 
 ---
 ---
  src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -175,7 +175,7 @@ index 3fafaa4183..476d9cfba5 100644
          return vlc_poll(fds, nfds, timeout);
          return vlc_poll(fds, nfds, timeout);
  
  
 diff --git a/src/misc/variables.c b/src/misc/variables.c
 diff --git a/src/misc/variables.c b/src/misc/variables.c
-index 87a9c27478..5d3b8ebc1f 100644
+index 810c8ffc81..3d2d2f1dc8 100644
 --- a/src/misc/variables.c
 --- a/src/misc/variables.c
 +++ b/src/misc/variables.c
 +++ b/src/misc/variables.c
 @@ -1378,7 +1378,17 @@ void DumpVariables(vlc_object_t *obj)
 @@ -1378,7 +1378,17 @@ void DumpVariables(vlc_object_t *obj)
@@ -222,5 +222,5 @@ index 87a9c27478..5d3b8ebc1f 100644
      twalk(priv->var_root, TwalkGetNames);
      twalk(priv->var_root, TwalkGetNames);
      vlc_mutex_unlock(&priv->var_lock);
      vlc_mutex_unlock(&priv->var_lock);
 -- 
 -- 
-2.14.1
+2.14.2
 
 

+ 4 - 3
Resources/MobileVLCKit/patches/0015-contrib-use-live555-version-that-is-compatible-with-.patch

@@ -1,7 +1,8 @@
-From f7847b9389c3066f980462ffa5496054784f7a9c Mon Sep 17 00:00:00 2001
+From f0682a1f6acc25b28251fccc2087c194ab0cda90 Mon Sep 17 00:00:00 2001
 From: Carola Nitz <nitz.carola@googlemail.com>
 From: Carola Nitz <nitz.carola@googlemail.com>
 Date: Fri, 29 Sep 2017 14:49:02 +0200
 Date: Fri, 29 Sep 2017 14:49:02 +0200
-Subject: [PATCH] contrib: use live555 version that is compatible with LGPL2
+Subject: [PATCH 15/15] contrib: use live555 version that is compatible with
+ LGPL2
 
 
 ---
 ---
  contrib/src/live555/SHA512SUMS | 2 +-
  contrib/src/live555/SHA512SUMS | 2 +-
@@ -45,5 +46,5 @@ index 19d04541d8..8eb4295f42 100644
  		echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
  		echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
  		echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
  		echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
 -- 
 -- 
-2.11.0 (Apple Git-81)
+2.14.2
 
 

+ 1 - 1
buildMobileVLCKit.sh

@@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min
 ROOT_DIR=empty
 ROOT_DIR=empty
 FARCH="all"
 FARCH="all"
 
 
-TESTEDHASH=e713ded8
+TESTEDHASH=3767a33c
 
 
 if [ -z "$MAKE_JOBS" ]; then
 if [ -z "$MAKE_JOBS" ]; then
     CORE_COUNT=`sysctl -n machdep.cpu.core_count`
     CORE_COUNT=`sysctl -n machdep.cpu.core_count`