MVK: drop 7 patches, adapt to new build script, update libvlc hash

MobileVLCKit/MobileVLCKit.xcconfig

@@ -10,7 +10,13 @@
 VLC_SRC_DIR=$(PROJECT_DIR)/MobileVLCKit/ImportedSources/vlc
 VLC_PLATFORM[sdk=iphonesimulator*]=Simulator
 VLC_PLATFORM[sdk=iphoneos*]=OS
+
+if test $(CURRENT_ARCH) = "arm64"
+then
+VLC_INSTALL_DIR=$(VLC_SRC_DIR)/install-ios-$(VLC_PLATFORM)/aarch64
+else
 VLC_INSTALL_DIR=$(VLC_SRC_DIR)/install-ios-$(VLC_PLATFORM)/$(CURRENT_ARCH)
+fi
 
 //OTHER_CFLAGS= -ObjC -all_load
 #include "vlc-plugins.xcconfig"

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

@@ -1,7 +1,7 @@
-From dd960cdb919a164de13ed02b7bbbbee12eff7a0e Mon Sep 17 00:00:00 2001
+From 3cc6c146204593aa0c8126b8826d963616da5fa0 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/19] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/12] 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 0938789826068deecc1406d47dd825d87b9981d3 Mon Sep 17 00:00:00 2001
+From 2f66b44786ed087515c333b645e0b7d078ff0f47 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/19] arm_neon: use a macro to fix compilation for iOS
+Subject: [PATCH 02/12] 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 9c968febe108c08eac9cd521f51c863c0d7f5e46 Mon Sep 17 00:00:00 2001
+From 1642887d9553740055cec6fa0efcd2546f5019d5 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/19] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 03/12] 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 fd69a76cabc6a15acf0312e3b5dd8d19927a8185 Mon Sep 17 00:00:00 2001
+From 8caab9d555e771fe6111e086d94b62df4c57c524 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/19] contrib/ebml+mkv: compile with hidden symbols on iOS
+Subject: [PATCH 04/12] 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 852fbfaa3906fb44d0a7f4b15afb9bcaea95ed4f Mon Sep 17 00:00:00 2001
+From 5b98e66f8fd0d477408ad6a15dd714dd3f2d0a2b 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/19] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 05/12] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 05/19] libass: fix text rendering on iOS by providing a font
  1 file changed, 35 insertions(+)
 
 diff --git a/modules/codec/libass.c b/modules/codec/libass.c
-index 5590df1..fff51db 100644
+index f6f14a6..48e8375 100644
 --- a/modules/codec/libass.c
 +++ b/modules/codec/libass.c
 @@ -29,6 +29,13 @@

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

@@ -1,123 +0,0 @@
-From ae36ba388b2dfad83ab856e19f09c0d567d22d3c 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/19] contrib/png: fix ARM assembly for iOS
-
----
- contrib/src/png/ios.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++
- contrib/src/png/rules.mak | 14 +++++++++-
- 2 files changed, 79 insertions(+), 1 deletion(-)
- create mode 100644 contrib/src/png/ios.patch
-
-diff --git a/contrib/src/png/ios.patch b/contrib/src/png/ios.patch
-new file mode 100644
-index 0000000..f4b8bc1
---- /dev/null
-+++ b/contrib/src/png/ios.patch
-@@ -0,0 +1,66 @@
-+diff -ru png/arm/filter_neon.S png-fixed/arm/filter_neon.S
-+--- png/arm/filter_neon.S	2013-06-27 05:25:41.000000000 +0200
-++++ png-fixed/arm/filter_neon.S	2013-07-20 23:33:23.000000000 +0200
-+@@ -46,7 +46,7 @@
-+ \name:
-+ .endm
-+ 
-+-func    png_read_filter_row_sub4_neon, export=1
-++func    _png_read_filter_row_sub4_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+ 1:
-+@@ -62,7 +62,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_sub3_neon, export=1
-++func    _png_read_filter_row_sub3_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+         mov             r0,  r1
-+@@ -88,7 +88,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_up_neon, export=1
-++func    _png_read_filter_row_up_neon, export=1
-+         ldr             r3,  [r0, #4]           @ rowbytes
-+ 1:
-+         vld1.8          {q0}, [r1,:128]
-+@@ -101,7 +101,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_avg4_neon, export=1
-++func    _png_read_filter_row_avg4_neon, export=1
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+ 1:
-+@@ -122,7 +122,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_avg3_neon, export=1
-++func    _png_read_filter_row_avg3_neon, export=1
-+         push            {r4,lr}
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+@@ -173,7 +173,7 @@
-+         vbsl            \rx, \ra, d28
-+ .endm
-+ 
-+-func    png_read_filter_row_paeth4_neon, export=1
-++func    _png_read_filter_row_paeth4_neon, export=1
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-+         vmov.i8         d20, #0
-+@@ -196,7 +196,7 @@
-+         bx              lr
-+ endfunc
-+ 
-+-func    png_read_filter_row_paeth3_neon, export=1
-++func    _png_read_filter_row_paeth3_neon, export=1
-+         push            {r4,lr}
-+         ldr             r12, [r0, #4]           @ rowbytes
-+         vmov.i8         d3,  #0
-diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
-index a63c4e6..fa65363 100644
---- a/contrib/src/png/rules.mak
-+++ b/contrib/src/png/rules.mak
-@@ -7,6 +7,15 @@ ifeq ($(call need_pkg,"libpng"),)
- PKGS_FOUND += png
- endif
- 
-+PNGCONF =
-+ifdef HAVE_IOS
-+ifdef HAVE_ARMV7A
-+PNGCONF = --enable-arm-neon=yes
-+else
-+PNGCONF = --enable-arm-neon=no
-+endif
-+endif
-+
- $(TARBALLS)/libpng-$(PNG_VERSION).tar.xz:
- 	$(call download,$(PNG_URL))
- 
-@@ -17,12 +26,15 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
- 	$(APPLY) $(SRC)/png/winrt.patch
- 	$(APPLY) $(SRC)/png/bins.patch
- 	$(APPLY) $(SRC)/png/automake.patch
-+ifdef HAVE_IOS
-+	$(APPLY) $(SRC)/png/ios.patch
-+endif
- 	$(MOVE)
- 
- DEPS_png = zlib $(DEPS_zlib)
- 
- .png: png
- 	$(RECONF)
--	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(PNGCONF)
- 	cd $< && $(MAKE) install
- 	touch $@
-1.9.3 (Apple Git-50)
-

MobileVLCKit/patches/0012-fix-libtool.patch

@@ -1,7 +1,7 @@
-From 5ff6995bbd1f4727fc5895a8b336e48e714ee497 Mon Sep 17 00:00:00 2001
+From 2305d7d2b7d5b30b9678fee25689020c59575b6f 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 12/19] fix libtool
+Subject: [PATCH 06/12] fix libtool
 
 ---
  modules/arm_neon/Makefile.am    | 4 ++++
@@ -21,7 +21,7 @@ index 4e73a4f..8631f76 100644
  
  libsimple_channel_mixer_neon_plugin_la_SOURCES = \
 diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
-index 3bb8cdb..542abaa 100644
+index b823e9d..6c1a3c0 100644
 --- a/modules/video_filter/Modules.am
 +++ b/modules/video_filter/Modules.am
 @@ -1,3 +1,7 @@

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

@@ -1,51 +0,0 @@
-From a02ded8163ba002fd316a4bf4d53991dfe4f37bf 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 07/19] contrib/flac: fix compilation with clang 5.0
-
----
- contrib/src/flac/libFLAC-clang-5.0.patch | 19 +++++++++++++++++++
- contrib/src/flac/rules.mak               |  1 +
- 2 files changed, 20 insertions(+)
- create mode 100644 contrib/src/flac/libFLAC-clang-5.0.patch
-
-diff --git a/contrib/src/flac/libFLAC-clang-5.0.patch b/contrib/src/flac/libFLAC-clang-5.0.patch
-new file mode 100644
-index 0000000..9fcad0b
---- /dev/null
-+++ b/contrib/src/flac/libFLAC-clang-5.0.patch
-@@ -0,0 +1,19 @@
-+diff -ru flac/configure.ac flac-fixed/configure.ac
-+--- flac/configure.ac	2013-05-27 10:08:57.000000000 +0200
-++++ flac-fixed/configure.ac	2013-10-07 16:56:51.000000000 +0200
-+@@ -381,15 +381,9 @@
-+ 		CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror "
-+ 		fi
-+ 
-+-	if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then
-+ 		CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR"
-+ 		CFLAGS="$CFLAGS -fvisibility=hidden"
-+ 		CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+-		fi
-+-
-+-	if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then
-+-		XIPH_ADD_CFLAGS([-fgnu89-inline])
-+-		fi
-+ 	fi
-+ 
-+ 
-diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
-index bf72caf..ee6c2b5 100644
---- a/contrib/src/flac/rules.mak
-+++ b/contrib/src/flac/rules.mak
-@@ -17,6 +17,7 @@ flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
- 	$(UNPACK)
- 	$(APPLY) $(SRC)/flac/libFLAC-pc.patch
- ifdef HAVE_DARWIN_OS
-+	$(APPLY) $(SRC)/flac/libFLAC-clang-5.0.patch
- 	cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' -i.orig configure
- endif
- ifdef HAVE_ANDROID
-1.9.3 (Apple Git-50)
-

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

@@ -1,7 +1,7 @@
-From 1e6c688206b1f70fb99d6fee28ef97f1d186cbb3 Mon Sep 17 00:00:00 2001
+From 9bde8f6104e9052c43f8fd44b0269f6f4477ef9d 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 13/19] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 07/12] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---
@@ -11,10 +11,10 @@ Subject: [PATCH 13/19] 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 f7fcd80..79bdfd4 100644
+index e562afc..378df0b 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
-@@ -1950,6 +1950,8 @@ static int Create( vlc_object_t *p_this )
+@@ -1972,6 +1972,8 @@ static int Create( vlc_object_t *p_this )
  #elif defined( __APPLE__ )
  #if !TARGET_OS_IPHONE
      p_sys->pf_select = MacLegacy_Select;
@@ -24,7 +24,7 @@ index f7fcd80..79bdfd4 100644
  #elif defined( _WIN32 ) && defined( HAVE_GET_FONT_BY_FAMILY_NAME )
      p_sys->pf_select = Win32_Select;
 diff --git a/modules/text_renderer/platform_fonts.c b/modules/text_renderer/platform_fonts.c
-index 7869dba..2ede6a0 100644
+index 7869dba..deeaa7d 100644
 --- a/modules/text_renderer/platform_fonts.c
 +++ b/modules/text_renderer/platform_fonts.c
 @@ -42,6 +42,9 @@
@@ -53,7 +53,7 @@ index 7869dba..2ede6a0 100644
 +    VLC_UNUSED(i_idx);
 +
 +    CFURLRef fileURL;
-+    fileURL = CFBundleCopyResourceURL(CFBundleGetMainBundle(), 
++    fileURL = CFBundleCopyResourceURL(CFBundleGetMainBundle(),
 +                                      CFSTR("OpenSans-Regular.ttf"),
 +                                      NULL,
 +                                      NULL);

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

@@ -1,30 +0,0 @@
-From 1ac90dccccb8ca1265b24f2ee26b4b4a9943f3b8 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 08/19] lib/media_player: inherit deinterlace and vbi variables
- to fix correct variables values on first use
-
----
- lib/media_player.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/media_player.c b/lib/media_player.c
-index b75006a..5691345 100644
---- a/lib/media_player.c
-+++ b/lib/media_player.c
-@@ -436,10 +436,10 @@ libvlc_media_player_new( libvlc_instance_t *instance )
-     var_SetFloat (mp, "scale", 1.);
-     var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
-     var_Create (mp, "crop", VLC_VAR_STRING);
--    var_Create (mp, "deinterlace", VLC_VAR_INTEGER);
-+    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);
-+    var_Create (mp, "vbi-page", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
- 
-     var_Create (mp, "marq-marquee", VLC_VAR_STRING);
-     var_Create (mp, "marq-color", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-1.9.3 (Apple Git-50)
-

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

@@ -1,7 +1,7 @@
-From 389859bd70e47c210a6a23aabfebecf7299c56e6 Mon Sep 17 00:00:00 2001
+From 5fa1c83ca5425085af10645600ca332a3013eb08 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 18/19] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 08/12] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---
@@ -9,11 +9,11 @@ Subject: [PATCH 18/19] libvlc: add preliminary code path to modify quartztext
  lib/libvlc.sym                     |  4 +++
  lib/media_player.c                 |  6 ++++
  lib/video.c                        | 47 +++++++++++++++++++++++++++++
- modules/text_renderer/quartztext.c | 61 ++++++++++++++++++++++++++++++++------
- 5 files changed, 130 insertions(+), 9 deletions(-)
+ modules/text_renderer/quartztext.c | 60 +++++++++++++++++++++++++++++++++-----
+ 5 files changed, 130 insertions(+), 8 deletions(-)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 94bf7e8..c55e85d 100644
+index 1c73cf2..68d0b3b 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,
@@ -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 5691345..3ca1e10 100644
+index 0f4dda2..544908b 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -465,6 +465,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -555,6 +555,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);
  
@@ -84,10 +84,10 @@ index 5691345..3ca1e10 100644
      var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
      var_Create (mp, "mute", VLC_VAR_BOOL);
 diff --git a/lib/video.c b/lib/video.c
-index 19065fb..8988069 100644
+index 4abe36e..f9d306a 100644
 --- a/lib/video.c
 +++ b/lib/video.c
-@@ -934,3 +934,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -908,3 +908,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  {
      return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
  }
@@ -139,7 +139,7 @@ index 19065fb..8988069 100644
 +    return get_string( p_mi, "quartztext", textrenderer_option_bynumber(option) );
 +}
 diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
-index 8de1081..112e952 100644
+index 3b8e6ca..d81b531 100644
 --- a/modules/text_renderer/quartztext.c
 +++ b/modules/text_renderer/quartztext.c
 @@ -65,6 +65,10 @@
@@ -153,7 +153,7 @@ index 8de1081..112e952 100644
  static int LoadFontsFromAttachments(filter_t *p_filter);
  
  static int RenderText(filter_t *, subpicture_region_t *,
-@@ -128,14 +132,17 @@ vlc_module_begin ()
+@@ -131,16 +135,20 @@ vlc_module_begin ()
  
      add_string("quartztext-font", DEFAULT_FONT, FONT_TEXT, FONT_LONGTEXT,
                false)
@@ -167,13 +167,15 @@ index 8de1081..112e952 100644
                   COLOR_LONGTEXT, false)
 +        change_safe()
          change_integer_list(pi_color_values, ppsz_color_descriptions)
+     add_bool("quartztext-outline", false, OUTLINE_TEXT, NULL, false)
+     add_bool("quartztext-shadow", true, SHADOW_TEXT, NULL, false)
      set_capability("text renderer", 50)
--    add_shortcut("text")
+     add_shortcut("text")
 +    add_shortcut("quartztext")
      set_callbacks(Create, Destroy)
  vlc_module_end ()
  
-@@ -177,7 +184,8 @@ struct offscreen_bitmap_t
+@@ -182,7 +190,8 @@ struct offscreen_bitmap_t
   *****************************************************************************/
  struct filter_sys_t
  {
@@ -183,7 +185,7 @@ index 8de1081..112e952 100644
      uint8_t        i_font_opacity;
      int            i_font_color;
      int            i_font_size;
-@@ -202,9 +210,9 @@ static int Create(vlc_object_t *p_this)
+@@ -209,9 +218,9 @@ static int Create(vlc_object_t *p_this)
      p_filter->p_sys = p_sys = malloc(sizeof(filter_sys_t));
      if (!p_sys)
          return VLC_ENOMEM;
@@ -192,10 +194,10 @@ index 8de1081..112e952 100644
      p_sys->i_font_opacity = 255;
 -    p_sys->i_font_color = VLC_CLIP(var_CreateGetInteger(p_this, "quartztext-color") , 0, 0xFFFFFF);
 +    p_sys->i_font_color = VLC_CLIP(var_CreateGetIntegerCommand(p_this, "quartztext-color") , 0, 0xFFFFFF);
+     p_sys->b_outline = var_InheritBool(p_this, "quartztext-outline");
+     p_sys->b_shadow = var_InheritBool(p_this, "quartztext-shadow");
      p_sys->i_font_size = GetFontSize(p_filter);
- 
-     p_filter->pf_render_text = RenderText;
-@@ -215,6 +223,11 @@ static int Create(vlc_object_t *p_this)
+@@ -224,6 +233,11 @@ static int Create(vlc_object_t *p_this)
      p_sys->i_fonts = 0;
  #endif
  
@@ -207,7 +209,7 @@ index 8de1081..112e952 100644
      LoadFontsFromAttachments(p_filter);
  
      return VLC_SUCCESS;
-@@ -229,6 +242,16 @@ static void Destroy(vlc_object_t *p_this)
+@@ -238,6 +252,16 @@ static void Destroy(vlc_object_t *p_this)
  {
      filter_t *p_filter = (filter_t *)p_this;
      filter_sys_t *p_sys = p_filter->p_sys;
@@ -224,7 +226,7 @@ index 8de1081..112e952 100644
  #ifndef TARGET_OS_IPHONE
      if (p_sys->p_fonts) {
          for (int k = 0; k < p_sys->i_fonts; k++) {
-@@ -236,8 +259,8 @@ static void Destroy(vlc_object_t *p_this)
+@@ -245,8 +269,8 @@ static void Destroy(vlc_object_t *p_this)
  
          free(p_sys->p_fonts);
      }
@@ -234,7 +236,7 @@ index 8de1081..112e952 100644
      free(p_sys);
  }
  
-@@ -949,12 +972,12 @@ static int GetFontSize(filter_t *p_filter)
+@@ -1001,12 +1025,12 @@ static int GetFontSize(filter_t *p_filter)
  {
      int i_size = 0;
  
@@ -250,7 +252,7 @@ index 8de1081..112e952 100644
          msg_Warn( p_filter, "invalid fontsize, using 12" );
          i_size = 12;
      }
-@@ -1041,3 +1064,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
+@@ -1092,3 +1116,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
  
      return VLC_SUCCESS;
  }

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

@@ -1,25 +0,0 @@
-From 954239e53d2615a2713fee71fa4923ca671b5eea 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 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 0ad6ac6..56fd34f 100644
---- a/contrib/src/ffmpeg/rules.mak
-+++ b/contrib/src/ffmpeg/rules.mak
-@@ -1,7 +1,7 @@
- # FFmpeg
- 
- #Uncomment the one you want
--#USE_LIBAV ?= 1
-+USE_LIBAV ?= 1
- #USE_FFMPEG ?= 1
- 
- ifdef USE_FFMPEG
-1.9.3 (Apple Git-50)
-

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

@@ -1,37 +1,27 @@
-From f2ddd8e147a08fc63b01609d6028ebd8d7327fe6 Mon Sep 17 00:00:00 2001
+From 2e46f094ef87fe0c40b0add12d5a3dd3aea113e4 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 17/19] contrib/gcrypt: use git version on iOS
+Date: Sun, 7 Dec 2014 20:02:18 +0100
+Subject: [PATCH 09/12] contrib/gcrypt: simplify compilation by disabling /doc
+ and work-around a libtool limitation
 
 ---
  contrib/src/gcrypt/disable-doc-compilation.patch   | 43 ++++++++++++++++++++++
- contrib/src/gcrypt/rules.mak                       | 14 ++++++-
+ contrib/src/gcrypt/rules.mak                       |  2 +
  .../gcrypt/work-around-libtool-limitation.patch    | 25 +++++++++++++
- 3 files changed, 81 insertions(+), 1 deletion(-)
+ 3 files changed, 70 insertions(+)
  create mode 100644 contrib/src/gcrypt/disable-doc-compilation.patch
  create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
 
 diff --git a/contrib/src/gcrypt/disable-doc-compilation.patch b/contrib/src/gcrypt/disable-doc-compilation.patch
 new file mode 100644
-index 0000000..e63224e
+index 0000000..7113a31
 --- /dev/null
 +++ b/contrib/src/gcrypt/disable-doc-compilation.patch
 @@ -0,0 +1,43 @@
-+From 18ac3f6a6e0ab9fe353ee8b5ab2b34ef5ce500d7 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:34:15 +0100
-+Subject: [PATCH] disable doc compilation
-+
-+---
-+ Makefile.am  | 6 +++---
-+ configure.ac | 1 -
-+ 2 files changed, 3 insertions(+), 4 deletions(-)
-+
-+diff --git a/Makefile.am b/Makefile.am
-+index f1dbd09..9e0abd6 100644
-+--- a/Makefile.am
-++++ b/Makefile.am
-+@@ -25,10 +25,10 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon \
++diff -ru libgcrypt/Makefile.am libgcrypt/Makefile.am
++--- libgcrypt/Makefile.am	2014-08-18 08:46:51.000000000 +0200
+++++ libgcrypt/Makefile.am	2014-12-07 19:54:02.000000000 +0100
++@@ -25,11 +25,11 @@
 + # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 + GITLOG_TO_CHANGELOG=gitlog-to-changelog
 + 
@@ -39,17 +29,19 @@ index 0000000..e63224e
 +-SUBDIRS =         compat mpi cipher random src doc tests
 ++DIST_SUBDIRS = m4 compat mpi cipher random src tests
 ++SUBDIRS =         compat mpi cipher random src tests
-+ EXTRA_DIST = autogen.sh README.GIT 					\
-+-             ChangeLog-2011 scripts/ChangeLog-2011 doc/ChangeLog-2011 	\
-++             ChangeLog-2011 scripts/ChangeLog-2011 	\
-+              m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \
++ 
++ EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES      	           \
++-             ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
++              m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011    \
 +              random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
-+              scripts/git-log-footer scripts/git-log-fix
-+diff --git a/configure.ac b/configure.ac
-+index e3471d0..6fa4ad6 100644
-+--- a/configure.ac
-++++ b/configure.ac
-+@@ -1799,7 +1799,6 @@ compat/Makefile
++              build-aux/git-log-footer build-aux/git-log-fix
++Only in libgcrypt: Makefile.am.orig
++Only in libgcrypt: Makefile.am.rej
++diff -ru libgcrypt-raw/configure.ac libgcrypt/configure.ac
++--- libgcrypt-raw/configure.ac	2014-12-07 19:51:54.000000000 +0100
+++++ libgcrypt/configure.ac	2014-12-07 19:52:48.000000000 +0100
++@@ -2043,7 +2043,6 @@
 + mpi/Makefile
 + cipher/Makefile
 + random/Makefile
@@ -57,52 +49,31 @@ index 0000000..e63224e
 + src/Makefile
 + src/gcrypt.h
 + src/libgcrypt-config
-+-- 
-+1.8.3.4 (Apple Git-47)
-+
++diff -ru libgcrypt-raw/configure.ac.orig libgcrypt/configure.ac.orig
++--- libgcrypt-raw/configure.ac.orig	2014-12-07 19:51:54.000000000 +0100
+++++ libgcrypt/configure.ac.orig	2014-12-07 19:52:37.000000000 +0100
++@@ -1219,7 +1219,7 @@
++           AC_COMPILE_IFELSE([AC_LANG_SOURCE(
++             [[__asm__("xorl \$(123456789/12345678), %ebp;\n\t");]])],
++             [gcry_cv_gcc_as_const_division_with_wadivide_ok=yes])])
++-    if test "$gcry_cv_gcc_as_const_division_ok_with_wadivide_ok" = "no" ; then
++       # '-Wa,--divide' did not work, restore old flags.
++       CPPFLAGS="$_gcc_cppflags_save"
++     fi
 diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 7e67319..8773aa1 100644
+index 4b2cce0..a3f1545 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
-@@ -1,6 +1,7 @@
- # GCRYPT
- GCRYPT_VERSION := 1.6.2
- GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-+GCRYPT_GITURL := git://git.gnupg.org/libgcrypt.git
- 
- PKGS += gcrypt
- 
-@@ -9,11 +10,22 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
- 
- .sum-gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
- 
-+$(TARBALLS)/libgcrypt-git.tar.xz:
-+	$(call download_git,$(GCRYPT_GITURL),,d1cadd145)
-+
-+ifndef HAVE_IOS
- libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
+@@ -13,6 +13,8 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
  	$(UNPACK)
  	$(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
  	$(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
- 	$(MOVE)
-+else
-+libgcrypt: libgcrypt-git.tar.xz
-+	$(UNPACK)
-+	$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
 +	$(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
-+	$(MOVE)
-+endif
++	$(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
+ 	$(MOVE)
  
  DEPS_gcrypt = gpg-error
- 
-@@ -47,6 +59,6 @@ endif
- 
- .gcrypt: libgcrypt
- 	$(RECONF)
--	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" ./configure $(HOSTCONF) $(GCRYPT_CONF)
-+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GCRYPT_CONF)
- 	cd $< && $(MAKE) install
- 	touch $@
 diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
 new file mode 100644
 index 0000000..df97ffb

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

@@ -1,23 +1,25 @@
-From d26112e91e3ba08f07a7c59214fa04667392ba00 Mon Sep 17 00:00:00 2001
+From 69e310b8146952263d6f29e4d3bb91fa74ba2036 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 10/19] contrib/opus disable asm on arm
+Subject: [PATCH 10/12] contrib/opus: disable asm for arm64
 
 ---
- contrib/src/opus/rules.mak | 3 +++
- 1 file changed, 3 insertions(+)
+ contrib/src/opus/rules.mak | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/contrib/src/opus/rules.mak b/contrib/src/opus/rules.mak
-index 56f0933..273521f 100644
+index 56f0933..36b5c49 100644
 --- a/contrib/src/opus/rules.mak
 +++ b/contrib/src/opus/rules.mak
-@@ -23,6 +23,9 @@ OPUS_CONF= --disable-extra-programs --disable-doc
+@@ -23,6 +23,11 @@ OPUS_CONF= --disable-extra-programs --disable-doc
  ifndef HAVE_FPU
  OPUS_CONF += --enable-fixed-point
  endif
 +ifdef HAVE_IOS
++ifndef HAVE_ARMV7A
 +OPUS_CONF += --disable-asm
 +endif
++endif
  
  .opus: opus
  	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(OPUS_CONF)

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

@@ -1,26 +0,0 @@
-From 2873ae8263670b9f335d9f8bb8d7ccece7dc3310 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 11/19] contrib/gcrypt: disable asm on iOS
-
----
- contrib/src/gcrypt/rules.mak | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 0cc1222..7e67319 100644
---- a/contrib/src/gcrypt/rules.mak
-+++ b/contrib/src/gcrypt/rules.mak
-@@ -31,6 +31,9 @@ GCRYPT_EXTRA_CFLAGS =
- endif
- ifdef HAVE_MACOSX
- GCRYPT_CONF += --disable-aesni-support
-+ifdef HAVE_IOS
-+GCRYPT_CONF += --disable-asm
-+endif
- else
- ifdef HAVE_BSD
- GCRYPT_CONF += --disable-asm --disable-aesni-support
-1.9.3 (Apple Git-50)
-

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

@@ -1,7 +1,7 @@
-From d665f7424cab347a425e7680618e5d3847df8f08 Mon Sep 17 00:00:00 2001
+From c6804351fe40b6998cadcf690b09659e0c52a468 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 16/19] contrib/harfbuzz: work-around build system stupidity
+Subject: [PATCH 11/12] contrib/harfbuzz: work-around build system stupidity
  breaking clang compilation
 
 ---
@@ -33,7 +33,7 @@ index 0000000..59d1e06
 + 
 + AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes")
 diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
-index a34ee2b..30e9a2b 100644
+index c6a84a6..e9ea233 100644
 --- a/contrib/src/harfbuzz/rules.mak
 +++ b/contrib/src/harfbuzz/rules.mak
 @@ -16,6 +16,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz

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

@@ -0,0 +1,26 @@
+From 8b3871a0886cdb5f54e9c0e9a730f5b9868bfd44 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 12/12] 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 544908b..0697e42 100644
+--- a/lib/media_player.c
++++ b/lib/media_player.c
+@@ -526,7 +526,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);
+-    var_Create (mp, "deinterlace", VLC_VAR_INTEGER);
++    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);
+-- 
+1.9.3 (Apple Git-50)
+

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

@@ -1,28 +0,0 @@
-From 407b787ae87531dc69baf3399cc566000e2bf415 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 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 3cc2b15..049565d 100644
---- a/contrib/src/speexdsp/rules.mak
-+++ b/contrib/src/speexdsp/rules.mak
-@@ -36,6 +36,11 @@ ifeq ($(ARCH),arm)
- SPEEXDSP_CONF += --enable-arm5e-asm
- endif
- endif
-+ifdef HAVE_IOS
-+ifndef HAVE_ARMV7A
-+SPEEXDSP_CONF += --disable-neon
-+endif
-+endif
- 
- .speexdsp: speexdsp
- 	mkdir -p $</m4 && $(RECONF)
-1.9.3 (Apple Git-50)
-

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

@@ -1,83 +0,0 @@
-From 6a1817276018208220de6eb87aacd413d02ebcd2 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 15/19] contrib: add arch option for platforms where the arch
- triplet would be ambigous
-
----
- contrib/bootstrap    | 16 +++++++++++++++-
- contrib/src/main.mak |  2 ++
- 2 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/bootstrap b/contrib/bootstrap
-index b77a9d9..86d4b9e 100755
---- a/contrib/bootstrap
-+++ b/contrib/bootstrap
-@@ -31,6 +31,7 @@ usage()
- 	echo "  --disable-sout   configure to not build stream output packages"
- 	echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
- 	echo "  --disable-gpl    configure to not build viral GPL code"
-+	echo "  --arch=ARCH      configure to set the target architecture if host triple is ambigous"
- }
- 
- BUILD=
-@@ -42,6 +43,7 @@ BUILD_ENCODERS="1"
- BUILD_NETWORK="1"
- BUILD_DISCS="1"
- GPL="1"
-+ARCH=
- 
- if test ! -f "../../contrib/src/main.mak"
- then
-@@ -86,6 +88,9 @@ do
- 		--enable-*)
- 			PKGS_ENABLE="${PKGS_ENABLE} ${1#--enable-}"
- 			;;
-+		--arch=*)
-+			ARCH="${1#--arch=}"
-+			;;
- 		*)
- 			echo "Unrecognized options $1"
- 			usage
-@@ -222,6 +227,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
- test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
- test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
- test -z "$GPL" || add_make_enabled "GPL"
-+test -z "$ARCH" || add_make "ARCH := $ARCH"
- 
- #
- # Checks
-@@ -235,7 +241,15 @@ 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" "HAVE_NEON" "HAVE_ARMV7A"
-+			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
-+			case "${ARCH}" in
-+			*arm*)
-+				add_make_enabled "HAVE_NEON"
-+				if [ "$ARCH" != "arm64" ]; then
-+				add_make_enabled "HAVE_ARMV7A"
-+				fi
-+				;;
-+			esac
- 		fi
- 		;;
- 	*bsd*)
-diff --git a/contrib/src/main.mak b/contrib/src/main.mak
-index dd2bd25..2b085ea 100644
---- a/contrib/src/main.mak
-+++ b/contrib/src/main.mak
-@@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
- ifneq ($(HOST),$(BUILD))
- HAVE_CROSS_COMPILE = 1
- endif
-+ifndef ARCH
- ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
-+endif
- 
- ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
- HAVE_WIN64 := 1
-1.9.3 (Apple Git-50)
-

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

@@ -1,29 +0,0 @@
-From 259913e58d83b99bae60546010648f515b4e5d07 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 19/19] contrib/speex: fix compilation for non-ARMv7 iOS
- targets
-
----
- 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 fd90cde..a3d9ea3 100644
---- a/contrib/src/speex/rules.mak
-+++ b/contrib/src/speex/rules.mak
-@@ -37,6 +37,11 @@ endif
- ifeq ($(ARCH),aarch64)
- SPEEX_CONF += --disable-neon
- endif
-+ifdef HAVE_IOS
-+ifndef HAVE_ARMV7A
-+SPEEX_CONF += --disable-neon
-+endif
-+endif
- 
- .speex: speex
- 	mkdir -p $</m4 && $(RECONF)
-1.9.3 (Apple Git-50)
-

buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=ee7783e6a
+TESTEDHASH=8d48e95e9
 
 usage()
 {
@@ -137,7 +137,7 @@ spushd MobileVLCKit/ImportedSources
 
 if [ "$NONETWORK" != "yes" ]; then
 if ! [ -e vlc ]; then
-git clone git://git.videolan.org/vlc/vlc-2.2.git vlc
+git clone git://git.videolan.org/vlc.git vlc
 info "Applying patches to vlc-2.2.git"
 cd vlc
 git checkout -B localBranch ${TESTEDHASH}
@@ -187,7 +187,7 @@ buildMobileKit() {
         args="${args} -s"
         ./build.sh -a i386 ${args} -k "${SDK}" && ./build.sh -a x86_64 ${args} -k "${SDK}"
     else
-        ./build.sh -a armv7 ${args} -k "${SDK}" && ./build.sh -a armv7s ${args} -k "${SDK}" && ./build.sh -a arm64 ${args} -k "${SDK}"
+        ./build.sh -a armv7 ${args} -k "${SDK}" && ./build.sh -a armv7s ${args} -k "${SDK}" && ./build.sh -a aarch64 ${args} -k "${SDK}"
     fi
 
     spopd