MVK: update libvlc and remove patch merged upstream

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

@@ -1,7 +1,7 @@
-From e524c08fbf5abfd8f533169c4b690a4f088f77fe Mon Sep 17 00:00:00 2001
+From 069aeedc8e73bb33dab972d561f19a289824fbfb 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/11] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/10] 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 2e7e6e9b618e6cd0cd4af2e47af1e034791bd331 Mon Sep 17 00:00:00 2001
+From d87f33407824e5b3153235019517e1a98f399346 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/11] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/10] 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 eab9b2d6625d0d23b68c1621524bc239cdbaa758 Mon Sep 17 00:00:00 2001
+From 85f19afa64a6ecef38d803a1b0eabf262d5844d2 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/11] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/10] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---

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

@@ -1,52 +0,0 @@
-From 52a7aa474a6bc71676415f58f244449b503dcafd 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/11] contrib/ebml+mkv: compile with hidden symbols on iOS
-
----
- contrib/src/ebml/rules.mak     | 7 +++++--
- contrib/src/matroska/rules.mak | 6 +++++-
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
-index 1d01818..a36727c 100644
---- a/contrib/src/ebml/rules.mak
-+++ b/contrib/src/ebml/rules.mak
-@@ -16,8 +16,11 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
- 	$(MOVE)
- 
- # libebml requires exceptions
--EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
--					CPPFLAGS=""
-+ifdef HAVE_IOS
-+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden" CPPFLAGS=""
-+else
-+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" CPPFLAGS=""
-+endif
- 
- .ebml: libebml
- ifdef HAVE_WIN32
-diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
-index 336e001..40dfb1e 100644
---- a/contrib/src/matroska/rules.mak
-+++ b/contrib/src/matroska/rules.mak
-@@ -17,11 +17,15 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
- 	$(APPLY) $(SRC)/matroska/matroska-pic.patch
- 	$(MOVE)
- 
-+ifdef HAVE_IOS
-+MATROSKA_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
-+endif
-+
- .matroska: libmatroska
- ifdef HAVE_WIN32
- 	cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no EBML_DLL=no libmatroska.a
- else
--	cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
-+	cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) $(MATROSKA_EXTRA_FLAGS) staticlib
- endif
- 	cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
- 	$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
-1.9.3 (Apple Git-50)
-

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

@@ -1,7 +1,7 @@
-From a92dba6c863f900e315e8d9f24db5ea105c70fbd Mon Sep 17 00:00:00 2001
+From b029c03eb7e80eb37f9d85114785f9687e1173b5 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/11] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 04/10] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---

MobileVLCKit/patches/0006-fix-libtool.patch

@@ -1,7 +1,7 @@
-From c9298cd6fcf5af70c3cc04c9a228b2f3dc2b729d Mon Sep 17 00:00:00 2001
+From 88bef05b41a1c92821111dc6a35bae6b4e8ac664 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 06/11] fix libtool
+Subject: [PATCH 05/10] fix libtool
 
 ---
  modules/arm_neon/Makefile.am    | 4 ++++

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

@@ -1,7 +1,7 @@
-From b52e41081f729602d37b572c87ef5a1457b8cc92 Mon Sep 17 00:00:00 2001
+From 0217000bbffa5809a79bb4c3c91bf458e3873841 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 07/11] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 06/10] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---
@@ -11,10 +11,10 @@ Subject: [PATCH 07/11] freetype: added a fake font lookup mechanism for iOS to
  3 files changed, 45 insertions(+)
 
 diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index e562afc..378df0b 100644
+index 050ace6..4d2e2ad 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
-@@ -1972,6 +1972,8 @@ static int Create( vlc_object_t *p_this )
+@@ -2001,6 +2001,8 @@ static int Create( vlc_object_t *p_this )
  #elif defined( __APPLE__ )
  #if !TARGET_OS_IPHONE
      p_sys->pf_select = MacLegacy_Select;

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

@@ -1,7 +1,7 @@
-From 8b316a7a00877cec90f6fa4b392919acac3b6b03 Mon Sep 17 00:00:00 2001
+From 55e44b84ee349e19354a026548823958a1b29f4a 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 08/11] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 07/10] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---
@@ -45,10 +45,10 @@ index 1c73cf2..68d0b3b 100644
  
  /** \defgroup libvlc_audio LibVLC audio controls
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index c0c66dd..7810ed7 100644
+index 551e3b2..3ce91a0 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -217,6 +217,8 @@ libvlc_video_get_spu_count
+@@ -222,6 +222,8 @@ libvlc_video_get_spu_count
  libvlc_video_get_spu_delay
  libvlc_video_get_spu_description
  libvlc_video_get_teletext
@@ -57,7 +57,7 @@ index c0c66dd..7810ed7 100644
  libvlc_video_get_title_description
  libvlc_video_get_track
  libvlc_video_get_track_count
-@@ -241,6 +243,8 @@ libvlc_video_set_spu
+@@ -246,6 +248,8 @@ libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_subtitle_file
  libvlc_video_set_teletext
@@ -67,10 +67,10 @@ index c0c66dd..7810ed7 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 0f4dda2..544908b 100644
+index cb6b604..2369a57 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -555,6 +555,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -556,6 +556,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);
  

MobileVLCKit/patches/0009-contrib-gcrypt-simplify-compilation-by-disabling-doc.patch

@@ -1,7 +1,7 @@
-From 8cc9aa629810a2007d16aa43a06b33834e967b85 Mon Sep 17 00:00:00 2001
+From 06dd7808b19ae6a98ffc131956e664b0e8f09a65 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/11] contrib/gcrypt: simplify compilation by disabling /doc
+Subject: [PATCH 08/10] contrib/gcrypt: simplify compilation by disabling /doc
  and work-around a libtool limitation
 
 ---

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

@@ -1,7 +1,7 @@
-From 26b1df1443c3d9e4482f3b97a21ee0b81fa06257 Mon Sep 17 00:00:00 2001
+From dd0d581d98f6991f84ecf1123cedaebf72d5ce36 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 10/11] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 09/10] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 10/11] 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 544908b..0697e42 100644
+index 2369a57..4cadb7b 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -526,7 +526,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -20,7 +20,7 @@ index 544908b..0697e42 100644
 +    var_Create (mp, "deinterlace", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
      var_Create (mp, "deinterlace-mode", VLC_VAR_STRING);
  
-     var_Create (mp, "vbi-page", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+     var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
 1.9.3 (Apple Git-50)
 

MobileVLCKit/patches/0010-contrib-ebml-mkv-compile-with-hidden-symbols.patch

@@ -0,0 +1,46 @@
+From 61473a9529a931ad35ee83762967df2f5118610d 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 10/10] contrib/ebml+mkv: compile with hidden symbols
+
+This solves linking issues on iOS and should have no negative impact on further platforms
+---
+ contrib/src/ebml/rules.mak     | 4 ++--
+ contrib/src/matroska/rules.mak | 4 +++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
+index 9d87c29..4a5ac16 100644
+--- a/contrib/src/ebml/rules.mak
++++ b/contrib/src/ebml/rules.mak
+@@ -14,10 +14,10 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
+ 	$(MOVE)
+ 
+ # libebml requires exceptions
+-EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
++EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden" \
+ 					CPPFLAGS=""
+ 
+ .ebml: libebml
+-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
++	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(EBML_EXTRA_FLAGS)
+ 	cd $< && $(MAKE) install
+ 	touch $@
+diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
+index b8d0165..c71ee83 100644
+--- a/contrib/src/matroska/rules.mak
++++ b/contrib/src/matroska/rules.mak
+@@ -16,7 +16,9 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
+ 	$(UNPACK)
+ 	$(MOVE)
+ 
++MATROSKA_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
++
+ .matroska: libmatroska
+-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
++	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(MATROSKA_EXTRA_FLAGS)
+ 	cd $< && $(MAKE) install
+ 	touch $@
+-- 
+1.9.3 (Apple Git-50)
+

MobileVLCKit/patches/0011-contrib-we-always-have-an-FPU-on-iOS.patch

@@ -1,25 +0,0 @@
-From 27317e095618f166c8fd376bdcdab05ee3368d22 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sat, 20 Dec 2014 14:59:47 +0100
-Subject: [PATCH 11/11] contrib: we always have an FPU on iOS
-
----
- contrib/bootstrap | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/bootstrap b/contrib/bootstrap
-index c15d84f..d803717 100755
---- a/contrib/bootstrap
-+++ b/contrib/bootstrap
-@@ -239,7 +239,7 @@ case "${OS}" in
- 			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
- 		else
- 			check_ios_sdk
--			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
-+			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
- 
- 			case "${HOST}" in
- 				*arm*)
-1.9.3 (Apple Git-50)
-

buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=5e3944b44e
+TESTEDHASH=6180218007
 
 usage()
 {