bump libvlc hash to 2.2-rc1 and update patches

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

@@ -1,7 +1,7 @@
-From 163cb672466104790934e6d7f0bdb3dc464081b4 Mon Sep 17 00:00:00 2001
+From 69dffdf54e043b4417bfec9119471f21a74de437 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/22] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/19] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---

MobileVLCKit/patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch

@@ -1,7 +1,7 @@
-From 8cc4d936b91669377bd221e1489b552d60dafb3d Mon Sep 17 00:00:00 2001
+From 57e4c5c2252a86541dc37ee7d03d2c1e00f37c26 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:01:49 +0200
-Subject: [PATCH 02/22] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/19] arm_neon: use a macro to fix compilation for iOS
 
 ---
  modules/arm_neon/amplify.S              |  9 +++---

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

@@ -1,7 +1,7 @@
-From 74fa33cce3bc0c4e52f3d60707aecaffacae5469 Mon Sep 17 00:00:00 2001
+From 80fa61a6962826fe853fa6309a9a8a9c912af8a1 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/22] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/19] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---

MobileVLCKit/patches/0004-contrib-ebml-mkv-compile-with-hidden-symbols-on-iOS.patch

@@ -1,7 +1,7 @@
-From 53fb375f324267116c8160f0556d060f3bad6879 Mon Sep 17 00:00:00 2001
+From 24f0cfc0bcffe47483719771b042d1fb92e106b6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 11 Aug 2012 13:29:25 +0200
-Subject: [PATCH 04/22] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/19] contrib/ebml+mkv: compile with hidden symbols on iOS
 
 ---
  contrib/src/ebml/rules.mak     | 7 +++++--

MobileVLCKit/patches/0005-libass-fix-text-rendering-on-iOS-by-providing-a-font.patch

@@ -1,7 +1,7 @@
-From 88d7e53382f4d6e057948635475cddde900e26bf Mon Sep 17 00:00:00 2001
+From 57c3cce7d8051d259378614328e460020aa76a95 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 29 May 2013 13:25:54 +0200
-Subject: [PATCH 05/22] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 05/19] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---

MobileVLCKit/patches/0006-contrib-png-fix-ARM-assembly-for-iOS.patch

@@ -1,7 +1,7 @@
-From ffc4345f54f82f6eaf73e7739a820acfb8a8241b Mon Sep 17 00:00:00 2001
+From f53bed4a61f162f3b0afea49ab5736fa9ec5cfcd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20Ku=CC=88hne?= <fkuehne@videolan.org>
 Date: Sat, 20 Jul 2013 23:35:05 +0200
-Subject: [PATCH 06/22] contrib/png: fix ARM assembly for iOS
+Subject: [PATCH 06/19] contrib/png: fix ARM assembly for iOS
 
 ---
  contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++

MobileVLCKit/patches/0008-contrib-flac-fix-compilation-with-clang-5.0.patch

@@ -1,7 +1,7 @@
-From 8ad992247929f0b6d44337925f6c86319133d1be Mon Sep 17 00:00:00 2001
+From e43965da43d5031057cc70f6673d4ce9d2168c14 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 7 Oct 2013 17:05:21 +0200
-Subject: [PATCH 08/22] contrib/flac: fix compilation with clang 5.0
+Subject: [PATCH 07/19] contrib/flac: fix compilation with clang 5.0
 
 ---
  contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++

MobileVLCKit/patches/0009-lib-media_player-inherit-deinterlace-and-vbi-variabl.patch

@@ -1,7 +1,7 @@
-From 3c46223d98f79860ec33edc3d55c8da6337b91e2 Mon Sep 17 00:00:00 2001
+From 842ac9b834370a7d698bf693623f96d8831911d2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 21 Nov 2013 16:26:40 +0100
-Subject: [PATCH 09/22] lib/media_player: inherit deinterlace and vbi variables
+Subject: [PATCH 08/19] lib/media_player: inherit deinterlace and vbi variables
  to fix correct variables values on first use
 
 ---

MobileVLCKit/patches/0010-contrib-avcodec-deploy-libav.patch

@@ -1,14 +1,14 @@
-From db442828e536371a34093f73263087ef3a42ebb9 Mon Sep 17 00:00:00 2001
+From ab5935c814f4c8b401880aeadf2b12c7dab0ac64 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:43:11 +0100
-Subject: [PATCH 10/22] contrib/avcodec: deploy libav
+Subject: [PATCH 09/19] contrib/avcodec: deploy libav
 
 ---
  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 65d9cb8..107e104 100644
+index 4768fc0..52f1b13 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -1,7 +1,7 @@

MobileVLCKit/patches/0011-contrib-opus-disable-asm-on-arm.patch

@@ -1,17 +1,17 @@
-From 3d3d4b8d36679fc6ef7be4d5ed1827f5ec57ca81 Mon Sep 17 00:00:00 2001
+From 0be1c7ef30fdba6508cc603f7e8c183f47bdd05f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 15 Jan 2014 15:26:46 +0100
-Subject: [PATCH 11/22] contrib/opus disable asm on arm
+Subject: [PATCH 10/19] contrib/opus disable asm on arm
 
 ---
  contrib/src/opus/rules.mak | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/contrib/src/opus/rules.mak b/contrib/src/opus/rules.mak
-index d783648..f09a112 100644
+index 56f0933..273521f 100644
 --- a/contrib/src/opus/rules.mak
 +++ b/contrib/src/opus/rules.mak
-@@ -23,6 +23,9 @@ OPUS_CONF=
+@@ -23,6 +23,9 @@ OPUS_CONF= --disable-extra-programs --disable-doc
  ifndef HAVE_FPU
  OPUS_CONF += --enable-fixed-point
  endif

MobileVLCKit/patches/0012-contrib-gcrypt-disable-asm-on-iOS.patch

@@ -1,7 +1,7 @@
-From 9dd5342a6b3c611a98d52ccb9e07be03c30540db Mon Sep 17 00:00:00 2001
+From c461f2d97ae263f0a0d1c1527601938ef7126d2e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 09:56:23 +0100
-Subject: [PATCH 12/22] contrib/gcrypt: disable asm on iOS
+Subject: [PATCH 11/19] contrib/gcrypt: disable asm on iOS
 
 ---
  contrib/src/gcrypt/rules.mak | 3 +++

MobileVLCKit/patches/0013-fix-libtool.patch

@@ -1,7 +1,7 @@
-From 619d9269d3e6d4a09ea03d9d5f1647fc991e3a42 Mon Sep 17 00:00:00 2001
+From eadec6183e20b45e1567530bd8a18a4a1fa150df 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:33 +0200
-Subject: [PATCH 13/22] fix libtool
+Subject: [PATCH 12/19] fix libtool
 
 ---
  modules/arm_neon/Makefile.am    | 4 ++++

MobileVLCKit/patches/0014-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

@@ -1,7 +1,7 @@
-From 039dc1023de906189857c02ebe6e9e9b4a75390b Mon Sep 17 00:00:00 2001
+From b82921549eb04a19c9afcc120121a3503b26ef99 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:55:16 +0100
-Subject: [PATCH 14/22] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 13/19] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---

MobileVLCKit/patches/0015-contrib-speexdsp-disable-neon-for-AArch64.patch

@@ -1,17 +1,17 @@
-From 50119ae3f356845697ae9474d5426a5aff4d2111 Mon Sep 17 00:00:00 2001
+From 51b61ba2ca3fc7863b93f5e4f74b8749702de399 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 15:19:43 +0100
-Subject: [PATCH 15/22] contrib/speexdsp: disable neon for AArch64
+Subject: [PATCH 14/19] contrib/speexdsp: disable neon for AArch64
 
 ---
  contrib/src/speexdsp/rules.mak | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
-index 9b58675..050cb24 100644
+index 3cc2b15..049565d 100644
 --- a/contrib/src/speexdsp/rules.mak
 +++ b/contrib/src/speexdsp/rules.mak
-@@ -29,6 +29,11 @@ ifeq ($(ARCH),arm)
+@@ -36,6 +36,11 @@ ifeq ($(ARCH),arm)
  SPEEXDSP_CONF += --enable-arm5e-asm
  endif
  endif

MobileVLCKit/patches/0016-contrib-add-arch-option-for-platforms-where-the-arch.patch

@@ -1,7 +1,7 @@
-From e6d166e232bce2648098c5edb36f6c4ffa310326 Mon Sep 17 00:00:00 2001
+From 9fb4dd6e05f72e559357eb8b0c79e14f4d932760 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 3 Oct 2013 18:27:43 +0200
-Subject: [PATCH 16/22] contrib: add arch option for platforms where the arch
+Subject: [PATCH 15/19] contrib: add arch option for platforms where the arch
  triplet would be ambigous
 
 ---

MobileVLCKit/patches/0018-contrib-harfbuzz-work-around-build-system-stupidity-.patch

@@ -1,7 +1,7 @@
-From ea6c59004630f42b354cd9be9933bc6b582987d7 Mon Sep 17 00:00:00 2001
+From 2b1e9f251e5e0f1c11de212d3821514181283c95 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 12 Mar 2014 14:48:12 +0100
-Subject: [PATCH 18/22] contrib/harfbuzz: work-around build system stupidity
+Subject: [PATCH 16/19] contrib/harfbuzz: work-around build system stupidity
  breaking clang compilation
 
 ---

MobileVLCKit/patches/0019-contrib-gcrypt-use-git-version-on-iOS.patch

@@ -1,7 +1,7 @@
-From 83178c7ed3cc9561d33fdbac7e78ac63e503f31b Mon Sep 17 00:00:00 2001
+From 6f5ffb478eab8f45c1ff80d2342a527d9c4c3efa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 31 Oct 2013 20:42:59 +0100
-Subject: [PATCH 19/22] contrib/gcrypt: use git version on iOS
+Subject: [PATCH 17/19] contrib/gcrypt: use git version on iOS
 
 ---
  contrib/src/gcrypt/disable-doc-compilation.patch   | 43 ++++++++++++++++++++++

MobileVLCKit/patches/0017-extras-deploy-arch-option-for-iOS.patch

@@ -1,25 +0,0 @@
-From 91cc195bcaea7768a8b56da6bb38828ae360fd96 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Thu, 3 Oct 2013 18:28:26 +0200
-Subject: [PATCH 17/22] extras: deploy arch option for iOS
-
----
- extras/package/ios/build.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
-index e484594..3247859 100755
---- a/extras/package/ios/build.sh
-+++ b/extras/package/ios/build.sh
-@@ -210,7 +210,7 @@ else
-     export ASCPP="xcrun as"
- fi
- 
--../bootstrap --build=x86_64-apple-darwin11 --host=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
-+../bootstrap --build=x86_64-apple-darwin11 --host=${TARGET} --prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --arch=${ARCH} --disable-gpl \
-     --disable-disc --disable-sout \
-     --disable-sdl \
-     --disable-SDL_image \
-1.9.3 (Apple Git-50)
-

MobileVLCKit/patches/0020-libvlc-add-preliminary-code-path-to-modify-quartztex.patch

@@ -1,7 +1,7 @@
-From 37606de74ed865ea3a3d9818a87759cf46fc7144 Mon Sep 17 00:00:00 2001
+From c7e6e5308322a8e585047983f19937ac202dcc56 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 31 Mar 2014 17:54:01 +0200
-Subject: [PATCH 20/22] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 18/19] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---
@@ -13,10 +13,10 @@ Subject: [PATCH 20/22] libvlc: add preliminary code path to modify quartztext
  5 files changed, 130 insertions(+), 9 deletions(-)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 4b2f449..59beb48 100644
+index 94bf7e8..c55e85d 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -1382,6 +1382,27 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -1383,6 +1383,27 @@ 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 );
  

MobileVLCKit/patches/0007-contrib-speex-fix-compilation-for-non-ARMv7-iOS-targ.patch

@@ -1,21 +1,20 @@
-From 783351fb3038cb5b339175884a6f74a35712d8c0 Mon Sep 17 00:00:00 2001
+From 1b3986606d3b1c3baadfb40697c3b93d8afb160c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:37:59 +0100
-Subject: [PATCH 07/22] contrib/speex: fix compilation for non-ARMv7 iOS
+Subject: [PATCH 19/19] contrib/speex: fix compilation for non-ARMv7 iOS
  targets
 
-the neon code included in speex doesn't do ARMv8 yet
 ---
  contrib/src/speex/rules.mak | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
-index f9ff8d9..cd1794a 100644
+index fd90cde..a3d9ea3 100644
 --- a/contrib/src/speex/rules.mak
 +++ b/contrib/src/speex/rules.mak
-@@ -34,6 +34,11 @@ ifeq ($(ARCH),arm)
- SPEEX_CONF += --enable-arm5e-asm
- endif
+@@ -37,6 +37,11 @@ endif
+ ifeq ($(ARCH),aarch64)
+ SPEEX_CONF += --disable-neon
  endif
 +ifdef HAVE_IOS
 +ifndef HAVE_ARMV7A

buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=246889732
+TESTEDHASH=57c046ce1
 
 usage()
 {