MVK: rebase libvlc (fixes #16685)

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

@@ -1,7 +1,7 @@
-From 89fe350352e13662f05d9cd513453a999d72eed9 Mon Sep 17 00:00:00 2001
+From 2ac321f1d70bd14d04524c34f3c5efcf8a2ba66b Mon Sep 17 00:00:00 2001
 From: David Geldreich <david.geldreich@free.fr>
 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/13] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,7 +1,7 @@
-From eead5b3bc749aac3ca386c74115173dfd357e261 Mon Sep 17 00:00:00 2001
+From 40db75171a1cce6043b4835c639a86d3a76a11ef Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Aug 2012 16:02:07 +0200
-Subject: [PATCH 03/14] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 02/13] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0002-progress-dialog-add-missing-sanity-check.patch

@@ -1,29 +0,0 @@
-From a4343a11f961b1f08f7a92aead30d0e96cacdad3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Tue, 17 Apr 2012 16:41:19 +0200
-Subject: [PATCH 02/14] progress dialog: add missing sanity check
-
----
- src/interface/dialog.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/interface/dialog.c b/src/interface/dialog.c
-index 3a0a36e..a9ac2e5 100644
---- a/src/interface/dialog.c
-+++ b/src/interface/dialog.c
-@@ -254,7 +254,11 @@ void dialog_ProgressDestroy (dialog_progress_bar_t *dialog)
- {
-     assert (dialog);
- 
--    dialog->pf_destroy (dialog->p_sys);
-+    if (dialog->pf_destroy != NULL)
-+    {
-+        dialog->pf_destroy (dialog->p_sys);
-+    }
-+
-     free (dialog);
- }
- 
-2.7.0
-

MobileVLCKit/patches/0004-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,7 +1,7 @@
-From 391e3cbe35e04ed8ae668f941364872c1fce8005 Mon Sep 17 00:00:00 2001
+From 62d6e583f2cc089bded2909b4e47ff210b1ec4e9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 9 Dec 2014 22:14:55 +0100
-Subject: [PATCH 04/14] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 03/13] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 04/14] lib/media player: inherit deinterlace variable to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 58b2de9..533988f 100644
+index b278c6f..a2b02f4 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -610,7 +610,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -609,7 +609,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
      var_Create (mp, "crop", VLC_VAR_STRING);
@@ -22,5 +22,5 @@ index 58b2de9..533988f 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0005-arm_neon-work-around-libtool-issue.patch

@@ -1,7 +1,7 @@
-From 22010c4234d36daec2e8ef5963d588f46f61ffee Mon Sep 17 00:00:00 2001
+From 8852ba3fc9babc9841600ad996bdcf538f991ab6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Dec 2014 22:14:55 +0100
-Subject: [PATCH 05/14] arm_neon: work-around libtool issue
+Subject: [PATCH 04/13] arm_neon: work-around libtool issue
 
 ---
  modules/arm_neon/Makefile.am | 2 ++
@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0006-libvlc-media-re-parse-if-flags-changed.patch

@@ -1,7 +1,7 @@
-From 36b1c82b3e35347880b9b5a091be8f29859a75d5 Mon Sep 17 00:00:00 2001
+From 88f997f1151ade930d7049608107a6e9567df2e6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 19 Dec 2014 22:14:55 +0100
-Subject: [PATCH 06/14] libvlc/media: re-parse if flags changed
+Subject: [PATCH 05/13] libvlc/media: re-parse if flags changed
 
 ---
  lib/media.c          | 6 ++++++
@@ -9,7 +9,7 @@ Subject: [PATCH 06/14] libvlc/media: re-parse if flags changed
  2 files changed, 7 insertions(+)
 
 diff --git a/lib/media.c b/lib/media.c
-index 20266ae..fda7ba9 100644
+index 49f5132..6b5504b 100644
 --- a/lib/media.c
 +++ b/lib/media.c
 @@ -719,6 +719,12 @@ static int media_parse(libvlc_media_t *media, bool b_async,
@@ -38,5 +38,5 @@ index 35f06a4..d28297e 100644
  
  /* Media Descriptor */
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0007-arm_neon-fix-iOS-linking.patch

@@ -1,7 +1,7 @@
-From 482035e9b1731660fe0cd3c3da64033fce0fa7c1 Mon Sep 17 00:00:00 2001
+From 87846c20cabea9c5e13cfb82668098f3f414255b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 07/14] arm_neon: fix iOS linking
+Subject: [PATCH 06/13] arm_neon: fix iOS linking
 
 ---
  modules/arm_neon/amplify.S              |  7 ++---
@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
  	pop {r4,pc}
 +endfunc
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0008-disable-neon-volume-plugin.patch

@@ -1,7 +1,7 @@
-From 7c0963d6a837fc01e8ffc63f3066fcf601d6ac7f Mon Sep 17 00:00:00 2001
+From 2c7a9e8a7ec7528cdb2a2566128c65cf681ab81a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 08/14] disable neon volume plugin
+Subject: [PATCH 07/13] disable neon volume plugin
 
 ---
  modules/arm_neon/Makefile.am | 1 -
@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
  	libyuv_rgb_neon_plugin.la
  endif
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0009-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,7 +1,7 @@
-From 02ff60bc966d7bf9e9b4a1c9eae844f9cd51a52c Mon Sep 17 00:00:00 2001
+From 2e1ead93b2fe7b9e924177ff169b7b69b8f9926a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 7 Dec 2014 20:02:18 +0100
-Subject: [PATCH 09/14] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 08/13] contrib/gcrypt: work-around a libtool limitation
 
 ---
  contrib/src/gcrypt/rules.mak                       |  1 +
@@ -53,5 +53,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0010-src-misc-fix-compilation-for-OS-without-fork.patch

@@ -1,7 +1,7 @@
-From 37ad7cbfc7949040026aded5c0837e78d00cb3ff Mon Sep 17 00:00:00 2001
+From 12d4c9c3554333374746ac6d9e58c0ea0a60775c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 10 Sep 2015 19:58:40 +0200
-Subject: [PATCH 10/14] src/misc: fix compilation for OS without fork()
+Subject: [PATCH 09/13] src/misc: fix compilation for OS without fork()
 
 ---
  src/misc/cpu.c | 2 +-
@@ -21,5 +21,5 @@ index 4a5f2a0..79b28e4 100644
  {
      pid_t pid = fork();
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0011-libvlc-hack-to-disable-daemon-mode.patch

@@ -1,17 +1,17 @@
-From a77b80e061de3c34656a35f9203d2aaa9232f651 Mon Sep 17 00:00:00 2001
+From f9cafaf2daf28658eec5de98f6608a2edf9e6b35 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 11 Sep 2015 18:34:26 +0200
-Subject: [PATCH 11/14] libvlc: hack to disable daemon mode
+Subject: [PATCH 10/13] libvlc: hack to disable daemon mode
 
 ---
  src/libvlc.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/libvlc.c b/src/libvlc.c
-index a7d9a69..c8b5c7a 100644
+index 3468e0e..2d870bd 100644
 --- a/src/libvlc.c
 +++ b/src/libvlc.c
-@@ -199,6 +199,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
+@@ -200,6 +200,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
          return VLC_ENOMOD;
      }
  
@@ -23,5 +23,5 @@ index a7d9a69..c8b5c7a 100644
      /* Check for daemon mode */
      if( var_InheritBool( p_libvlc, "daemon" ) )
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0012-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,7 +1,7 @@
-From f8b5407944791f961900fdca8dd83c6fe3ef5b11 Mon Sep 17 00:00:00 2001
+From 7b4975d2f69c28a91cb395ba5a6107d5a01520fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 3 Oct 2015 22:45:14 +0200
-Subject: [PATCH 12/14] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 11/13] contrib/gcrypt: fix tvOS compilation
 
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
@@ -56,5 +56,5 @@ index 0471522..ac20d02 100644
  GCRYPT_CONF += --disable-aesni-support
  else
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0013-contrib-harfbuzz-fix-iOS-compilation-when-CoreText-i.patch

@@ -1,7 +1,7 @@
-From 245dcb464a0105c10e4f31b07ec655b6edc766e6 Mon Sep 17 00:00:00 2001
+From c05e4df144dc201bd855065af7046ad27aad71cf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 23 Nov 2015 16:46:27 +0100
-Subject: [PATCH 13/14] contrib/harfbuzz: fix iOS compilation when CoreText is
+Subject: [PATCH 12/13] contrib/harfbuzz: fix iOS compilation when CoreText is
  enabled
 
 ---
@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
  
  DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 -- 
-2.7.0
+2.7.1
 

MobileVLCKit/patches/0014-libvlc-expose-a-base-set-of-freetype-options-to-over.patch

@@ -1,7 +1,7 @@
-From 5efe94bd6eb06acb6055eb1a45e27269522dc215 Mon Sep 17 00:00:00 2001
+From 4ae3026527842a4f7b113115e44cc1396fc7c7ef Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 23 Nov 2015 16:09:24 +0100
-Subject: [PATCH 14/14] libvlc: expose a base set of freetype options to
+Subject: [PATCH 13/13] libvlc: expose a base set of freetype options to
  overwrite the default font
 
 ---
@@ -14,10 +14,10 @@ Subject: [PATCH 14/14] libvlc: expose a base set of freetype options to
  6 files changed, 163 insertions(+), 4 deletions(-)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 76443c1..23a0183 100644
+index 970bdf1..c87b437 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -1521,6 +1521,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -1519,6 +1519,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
                                                     unsigned option, float value );
  
@@ -51,10 +51,10 @@ index 76443c1..23a0183 100644
  
  /** \defgroup libvlc_audio LibVLC audio controls
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index 49207db..15fa384 100644
+index 03e9a5e..ec2ca4a 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -229,6 +229,9 @@ libvlc_video_get_spu_count
+@@ -237,6 +237,9 @@ libvlc_video_get_spu_count
  libvlc_video_get_spu_delay
  libvlc_video_get_spu_description
  libvlc_video_get_teletext
@@ -64,7 +64,7 @@ index 49207db..15fa384 100644
  libvlc_video_get_title_description
  libvlc_video_get_track
  libvlc_video_get_track_count
-@@ -253,6 +256,9 @@ libvlc_video_set_spu
+@@ -261,6 +264,9 @@ libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_subtitle_file
  libvlc_video_set_teletext
@@ -75,10 +75,10 @@ index 49207db..15fa384 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 533988f..7ab8954 100644
+index a2b02f4..50ef3e6 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -640,6 +640,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -639,6 +639,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
  
@@ -189,7 +189,7 @@ index b2c9b34..6af4e1c 100644
 +    return get_string( p_mi, "freetype", textrenderer_option_bynumber(option) );
 +}
 diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
-index 3409460..4e3da96 100644
+index 135b411..24b51d5 100644
 --- a/modules/text_renderer/freetype/freetype.c
 +++ b/modules/text_renderer/freetype/freetype.c
 @@ -77,6 +77,9 @@
@@ -312,5 +312,5 @@ index 44b2731..7f1abec 100644
  
  /**
 -- 
-2.7.0
+2.7.1
 

buildMobileVLCKit.sh

@@ -17,7 +17,7 @@ SCARY=yes
 TVOS=no
 BITCODE=no
 
-TESTEDHASH=1464d905
+TESTEDHASH=c932d32d
 
 usage()
 {