MVK: rebase libvlc

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

@@ -1,7 +1,7 @@
-From 12cc643dde0d4853cc913dffc8edb2d7e7d3c666 Mon Sep 17 00:00:00 2001
+From c48c732696d52302c184ee71a90e8f8af85687b1 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/15] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From 1eb1cb1fc345b471c3efeb0ba6139876d73cd8a5 Mon Sep 17 00:00:00 2001
+From f3323e59bbe7a0ddb975b1ea8cec82226734e807 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 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
 
 ---
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From e2e7f96af3ef34512c444a13c69a8deb22124944 Mon Sep 17 00:00:00 2001
+From dd92503c663b8e92714ebd20beeb4d787f21ae09 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 03/14] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 03/15] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---
@@ -22,5 +22,5 @@ index 4761fee..24d0c71 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From 167c49670700a84dfa6bb126d86e8998586b17e4 Mon Sep 17 00:00:00 2001
+From 385a3b53056adff87a836e3f70b79336ddbbfae0 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 04/14] arm_neon: work-around libtool issue
+Subject: [PATCH 04/15] 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.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From b27d6414005031bbb09b493100cc955cf227abf6 Mon Sep 17 00:00:00 2001
+From 7f7ada4925897e2dc9706493dfd5b7221df3ea11 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 05/14] arm_neon: fix iOS linking
+Subject: [PATCH 05/15] arm_neon: fix iOS linking
 
 ---
  modules/arm_neon/amplify.S              |  7 ++---
@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
  	pop {r4,pc}
 +endfunc
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From 93d647a61f6eb5e66eb83349a1862654cc26d741 Mon Sep 17 00:00:00 2001
+From 50402ecdb15c0e5480bf68ec45606b237d4a663c 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 06/14] disable neon volume plugin
+Subject: [PATCH 06/15] 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.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From 1239f5a55e099e83446bff8c5a85303c7f4931bc Mon Sep 17 00:00:00 2001
+From 062a583387a95e32797b9175e48ce9a339e4beb8 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 07/14] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 07/15] 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.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From afe7675da0f9faa938ce101629666ac573ec5fab Mon Sep 17 00:00:00 2001
+From 95165618d2e4c0524d38b3aa00ba42b4233ce857 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 08/14] src/misc: fix compilation for OS without fork()
+Subject: [PATCH 08/15] 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.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From b19ffea6f6563f7de872075d0da2cd3db27ef665 Mon Sep 17 00:00:00 2001
+From 6a8bd4b4021af5174a3fe1e9e1811e44e18e81e1 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 09/14] libvlc: hack to disable daemon mode
+Subject: [PATCH 09/15] libvlc: hack to disable daemon mode
 
 ---
  src/libvlc.c | 4 ++++
@@ -23,5 +23,5 @@ index 3468e0e..2d870bd 100644
      /* Check for daemon mode */
      if( var_InheritBool( p_libvlc, "daemon" ) )
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From 439ca94598e8266da9f059dd97d438a713c644b9 Mon Sep 17 00:00:00 2001
+From f4f0c2d40e3208298c6055dc1c7032999ec45b76 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 10/14] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 10/15] 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.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From 33d9c4eacd94796a0787ad2eee23d1e1bb19e122 Mon Sep 17 00:00:00 2001
+From 6e84efd68b6448f3fcd01de589eead1120d402db 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 11/14] contrib/harfbuzz: fix iOS compilation when CoreText is
+Subject: [PATCH 11/15] contrib/harfbuzz: fix iOS compilation when CoreText is
  enabled
 
 ---
@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
  
  DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

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

@@ -1,7 +1,7 @@
-From 732449d65e0e31ca753f5bb577159dcecf625a9d Mon Sep 17 00:00:00 2001
+From e47596b0028208645641d31abf6a5e3915094d8e 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 12/14] libvlc: expose a base set of freetype options to
+Subject: [PATCH 12/15] libvlc: expose a base set of freetype options to
  overwrite the default font
 
 ---
@@ -312,5 +312,5 @@ index 44b2731..7f1abec 100644
  
  /**
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

MobileVLCKit/patches/0013-Add-AC-3-pass-through.patch

@@ -1,7 +1,7 @@
-From 4347f84a676c42d5678a802a77e642a4c5062aa5 Mon Sep 17 00:00:00 2001
+From 784074e19777905f42274ef9dee71006efc27365 Mon Sep 17 00:00:00 2001
 From: Aman Gupta <aman@tmm1.net>
 Date: Tue, 1 Mar 2016 16:31:13 +0100
-Subject: [PATCH 13/14] Add AC-3 pass-through
+Subject: [PATCH 13/15] Add AC-3 pass-through
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -163,5 +163,5 @@ index 044905b..355f14f 100644
      return OpenCommon( p_this, false );
  }
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

MobileVLCKit/patches/0014-libvlc-create-VT-zero-copy-variable.patch

@@ -1,7 +1,7 @@
-From 36ca23daf817bb5d190305847a2e25820107b6ed Mon Sep 17 00:00:00 2001
+From 9c6c331f40c9b5423fbf6b0d2b87e74cf7b80b96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 4 May 2016 16:00:40 +0200
-Subject: [PATCH 14/14] libvlc: create VT-zero-copy variable
+Subject: [PATCH 14/15] libvlc: create VT-zero-copy variable
 
 ---
  lib/media_player.c | 1 +
@@ -20,5 +20,5 @@ index b4c23a4..c3d9421 100644
  #ifdef __ANDROID__
      var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
 -- 
-2.8.1
+2.7.4 (Apple Git-66)
 

MobileVLCKit/patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch

@@ -0,0 +1,25 @@
+From c7bb59bc4d92e963cbccb2e67ecd23fe2f8b8221 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Mon, 9 May 2016 11:49:20 +0200
+Subject: [PATCH 15/15] contrib/avcodec: enforce use of FFmpeg
+
+---
+ contrib/src/ffmpeg/rules.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
+index 6c166a0..f043a7f 100644
+--- a/contrib/src/ffmpeg/rules.mak
++++ b/contrib/src/ffmpeg/rules.mak
+@@ -2,7 +2,7 @@
+ 
+ #Uncomment the one you want
+ #USE_LIBAV ?= 1
+-#USE_FFMPEG ?= 1
++USE_FFMPEG ?= 1
+ 
+ ifdef USE_FFMPEG
+ HASH=HEAD
+-- 
+2.7.4 (Apple Git-66)
+

buildMobileVLCKit.sh

@@ -17,7 +17,7 @@ SCARY=yes
 TVOS=no
 BITCODE=no
 
-TESTEDHASH=ac4658d2
+TESTEDHASH=e9878b8b
 
 usage()
 {