Browse Source

MVK: update libvlc once more

Felix Paul Kühne 7 years ago
parent
commit
82e3fe0d03
19 changed files with 36 additions and 70 deletions
  1. 2 2
      Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
  2. 2 2
      Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
  3. 2 2
      Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch
  4. 2 2
      Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch
  5. 2 2
      Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch
  6. 2 2
      Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch
  7. 2 2
      Resources/MobileVLCKit/patches/0007-Enable-System-DL.patch
  8. 2 2
      Resources/MobileVLCKit/patches/0008-deinterlace-merge-arm64-fix-linking-on-appleOS.patch
  9. 2 2
      Resources/MobileVLCKit/patches/0009-http-add-vlc_http_cookies_clear.patch
  10. 2 2
      Resources/MobileVLCKit/patches/0010-libvlc_media-add-cookie_jar-API.patch
  11. 2 2
      Resources/MobileVLCKit/patches/0011-Revert-Contribs-update-libpng-to-1.6.29.patch
  12. 2 2
      Resources/MobileVLCKit/patches/0012-contrib-gcrypt-work-around-a-libtool-limitation.patch
  13. 2 2
      Resources/MobileVLCKit/patches/0013-contrib-gcrypt-fix-tvOS-compilation.patch
  14. 2 2
      Resources/MobileVLCKit/patches/0014-contrib-gcrypt-update-patches.patch
  15. 2 2
      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. 2 2
      Resources/MobileVLCKit/patches/0017-Remove-thread-local.patch
  18. 0 34
      Resources/MobileVLCKit/patches/0018-vout-iOS-don-t-draw-if-the-app-is-not-active.patch
  19. 1 1
      buildMobileVLCKit.sh

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

@@ -1,7 +1,7 @@
-From 9c0d8edcb139058fa9426ff0c18cba164fb573e7 Mon Sep 17 00:00:00 2001
+From e282880ba5f6b2a90f262cc84732ecfe0e326ed4 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/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
 
 ---

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

@@ -1,7 +1,7 @@
-From 118ffa15976419cedb87830ecb3b5165253edfb2 Mon Sep 17 00:00:00 2001
+From 758f811a86472e75866787993d300523da9b139a 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 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
 
 ---

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

@@ -1,7 +1,7 @@
-From 4ee181e311ca365efc76bee856c7dd93d755a3f3 Mon Sep 17 00:00:00 2001
+From cd7ae932c30f1e6e76b4eac89152d92939363dff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 ++

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

@@ -1,7 +1,7 @@
-From 4dac3db5a772cc08755c18ef60df10ae71f3ee90 Mon Sep 17 00:00:00 2001
+From 3a8849b15f7e4b275e273e328dd339dc924f136d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 ++---

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

@@ -1,7 +1,7 @@
-From 320628a783f2fb7ecc4f1d5c416008881547c50b Mon Sep 17 00:00:00 2001
+From e2fce41063ced1c763c2d226ae5734663422c522 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 -

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

@@ -1,7 +1,7 @@
-From c63d6b1dfef160a170a0e539aa2a2fe3c5713196 Mon Sep 17 00:00:00 2001
+From 12ac703ec9d2bc3b80fca8b7f302821dca655b54 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 +

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

@@ -1,7 +1,7 @@
-From c12186eca5515085f878e38ce8eeb7d1bf8e753c Mon Sep 17 00:00:00 2001
+From d00c17089c76de243a0bca929fc868f0ecf42de3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 ++++++++++++++++++++

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

@@ -1,7 +1,7 @@
-From 1a350c786724d3484d07d13ae5067de0201e7044 Mon Sep 17 00:00:00 2001
+From f77413a41b0f7169fd069fa445ff8b7f0aa4ac9a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 ++++++++++++++++++++++++++

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

@@ -1,7 +1,7 @@
-From 0db63c408edde0b1c1a887f5c10483a897b368d0 Mon Sep 17 00:00:00 2001
+From 50d5e1186c39598937d67d2d6abb38f356b66137 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 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.
 ---

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

@@ -1,7 +1,7 @@
-From 25c36b0f26aa8d60c5cc844f115ba1c263b34cdb Mon Sep 17 00:00:00 2001
+From 1a1d040f10239f7f941e8ad718fe6d97153fe6f8 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 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 +++++++++++++++++++++++++++++++++++

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

@@ -1,7 +1,7 @@
-From ba1bc3ce7847bb7c1f28b7eb899f2982e446a0d9 Mon Sep 17 00:00:00 2001
+From de963414079db9f325b06aaeeafc6da9cbd44559 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 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.
 ---

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

@@ -1,7 +1,7 @@
-From 7fd154636202292bf1f18b6f71861baf03103d51 Mon Sep 17 00:00:00 2001
+From 6a88cd6eb408468551fea1f48452dec03d83ec67 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 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 +

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

@@ -1,7 +1,7 @@
-From 640953f6469acc0c1ff850a873bfcd5efcc7cd53 Mon Sep 17 00:00:00 2001
+From d528019b3cd66b378bb14c1c64717d0b8e831bd1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 ++++++++++++++++

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

@@ -1,7 +1,7 @@
-From 6bfdbfb3ab98edc4a75f35a0a56a8632ac1cb4a5 Mon Sep 17 00:00:00 2001
+From 10c897b58918c6263aa3fb8af73ba058ee43bad0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 ++++++++++++++++++++-

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

@@ -1,7 +1,7 @@
-From 1efb72d71dd4d9d94d9bd98072160149c9f07a46 Mon Sep 17 00:00:00 2001
+From 42e8fe864f8753d485bce0bd50c788846635a3d7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 +-

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

@@ -1,7 +1,7 @@
-From d3283887be250cf8592aa749c94fd9f5a8dac086 Mon Sep 17 00:00:00 2001
+From 9e6c29c3fe7c03d4bdfa24058e749fbcf40c91d8 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 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.
 ---
@@ -146,7 +146,7 @@ index 783220df78..b712fa16a1 100644
      demux_t     *p_demux = (demux_t*)p_this;
      demux_sys_t *p_sys = p_demux->p_sys;
 diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
-index f339af312c..52d0baf16a 100644
+index 1c01253184..b256f3d2d5 100644
 --- a/modules/demux/avformat/mux.c
 +++ b/modules/demux/avformat/mux.c
 @@ -84,7 +84,7 @@ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,

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

@@ -1,7 +1,7 @@
-From c6746b7130006eb325a5c22240408d4da5955828 Mon Sep 17 00:00:00 2001
+From 6aa957635cf237e409ba02c8424960b9154c838c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 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 +-

+ 0 - 34
Resources/MobileVLCKit/patches/0018-vout-iOS-don-t-draw-if-the-app-is-not-active.patch

@@ -1,35 +0,0 @@
-From eec11b618242a496b66e6a7512e7bc1bc8e26f91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@serioese.gmbh>
-Date: Wed, 6 Sep 2017 17:38:35 +0200
-Subject: [PATCH 18/18] vout iOS: don't draw if the app is not active
-
----
- modules/video_output/ios.m | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
-index a22d281b4d..9e59212a1e 100644
---- a/modules/video_output/ios.m
-+++ b/modules/video_output/ios.m
-@@ -529,7 +529,6 @@ static void OpenglESSwap(vlc_gl_t *gl)
- 
- - (void)dealloc
- {
--
-     [[NSNotificationCenter defaultCenter] removeObserver:self];
-     [_eaglContext release];
-     [super dealloc];
-@@ -551,6 +550,10 @@ static void OpenglESSwap(vlc_gl_t *gl)
-         return;
-     }
- 
-+    if (unlikely(!_appActive)) {
-+        return;
-+    }
-+
-     glDisable(GL_DEPTH_TEST);
- 
-     glGenFramebuffers(1, &_frameBuffer);
-2.14.1
-

+ 1 - 1
buildMobileVLCKit.sh

@@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min
 ROOT_DIR=empty
 FARCH="all"
 
-TESTEDHASH=d0218470
+TESTEDHASH=5cfa5dfb7
 
 CORE_COUNT=`sysctl -n machdep.cpu.core_count`
 let MAKE_JOBS=$CORE_COUNT+1