MVK: update libvlc and remove 2 more patches

MobileVLCKit/AggregateStaticPlugins.sh

@@ -47,10 +47,10 @@ DEFINITION=""
 
 for file in $VLC_MODULES; do
   name=`echo $file | sed 's/.*\/lib//' | sed 's/_plugin\.a//'`
-  DEFINITION+="int vlc_entry__$name (int (*)(void *, void *, int, ...), void *);\n";
-  BUILTINS+=" vlc_entry__$name,\n"
+  symbol=`nm -g $file | grep _vlc_entry__|cut -d" " -f 3|sed 's/_vlc_entry/vlc_entry/'`
+  DEFINITION+="int $symbol (int (*)(void *, void *, int, ...), void *);\n";
+  BUILTINS+=" $symbol,\n"
   LDFLAGS+="\$(VLC_INSTALL_DIR)/lib/vlc/plugins/lib${name}_plugin.a "
-  echo $name
 done;
 
 BUILTINS="$BUILTINS NULL\n};\n"

MobileVLCKit/MobileVLCKit.xcconfig

@@ -36,6 +36,7 @@ TAGLIB=$(VLC_CONTRIB_DIR)/lib/libtag.a $(VLC_CONTRIB_DIR)/lib/libtag_c.a
 VPX=$(VLC_CONTRIB_DIR)/lib/libvpx.a
 XML=$(VLC_CONTRIB_DIR)/lib/libxml2.a
 ZLIB=$(VLC_CONTRIB_DIR)/lib/libz.a
+SSH=$(VLC_CONTRIB_DIR)/lib/libssh2.a
 ZVBI=$(VLC_CONTRIB_DIR)/lib/libzvbi.a
 
-OTHER_LIBTOOLFLAGS=$(ASS) $(AVCODEC) $(DVBPSI) $(FLAC) $(FRIBIDI) $(FREETYPE) $(GCRYPT) $(HARFBUZZ) $(LIVE555) $(MKV) $(MODPLUG) $(MP3) $(OGG) $(OPUS) $(PICS) $(SPEEX) $(TAGLIB) $(XML) $(VPX) $(ZLIB) $(ZVBI) $(VLC_INSTALL_DIR)/lib/vlc/libcompat.a  $(VLC_INSTALL_DIR)/lib/libvlc.a $(VLC_INSTALL_DIR)/lib/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)
+OTHER_LIBTOOLFLAGS=$(ASS) $(AVCODEC) $(DVBPSI) $(FLAC) $(FRIBIDI) $(FREETYPE) $(GCRYPT) $(HARFBUZZ) $(LIVE555) $(MKV) $(MODPLUG) $(MP3) $(OGG) $(OPUS) $(PICS) $(SPEEX) $(TAGLIB) $(XML) $(VPX) $(SSH) $(ZLIB) $(ZVBI) $(VLC_INSTALL_DIR)/lib/vlc/libcompat.a  $(VLC_INSTALL_DIR)/lib/libvlc.a $(VLC_INSTALL_DIR)/lib/libvlccore.a $(VLC_PLUGINS_LDFLAGS) $(OTHER_CFLAGS)

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

@@ -1,7 +1,7 @@
-From 069aeedc8e73bb33dab972d561f19a289824fbfb Mon Sep 17 00:00:00 2001
+From 68f56be85e97978a87b3f908c5832aa2b7c64f20 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/10] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 1/8] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

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

@@ -1,7 +1,7 @@
-From d87f33407824e5b3153235019517e1a98f399346 Mon Sep 17 00:00:00 2001
+From 4177ee03f9ec6a4cf43cf3c76c6117c900568028 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/10] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 2/8] arm_neon: use a macro to fix compilation for iOS
 
 ---
  modules/arm_neon/amplify.S              |  9 +++---
@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
  	pop {r4,pc}
 +endfunc
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

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

@@ -1,8 +1,7 @@
-From 85f19afa64a6ecef38d803a1b0eabf262d5844d2 Mon Sep 17 00:00:00 2001
+From 59e63eb017856cb8cd098b4ba234a67c2ea71d73 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/10] deinterlace/merge: use a macro to fix compilation for
- iOS
+Subject: [PATCH 3/8] deinterlace/merge: use a macro to fix compilation for iOS
 
 ---
  modules/video_filter/deinterlace/merge_arm.S | 26 ++++++++++----------------
@@ -82,5 +81,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

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

@@ -1,7 +1,7 @@
-From b029c03eb7e80eb37f9d85114785f9687e1173b5 Mon Sep 17 00:00:00 2001
+From 8b2317ff84a4de42682b03c1c1b10876ab51ca6f 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 04/10] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 4/8] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -62,5 +62,5 @@ index f6f14a6..48e8375 100644
      const char *psz_font = NULL; /* We don't ship a default font with VLC */
      const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

MobileVLCKit/patches/0005-fix-libtool.patch

@@ -1,37 +0,0 @@
-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 05/10] fix libtool
-
----
- modules/arm_neon/Makefile.am    | 4 ++++
- modules/video_filter/Modules.am | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
-index 4e73a4f..8631f76 100644
---- a/modules/arm_neon/Makefile.am
-+++ b/modules/arm_neon/Makefile.am
-@@ -1,3 +1,7 @@
-+# When using a specific AS tool instead of gcc libtool goes mad
-+# without this. (This is the case with iOS).
-+LIBTOOL=@LIBTOOL@ --tag=CC
-+
- neondir = $(pluginsdir)/arm_neon
- 
- libsimple_channel_mixer_neon_plugin_la_SOURCES = \
-diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
-index b823e9d..6c1a3c0 100644
---- a/modules/video_filter/Modules.am
-+++ b/modules/video_filter/Modules.am
-@@ -1,3 +1,7 @@
-+# When using a specific AS tool instead of gcc libtool goes mad
-+# without this. (This is the case with iOS).
-+LIBTOOL=@LIBTOOL@ --tag=CC
-+
- SOURCES_mosaic = mosaic.c mosaic.h
- SOURCES_transform = transform.c
- SOURCES_invert = invert.c
-1.9.3 (Apple Git-50)
-

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

@@ -1,7 +1,7 @@
-From 0217000bbffa5809a79bb4c3c91bf458e3873841 Mon Sep 17 00:00:00 2001
+From dab5e4ac0ac51b3bdab517146dfa1f246f9242a1 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 06/10] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 5/8] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---
@@ -11,10 +11,10 @@ Subject: [PATCH 06/10] 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 050ace6..4d2e2ad 100644
+index 8d314fe..fe645d8 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
-@@ -2001,6 +2001,8 @@ static int Create( vlc_object_t *p_this )
+@@ -2000,6 +2000,8 @@ static int Create( vlc_object_t *p_this )
  #elif defined( __APPLE__ )
  #if !TARGET_OS_IPHONE
      p_sys->pf_select = MacLegacy_Select;
@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
  #endif
  
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

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

@@ -1,7 +1,7 @@
-From 55e44b84ee349e19354a026548823958a1b29f4a Mon Sep 17 00:00:00 2001
+From 65a335725ebe4fbff6e2ae8b53f9f9aadccf3768 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 07/10] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 6/8] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---
@@ -13,7 +13,7 @@ Subject: [PATCH 07/10] libvlc: add preliminary code path to modify quartztext
  5 files changed, 130 insertions(+), 8 deletions(-)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 1c73cf2..68d0b3b 100644
+index 3f9441c..81b5ce3 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
 @@ -1383,6 +1383,27 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -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 551e3b2..3ce91a0 100644
+index 4fd2378..25aaa16 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -222,6 +222,8 @@ libvlc_video_get_spu_count
+@@ -223,6 +223,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 551e3b2..3ce91a0 100644
  libvlc_video_get_title_description
  libvlc_video_get_track
  libvlc_video_get_track_count
-@@ -246,6 +248,8 @@ libvlc_video_set_spu
+@@ -247,6 +249,8 @@ libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_subtitle_file
  libvlc_video_set_teletext
@@ -67,7 +67,7 @@ index 551e3b2..3ce91a0 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index cb6b604..2369a57 100644
+index b41d6f3..19b447d 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -556,6 +556,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -277,5 +277,5 @@ index 3b8e6ca..d81b531 100644
 +    return VLC_SUCCESS;
 +}
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

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

@@ -1,7 +1,7 @@
-From 06dd7808b19ae6a98ffc131956e664b0e8f09a65 Mon Sep 17 00:00:00 2001
+From 848557aa993edb31b4cb04930ca28ff39025859d 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 08/10] contrib/gcrypt: simplify compilation by disabling /doc
+Subject: [PATCH 7/8] contrib/gcrypt: simplify compilation by disabling /doc
  and work-around a libtool limitation
 
 ---
@@ -106,5 +106,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

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

@@ -1,15 +1,15 @@
-From dd0d581d98f6991f84ecf1123cedaebf72d5ce36 Mon Sep 17 00:00:00 2001
+From 53afc60a3e1c4c9a52eb38c3fce2f8b4be4d334a 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 09/10] lib/media player: inherit deinterlace variable to
- achieve correct value on first use
+Subject: [PATCH 8/8] lib/media player: inherit deinterlace variable to achieve
+ correct value on first use
 
 ---
  lib/media_player.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 2369a57..4cadb7b 100644
+index 19b447d..73d7277 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -526,7 +526,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -22,5 +22,5 @@ index 2369a57..4cadb7b 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-1.9.3 (Apple Git-50)
+2.3.0
 

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

@@ -1,46 +0,0 @@
-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)
-

buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=457b73154
+TESTEDHASH=987df6dc0d3
 
 usage()
 {