MVK: update libvlc

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

@@ -1,4 +1,4 @@
-From 9715479c904379a1c968cdde6ceb93e50c13f134 Mon Sep 17 00:00:00 2001
+From ed34140a4f724e1b29defbfbeb19d271a8827fb3 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 1/9] arm_neon: added function macro to handle the underscore
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.3.2
+2.4.1
 

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

@@ -1,4 +1,4 @@
-From 298b8b2c8652d9b448a9f98ebf32ff313c579999 Mon Sep 17 00:00:00 2001
+From a9394e72516672b7bfcf7f9dcc19af1cfbb52e91 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 2/9] arm_neon: use a macro to fix compilation for iOS
@@ -204,5 +204,5 @@ index dcc51ed..4722be4 100644
  	pop {r4,pc}
 +endfunc
 -- 
-2.3.2
+2.4.1
 

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

@@ -1,4 +1,4 @@
-From d1695f7626f33421054fb4dae1aeca05baa225b0 Mon Sep 17 00:00:00 2001
+From 0666a80310b0a240d93b5d4af768d3389cd09988 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 3/9] deinterlace/merge: use a macro to fix compilation for iOS
@@ -81,5 +81,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.3.2
+2.4.1
 

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

@@ -1,7 +1,7 @@
-From 17ea3a20cabb373c35ef6722e3e02c9a217869ff Mon Sep 17 00:00:00 2001
+From 5c8095dc08a329c95f0c3f157f80b71668b9bffd 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/18] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 4/9] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 04/18] libass: fix text rendering on iOS by providing a font
  1 file changed, 38 insertions(+)
 
 diff --git a/modules/codec/libass.c b/modules/codec/libass.c
-index 8e32d64..7f20def 100644
+index 067ef6b..8460dad 100644
 --- a/modules/codec/libass.c
 +++ b/modules/codec/libass.c
 @@ -29,6 +29,13 @@

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

@@ -1,4 +1,4 @@
-From afeda4a80a110924d48502af4c9f2ce4c93c27d9 Mon Sep 17 00:00:00 2001
+From b89233daef3b4f35c79d145fb031b2f1aa3f6de8 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 5/9] freetype: added a fake font lookup mechanism for iOS to
@@ -11,10 +11,10 @@ Subject: [PATCH 5/9] 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 8d314fe..fe645d8 100644
+index 2773779..3bca706 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
-@@ -2000,6 +2000,8 @@ static int Create( vlc_object_t *p_this )
+@@ -1280,6 +1280,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
  
 -- 
-2.3.2
+2.4.1
 

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

@@ -1,4 +1,4 @@
-From fc9aca281a2d103b78b6004297b49636a0069ac7 Mon Sep 17 00:00:00 2001
+From 15e072de534aa926b75a2b0dd4df60a09e2ba616 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 6/9] libvlc: add preliminary code path to modify quartztext
@@ -13,10 +13,10 @@ Subject: [PATCH 6/9] 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 3f9441c..81b5ce3 100644
+index 9939cfe..fac613a 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,
+@@ -1387,6 +1387,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 );
  
@@ -45,10 +45,10 @@ index 3f9441c..81b5ce3 100644
  
  /** \defgroup libvlc_audio LibVLC audio controls
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index 1e241e7..ab1e3e8 100644
+index c0c206f..76473f9 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -224,6 +224,8 @@ libvlc_video_get_spu_count
+@@ -225,6 +225,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 1e241e7..ab1e3e8 100644
  libvlc_video_get_title_description
  libvlc_video_get_track
  libvlc_video_get_track_count
-@@ -248,6 +250,8 @@ libvlc_video_set_spu
+@@ -249,6 +251,8 @@ libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_subtitle_file
  libvlc_video_set_teletext
@@ -67,7 +67,7 @@ index 1e241e7..ab1e3e8 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index b41d6f3..19b447d 100644
+index 2b340d4..99b8f98 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
 @@ -556,6 +556,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -84,10 +84,10 @@ index b41d6f3..19b447d 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 4abe36e..f9d306a 100644
+index b2c9b34..588aa1d 100644
 --- a/lib/video.c
 +++ b/lib/video.c
-@@ -908,3 +908,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -910,3 +910,50 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  {
      return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
  }
@@ -277,5 +277,5 @@ index 3b8e6ca..d81b531 100644
 +    return VLC_SUCCESS;
 +}
 -- 
-2.3.2
+2.4.1
 

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

@@ -1,4 +1,4 @@
-From 2abccdbedc8b0bf802af7747fb240530509ec1b7 Mon Sep 17 00:00:00 2001
+From 29e68bc2fc0137343c9aa38f32e9646ef40af9fb 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 7/9] contrib/gcrypt: simplify compilation by disabling /doc
@@ -106,5 +106,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.3.2
+2.4.1
 

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

@@ -1,4 +1,4 @@
-From c9d7c5a322e520b9214c66d85005a484e400ebed Mon Sep 17 00:00:00 2001
+From 12c8b711f38360152ece560cc5a2352d6a820bda 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 8/9] lib/media player: inherit deinterlace variable to achieve
@@ -9,7 +9,7 @@ Subject: [PATCH 8/9] lib/media player: inherit deinterlace variable to achieve
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 19b447d..73d7277 100644
+index 99b8f98..45c74ea 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 19b447d..73d7277 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.3.2
+2.4.1
 

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

@@ -1,4 +1,4 @@
-From 05bf84ae1c8befddec7b0097425dc363844bc5dc Mon Sep 17 00:00:00 2001
+From 17db4568d2eee67c59c1fbed39bda55a09d97d0e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 18 Feb 2015 21:35:16 +0100
 Subject: [PATCH 9/9] arm_neon: work-around libtool issue
@@ -18,5 +18,5 @@ index 4e73a4f..43ef527 100644
  
  libsimple_channel_mixer_neon_plugin_la_SOURCES = \
 -- 
-2.3.2
+2.4.1
 

MobileVLCKit/patches/0016-contrib-vpx-fix-x86-iOS-simulator-compilation.patch

@@ -1,47 +0,0 @@
-From cd465718524c4dd72569e1c9c2f0f238519d763b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sat, 2 May 2015 13:34:05 +0200
-Subject: [PATCH 16/16] contrib/vpx: fix x86 iOS simulator compilation
-
----
- contrib/src/vpx/libvpx-ios.patch | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
-index 852792d..ca3d721 100644
---- a/contrib/src/vpx/libvpx-ios.patch
-+++ b/contrib/src/vpx/libvpx-ios.patch
-@@ -1,6 +1,6 @@
--diff -ru libvpx/build/make/configure.sh libvpx/build/make/configure.sh
----- libvpx/build/make/configure.sh	2014-11-04 21:34:04.000000000 +0100
--+++ libvpx/build/make/configure.sh	2014-11-04 21:36:12.000000000 +0100
-+diff -ru libvpx/build/make/configure.sh libvpx-fi/build/make/configure.sh
-+--- libvpx/build/make/configure.sh	2015-05-02 13:31:42.000000000 +0200
-++++ libvpx-fi/build/make/configure.sh	2015-05-02 13:31:26.000000000 +0200
- @@ -714,59 +714,6 @@
-      # PIC is probably what we want when building shared libs
-      enabled shared && soft_enable pic
-@@ -61,7 +61,19 @@ diff -ru libvpx/build/make/configure.sh libvpx/build/make/configure.sh
-      # Handle Solaris variants. Solaris 10 needs -lposix4
-      case ${toolchain} in
-          sparc-solaris-*)
--@@ -1070,7 +1017,13 @@
-+@@ -1025,11 +972,6 @@
-+     x86*)
-+         bits=32
-+         enabled x86_64 && bits=64
-+-        check_cpp <<EOF && bits=x32
-+-#ifndef __ILP32__
-+-#error "not x32"
-+-#endif
-+-EOF
-+ 
-+         case  ${tgt_os} in
-+             win*)
-+@@ -1070,7 +1012,13 @@
-              ;;
-              gcc*)
-                  add_cflags -m${bits}
-2.4.0
-

buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=cd273368d7f6
+TESTEDHASH=86facfbc22261cf
 
 usage()
 {