فهرست منبع

MVK: update libvlc

Felix Paul Kühne 8 سال پیش
والد
کامیت
08f32002c1
19فایلهای تغییر یافته به همراه57 افزوده شده و 85 حذف شده
  1. 3 3
      Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
  2. 3 3
      Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
  3. 3 3
      Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch
  4. 3 3
      Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch
  5. 3 3
      Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch
  6. 3 3
      Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch
  7. 3 3
      Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch
  8. 3 3
      Resources/MobileVLCKit/patches/0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch
  9. 4 4
      Resources/MobileVLCKit/patches/0009-http-add-vlc_http_cookies_clear.patch
  10. 6 6
      Resources/MobileVLCKit/patches/0010-libvlc_media-add-cookie_jar-API.patch
  11. 3 3
      Resources/MobileVLCKit/patches/0011-Revert-Contribs-update-libpng-to-1.6.29.patch
  12. 3 3
      Resources/MobileVLCKit/patches/0012-contrib-gcrypt-work-around-a-libtool-limitation.patch
  13. 3 3
      Resources/MobileVLCKit/patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch
  14. 3 3
      Resources/MobileVLCKit/patches/0014-contrib-gcrypt-update-patches.patch
  15. 3 3
      Resources/MobileVLCKit/patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch
  16. 3 3
      Resources/MobileVLCKit/patches/0016-build-rename-exported-symbols-by-module.patch
  17. 4 4
      Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch
  18. 0 28
      Resources/MobileVLCKit/patches/0018-fix-missing.c.patch
  19. 1 1
      buildMobileVLCKit.sh

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

@@ -1,7 +1,7 @@
-From 98857925f8c17a368c24796cf88025c77e64d26c Mon Sep 17 00:00:00 2001
+From 5d47e6de0fd6f999749fc900e6045e89a3e4c708 Mon Sep 17 00:00:00 2001
 From: David Geldreich <david.geldreich@free.fr>
 From: David Geldreich <david.geldreich@free.fr>
 Date: Fri, 20 Apr 2012 16:41:19 +0200
 Date: Fri, 20 Apr 2012 16:41:19 +0200
-Subject: [PATCH 01/18] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/17] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
  prefix for the iOS ARM ABI
 
 
 ---
 ---
@@ -65,5 +65,5 @@ index 0000000000..d853255fec
 +.endm
 +.endm
 +
 +
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,7 +1,7 @@
-From 78166f058a9c17e0b794acdb4268ff5e2fdfcb01 Mon Sep 17 00:00:00 2001
+From 6b7acb4aac6c300448720673ba3e6d4070685ee6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Aug 2012 16:02:07 +0200
 Date: Fri, 10 Aug 2012 16:02:07 +0200
-Subject: [PATCH 02/18] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 02/17] deinterlace/merge: use a macro to fix compilation for
  iOS
  iOS
 
 
 ---
 ---
@@ -82,5 +82,5 @@ index dd779029ae..03e5042b28 100644
  	b		1b
  	b		1b
 +endfunc
 +endfunc
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch

@@ -1,7 +1,7 @@
-From b38dcc25189d025937c6f593df893b166c183b73 Mon Sep 17 00:00:00 2001
+From e296dcd255268392a57a778d0e98feca68f37424 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Dec 2014 22:14:55 +0100
 Date: Thu, 18 Dec 2014 22:14:55 +0100
-Subject: [PATCH 03/18] arm_neon: work-around libtool issue
+Subject: [PATCH 03/17] arm_neon: work-around libtool issue
 
 
 ---
 ---
  modules/arm_neon/Makefile.am | 2 ++
  modules/arm_neon/Makefile.am | 2 ++
@@ -18,5 +18,5 @@ index db81ec0b84..e67e07e61c 100644
  
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch

@@ -1,7 +1,7 @@
-From e42fde4cb389fa36ec6da27c5b519fa5411195bb Mon Sep 17 00:00:00 2001
+From 26a6171a6ce473294e48c7fa533622ab6f9388a1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 04/18] arm_neon: fix iOS linking
+Subject: [PATCH 04/17] arm_neon: fix iOS linking
 
 
 ---
 ---
  modules/arm_neon/amplify.S              |  7 ++---
  modules/arm_neon/amplify.S              |  7 ++---
@@ -194,5 +194,5 @@ index a94ae8539f..54b43a79e3 100644
  	pop {r4,pc}
  	pop {r4,pc}
 +endfunc
 +endfunc
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch

@@ -1,7 +1,7 @@
-From 4941e71d72fed9c27629afd4940779f79052ea4a Mon Sep 17 00:00:00 2001
+From a8418f65d1e29f586c9ffbeb3ceda6760413afd8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Date: Wed, 10 Dec 2014 22:14:55 +0100
-Subject: [PATCH 05/18] disable neon volume plugin
+Subject: [PATCH 05/17] disable neon volume plugin
 
 
 ---
 ---
  modules/arm_neon/Makefile.am | 1 -
  modules/arm_neon/Makefile.am | 1 -
@@ -19,5 +19,5 @@ index e67e07e61c..690975235f 100644
  	libyuv_rgb_neon_plugin.la
  	libyuv_rgb_neon_plugin.la
  endif
  endif
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch

@@ -1,7 +1,7 @@
-From 60ea6a2c166356bbd870adbb21443316497acc77 Mon Sep 17 00:00:00 2001
+From 4678058bebdc9f8ab9adcb5d36c08b67d971be0b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 4 May 2016 16:00:40 +0200
 Date: Wed, 4 May 2016 16:00:40 +0200
-Subject: [PATCH 06/18] libvlc: create VT-zero-copy variable
+Subject: [PATCH 06/17] libvlc: create VT-zero-copy variable
 
 
 ---
 ---
  lib/media_player.c | 1 +
  lib/media_player.c | 1 +
@@ -20,5 +20,5 @@ index dc17f7765d..dde84ab7c6 100644
  #ifdef __ANDROID__
  #ifdef __ANDROID__
      var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
      var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch

@@ -1,7 +1,7 @@
-From 67dcffcc1c5d883a88ade06f85820c186f606ca5 Mon Sep 17 00:00:00 2001
+From 223e1f2358a337834c0566e1002d3f82ed92d79a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 22 Jul 2016 11:11:44 +0200
 Date: Fri, 22 Jul 2016 11:11:44 +0200
-Subject: [PATCH 07/18] Enable System DL
+Subject: [PATCH 07/17] Enable System DL
 
 
 ---
 ---
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
@@ -58,5 +58,5 @@ index 41d16a4fb2..3e5f910e99 100644
  
  
  .ffmpeg: ffmpeg
  .ffmpeg: ffmpeg
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch

@@ -1,7 +1,7 @@
-From 63b78a75032de3a6db69d2adab8ae5fd955e9b33 Mon Sep 17 00:00:00 2001
+From a0680395021e0bc875d087ecf6c49f1643983d0c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:04:05 +0200
 Date: Mon, 12 Sep 2016 17:04:05 +0200
-Subject: [PATCH 08/18] deinterlace-merge-arm64: fix linking on appleOS
+Subject: [PATCH 08/17] deinterlace-merge-arm64: fix linking on appleOS
 
 
 ---
 ---
  modules/arm_neon/asm64.S                       | 46 ++++++++++++++++++++++++++
  modules/arm_neon/asm64.S                       | 46 ++++++++++++++++++++++++++
@@ -107,5 +107,5 @@ index db19e54caf..63c04d3fdd 100644
  	ret
  	ret
 +endfunc
 +endfunc
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 4 - 4
Resources/MobileVLCKit/patches/0009-http-add-vlc_http_cookies_clear.patch

@@ -1,7 +1,7 @@
-From 0d86958d4d76b95e3ef2eef2aac9a191147d23c5 Mon Sep 17 00:00:00 2001
+From e5e20a4373df54a7ff32cea8d535eedf8eff21f3 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
 Date: Fri, 16 Sep 2016 15:51:10 +0200
-Subject: [PATCH 09/18] http: add vlc_http_cookies_clear
+Subject: [PATCH 09/17] http: add vlc_http_cookies_clear
 
 
 Clear all cookies without deleting the jar.
 Clear all cookies without deleting the jar.
 ---
 ---
@@ -23,7 +23,7 @@ index ed7e1613da..da1fe4ef1a 100644
  
  
  /**
  /**
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index 8d9bb53d3c..82c21373d0 100644
+index 5faf32c2b0..397f97b504 100644
 --- a/src/libvlccore.sym
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
 +++ b/src/libvlccore.sym
 @@ -130,6 +130,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
 @@ -130,6 +130,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
@@ -61,5 +61,5 @@ index 2e4d3a8663..0929758f62 100644
  }
  }
  
  
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 6 - 6
Resources/MobileVLCKit/patches/0010-libvlc_media-add-cookie_jar-API.patch

@@ -1,7 +1,7 @@
-From 5d1374c722596e8f1463f45973f9dbfa8c754dcf Mon Sep 17 00:00:00 2001
+From 5c7fc9948c27c22a5b3abfe5d8f26601f3b3d17c Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
 Date: Fri, 16 Sep 2016 15:51:11 +0200
-Subject: [PATCH 10/18] libvlc_media: add cookie_jar API
+Subject: [PATCH 10/17] libvlc_media: add cookie_jar API
 
 
 ---
 ---
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
@@ -12,10 +12,10 @@ Subject: [PATCH 10/18] libvlc_media: add cookie_jar API
  5 files changed, 71 insertions(+)
  5 files changed, 71 insertions(+)
 
 
 diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
 diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
-index 01e571c519..5ca39f51a3 100644
+index 383f366b69..2a5666688d 100644
 --- a/include/vlc/libvlc_media.h
 --- a/include/vlc/libvlc_media.h
 +++ b/include/vlc/libvlc_media.h
 +++ b/include/vlc/libvlc_media.h
-@@ -876,6 +876,41 @@ LIBVLC_API
+@@ -884,6 +884,41 @@ LIBVLC_API
  void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
  void libvlc_media_slaves_release( libvlc_media_slave_t **pp_slaves,
                                    unsigned int i_count );
                                    unsigned int i_count );
  
  
@@ -71,7 +71,7 @@ index caa55981bf..c0d5754abf 100644
  libvlc_playlist_play
  libvlc_playlist_play
  libvlc_release
  libvlc_release
 diff --git a/lib/media.c b/lib/media.c
 diff --git a/lib/media.c b/lib/media.c
-index 0ca4627da7..c348df26b7 100644
+index 30e5bd55f4..1b31b948a0 100644
 --- a/lib/media.c
 --- a/lib/media.c
 +++ b/lib/media.c
 +++ b/lib/media.c
 @@ -406,6 +406,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
 @@ -406,6 +406,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
@@ -163,5 +163,5 @@ index dde84ab7c6..c99fabf940 100644
  
  
      p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
      p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0011-Revert-Contribs-update-libpng-to-1.6.29.patch

@@ -1,7 +1,7 @@
-From 37db53fef0be5acdddfadcba9baab0cf95bce3c7 Mon Sep 17 00:00:00 2001
+From 6d6cc85e81bcfcb1da22901be379f1bfc1643b34 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Tue, 18 Apr 2017 17:24:03 +0200
 Date: Tue, 18 Apr 2017 17:24:03 +0200
-Subject: [PATCH 11/18] Revert "Contribs: update libpng to 1.6.29"
+Subject: [PATCH 11/17] Revert "Contribs: update libpng to 1.6.29"
 
 
 This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
 This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
 ---
 ---
@@ -58,5 +58,5 @@ index 9a05170afc..c18cfdf214 100644
  
  
  PKGS += png
  PKGS += png
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0012-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,7 +1,7 @@
-From 8c311027ca5f5d23e99970e84bf3efc783eb4551 Mon Sep 17 00:00:00 2001
+From 39ba933a6e7ef6bb734db7e7ff76e6662277737f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 7 Dec 2014 20:02:18 +0100
 Date: Sun, 7 Dec 2014 20:02:18 +0100
-Subject: [PATCH 12/18] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 12/17] contrib/gcrypt: work-around a libtool limitation
 
 
 ---
 ---
  contrib/src/gcrypt/rules.mak                       |  1 +
  contrib/src/gcrypt/rules.mak                       |  1 +
@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 + 
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,7 +1,7 @@
-From 3efbc2c735110e67fb30250fc945f52439ca7a4d Mon Sep 17 00:00:00 2001
+From 16be8974da981442bb4a5c8d649ba0fbf9b3c847 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 3 Oct 2015 22:45:14 +0200
 Date: Sat, 3 Oct 2015 22:45:14 +0200
-Subject: [PATCH 13/18] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 13/17] contrib/gcrypt: fix tvOS compilation
 
 
 ---
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
@@ -56,5 +56,5 @@ index c2d4b934f4..dbd556be61 100644
  GCRYPT_CONF += --disable-aesni-support
  GCRYPT_CONF += --disable-aesni-support
  else
  else
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0014-contrib-gcrypt-update-patches.patch

@@ -1,7 +1,7 @@
-From c18904b194c27f5800aa67d66cebe12dd8de8cab Mon Sep 17 00:00:00 2001
+From dce3cd88b3b7b94f607faea671a4313a68a6ac1b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:03:37 +0200
 Date: Mon, 12 Sep 2016 17:03:37 +0200
-Subject: [PATCH 14/18] contrib/gcrypt: update patches
+Subject: [PATCH 14/17] contrib/gcrypt: update patches
 
 
 ---
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch  | 308 ++++++++++++++++++++-
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch  | 308 ++++++++++++++++++++-
@@ -363,5 +363,5 @@ index df97ffb488..957f268ad2 100644
   
   
   # Need to include ../src in addition to top_srcdir because gcrypt.h is
   # Need to include ../src in addition to top_srcdir because gcrypt.h is
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0015-contrib-avcodec-enforce-use-of-FFmpeg.patch

@@ -1,7 +1,7 @@
-From 909550870ead97e66f46997cf168851ea213da5c Mon Sep 17 00:00:00 2001
+From 373d3cca9a89f2dfb12f69f187202e21b1f6a81c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 17 Jul 2017 17:05:51 +0200
 Date: Mon, 17 Jul 2017 17:05:51 +0200
-Subject: [PATCH 15/18] contrib/avcodec: enforce use of FFmpeg
+Subject: [PATCH 15/17] contrib/avcodec: enforce use of FFmpeg
 
 
 ---
 ---
  contrib/src/ffmpeg/rules.mak | 2 +-
  contrib/src/ffmpeg/rules.mak | 2 +-
@@ -21,5 +21,5 @@ index 3e5f910e99..6acb5da740 100644
  ifdef USE_FFMPEG
  ifdef USE_FFMPEG
  FFMPEG_HASH=a82468514048fb87d9bf38689866bc3b9aaccd02
  FFMPEG_HASH=a82468514048fb87d9bf38689866bc3b9aaccd02
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 3 - 3
Resources/MobileVLCKit/patches/0016-build-rename-exported-symbols-by-module.patch

@@ -1,7 +1,7 @@
-From f42bc1bf1e308a8085882133c928d071243a6887 Mon Sep 17 00:00:00 2001
+From 9226226045a04c03f2f0c4ead1dfe7e0adefb53e Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Tue, 11 Apr 2017 15:15:26 +0200
 Date: Tue, 11 Apr 2017 15:15:26 +0200
-Subject: [PATCH 16/18] build: rename exported symbols by module
+Subject: [PATCH 16/17] build: rename exported symbols by module
 
 
 This is quite ugly and temporary. Ideally we should rename symbols in binaries like the Android script do.
 This is quite ugly and temporary. Ideally we should rename symbols in binaries like the Android script do.
 ---
 ---
@@ -319,5 +319,5 @@ index ecc26e0d60..0c71cda6d2 100644
   * frames, each algorithm is responsible for setting the offset correctly.
   * frames, each algorithm is responsible for setting the offset correctly.
   * (The default is 0, so if that is correct, there's no need to do anything.)
   * (The default is 0, so if that is correct, there's no need to do anything.)
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 4 - 4
Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch

@@ -1,7 +1,7 @@
-From 74c54ed19cf03e8f8b11266163d08f0026228b73 Mon Sep 17 00:00:00 2001
+From 8d7aa7b3285b07ae9a0cc8e782adbcf92b3f87c4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 17 Jul 2017 17:03:24 +0200
 Date: Mon, 17 Jul 2017 17:03:24 +0200
-Subject: [PATCH 17/18] Remove thread local
+Subject: [PATCH 17/17] Remove thread local
 
 
 ---
 ---
  src/misc/interrupt.c | 2 +-
  src/misc/interrupt.c | 2 +-
@@ -22,7 +22,7 @@ index 3fafaa4183..02e1049c4b 100644
  /**
  /**
   * Initializes an interruption context.
   * Initializes an interruption context.
 diff --git a/src/misc/variables.c b/src/misc/variables.c
 diff --git a/src/misc/variables.c b/src/misc/variables.c
-index d441684c06..c1544836b2 100644
+index 4457fe747d..f06a755226 100644
 --- a/src/misc/variables.c
 --- a/src/misc/variables.c
 +++ b/src/misc/variables.c
 +++ b/src/misc/variables.c
 @@ -1378,7 +1378,7 @@ void DumpVariables(vlc_object_t *obj)
 @@ -1378,7 +1378,7 @@ void DumpVariables(vlc_object_t *obj)
@@ -35,5 +35,5 @@ index d441684c06..c1544836b2 100644
  static void TwalkGetNames(const void *data, const VISIT which, const int depth)
  static void TwalkGetNames(const void *data, const VISIT which, const int depth)
  {
  {
 -- 
 -- 
-2.13.2
+2.13.3
 
 

+ 0 - 28
Resources/MobileVLCKit/patches/0018-fix-missing.c.patch

@@ -1,29 +0,0 @@
-From d49bc57895110ccccce751fdf0c8c5a68b983057 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Mon, 24 Jul 2017 20:07:21 +0200
-Subject: [PATCH 18/18] fix missing.c
-
----
- src/missing.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/missing.c b/src/missing.c
-index c76e99a4bc..c8b8ceca8f 100644
---- a/src/missing.c
-+++ b/src/missing.c
-@@ -165,10 +165,10 @@ int httpd_StreamSend (httpd_stream_t *stream, const block_t *p_block)
- }
- 
- int httpd_StreamSetHTTPHeaders (httpd_stream_t * stream,
--                                httpd_header * headers,
-+                                const httpd_header * header,
-                                 size_t i_headers)
- {
--    (void) stream; (void) headers; (void) i_headers;
-+    (void) stream; (void) header; (void) i_headers;
-     vlc_assert_unreachable ();
- }
- 
-2.13.2
-

+ 1 - 1
buildMobileVLCKit.sh

@@ -21,7 +21,7 @@ OSVERSIONMINCFLAG=miphoneos-version-min
 OSVERSIONMINLDFLAG=ios_version_min
 OSVERSIONMINLDFLAG=ios_version_min
 ROOT_DIR=empty
 ROOT_DIR=empty
 
 
-TESTEDHASH=5f341b579
+TESTEDHASH=48087f5c
 
 
 CORE_COUNT=`sysctl -n machdep.cpu.core_count`
 CORE_COUNT=`sysctl -n machdep.cpu.core_count`
 let MAKE_JOBS=$CORE_COUNT+1
 let MAKE_JOBS=$CORE_COUNT+1