瀏覽代碼

MVK: update libvlc

Felix Paul Kühne 7 年之前
父節點
當前提交
596c05f42e
共有 19 個文件被更改,包括 38 次插入38 次删除
  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. 2 2
      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 dc83d0d1be783cf959a15cff10a276981a3302cc Mon Sep 17 00:00:00 2001
+From 9c0d8edcb139058fa9426ff0c18cba164fb573e7 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/19] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/18] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
  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 8857a3f985196615733b5b2b4b7ded938656060a Mon Sep 17 00:00:00 2001
+From 118ffa15976419cedb87830ecb3b5165253edfb2 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/19] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 02/18] deinterlace/merge: use a macro to fix compilation for
  iOS
  iOS
 
 
 ---
 ---

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

@@ -1,7 +1,7 @@
-From 7195839b753589887a7fe68b3114e6dca056f660 Mon Sep 17 00:00:00 2001
+From 4ee181e311ca365efc76bee856c7dd93d755a3f3 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/19] arm_neon: work-around libtool issue
+Subject: [PATCH 03/18] arm_neon: work-around libtool issue
 
 
 ---
 ---
  modules/arm_neon/Makefile.am | 2 ++
  modules/arm_neon/Makefile.am | 2 ++

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

@@ -1,7 +1,7 @@
-From 6778d1e3a21454f9370dd7c6680996afb6c15e50 Mon Sep 17 00:00:00 2001
+From 4dac3db5a772cc08755c18ef60df10ae71f3ee90 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/19] arm_neon: fix iOS linking
+Subject: [PATCH 04/18] arm_neon: fix iOS linking
 
 
 ---
 ---
  modules/arm_neon/amplify.S              |  7 ++---
  modules/arm_neon/amplify.S              |  7 ++---

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

@@ -1,7 +1,7 @@
-From 12d5c762ab23c5ad241efde28ca8797ccf1265eb Mon Sep 17 00:00:00 2001
+From 320628a783f2fb7ecc4f1d5c416008881547c50b 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/19] disable neon volume plugin
+Subject: [PATCH 05/18] disable neon volume plugin
 
 
 ---
 ---
  modules/arm_neon/Makefile.am | 1 -
  modules/arm_neon/Makefile.am | 1 -

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

@@ -1,7 +1,7 @@
-From fd25a2a025b833668d65424f33cc5b566ce5fe85 Mon Sep 17 00:00:00 2001
+From c63d6b1dfef160a170a0e539aa2a2fe3c5713196 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/19] libvlc: create VT-zero-copy variable
+Subject: [PATCH 06/18] libvlc: create VT-zero-copy variable
 
 
 ---
 ---
  lib/media_player.c | 1 +
  lib/media_player.c | 1 +

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

@@ -1,7 +1,7 @@
-From 63692993a118b690e54752df6e0801b9953a3f07 Mon Sep 17 00:00:00 2001
+From c12186eca5515085f878e38ce8eeb7d1bf8e753c 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/19] Enable System DL
+Subject: [PATCH 07/18] Enable System DL
 
 
 ---
 ---
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
  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 5e66522c82d843c1acd6f2694cd1072cdc8b808f Mon Sep 17 00:00:00 2001
+From 1a350c786724d3484d07d13ae5067de0201e7044 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/19] deinterlace-merge-arm64: fix linking on appleOS
+Subject: [PATCH 08/18] deinterlace-merge-arm64: fix linking on appleOS
 
 
 ---
 ---
  modules/arm_neon/asm64.S                       | 46 ++++++++++++++++++++++++++
  modules/arm_neon/asm64.S                       | 46 ++++++++++++++++++++++++++

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

@@ -1,7 +1,7 @@
-From 6d2901cc0bc327284302114d3aa26791f9136428 Mon Sep 17 00:00:00 2001
+From 0db63c408edde0b1c1a887f5c10483a897b368d0 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/19] http: add vlc_http_cookies_clear
+Subject: [PATCH 09/18] http: add vlc_http_cookies_clear
 
 
 Clear all cookies without deleting the jar.
 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 0193040f7b2e76578b705556b3a1cdb4dd56a733 Mon Sep 17 00:00:00 2001
+From 25c36b0f26aa8d60c5cc844f115ba1c263b34cdb 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/19] libvlc_media: add cookie_jar API
+Subject: [PATCH 10/18] libvlc_media: add cookie_jar API
 
 
 ---
 ---
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
  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 5cbd571d0769356f0a70a57c7f12b79b5eb210e7 Mon Sep 17 00:00:00 2001
+From ba1bc3ce7847bb7c1f28b7eb899f2982e446a0d9 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/19] Revert "Contribs: update libpng to 1.6.29"
+Subject: [PATCH 11/18] Revert "Contribs: update libpng to 1.6.29"
 
 
 This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
 This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
 ---
 ---

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

@@ -1,7 +1,7 @@
-From b5d247eb7afb5f17580ff21ca72296542ddafae7 Mon Sep 17 00:00:00 2001
+From 7fd154636202292bf1f18b6f71861baf03103d51 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/19] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 12/18] contrib/gcrypt: work-around a libtool limitation
 
 
 ---
 ---
  contrib/src/gcrypt/rules.mak                       |  1 +
  contrib/src/gcrypt/rules.mak                       |  1 +

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

@@ -1,7 +1,7 @@
-From f06d8ac10f1fd1ad39c2b6aa79b67c260e88ae1a Mon Sep 17 00:00:00 2001
+From 640953f6469acc0c1ff850a873bfcd5efcc7cd53 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/19] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 13/18] 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 ++++++++++++++++

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

@@ -1,7 +1,7 @@
-From 642c253bdc0053595342241d967e62dcc4ad49cd Mon Sep 17 00:00:00 2001
+From 6bfdbfb3ab98edc4a75f35a0a56a8632ac1cb4a5 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/19] contrib/gcrypt: update patches
+Subject: [PATCH 14/18] contrib/gcrypt: update patches
 
 
 ---
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch  | 308 ++++++++++++++++++++-
  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 1e566b864c98f7ce158a56e7e66fadb302b592f0 Mon Sep 17 00:00:00 2001
+From 1efb72d71dd4d9d94d9bd98072160149c9f07a46 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/19] contrib/avcodec: enforce use of FFmpeg
+Subject: [PATCH 15/18] contrib/avcodec: enforce use of FFmpeg
 
 
 ---
 ---
  contrib/src/ffmpeg/rules.mak | 2 +-
  contrib/src/ffmpeg/rules.mak | 2 +-

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

@@ -1,7 +1,7 @@
-From 6d1b289a6a34b16479cb66d81022a6ec46b51fc8 Mon Sep 17 00:00:00 2001
+From d3283887be250cf8592aa749c94fd9f5a8dac086 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/19] build: rename exported symbols by module
+Subject: [PATCH 16/18] 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.
 ---
 ---
@@ -88,7 +88,7 @@ index 5105dd1efd..7c97fc842a 100644
  #define MUX_TEXT N_("Avformat mux")
  #define MUX_TEXT N_("Avformat mux")
  #define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
  #define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
 diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
 diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
-index c46ecb5d23..88144a038f 100644
+index 783220df78..b712fa16a1 100644
 --- a/modules/demux/avformat/demux.c
 --- a/modules/demux/avformat/demux.c
 +++ b/modules/demux/avformat/demux.c
 +++ b/modules/demux/avformat/demux.c
 @@ -143,7 +143,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
 @@ -143,7 +143,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)

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

@@ -1,7 +1,7 @@
-From c394f21609d2698ae636943f5738877ea496cac3 Mon Sep 17 00:00:00 2001
+From c6746b7130006eb325a5c22240408d4da5955828 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/19] Remove thread local
+Subject: [PATCH 17/18] Remove thread local
 
 
 ---
 ---
  src/misc/interrupt.c | 2 +-
  src/misc/interrupt.c | 2 +-

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

@@ -1,7 +1,7 @@
-From f57d23b3edd828b5cd180bbf1b85e038dca9508d Mon Sep 17 00:00:00 2001
+From eec11b618242a496b66e6a7512e7bc1bc8e26f91 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@serioese.gmbh>
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@serioese.gmbh>
 Date: Wed, 6 Sep 2017 17:38:35 +0200
 Date: Wed, 6 Sep 2017 17:38:35 +0200
-Subject: [PATCH 18/19] vout iOS: don't draw if the app is not active
+Subject: [PATCH 18/18] vout iOS: don't draw if the app is not active
 
 
 ---
 ---
  modules/video_output/ios.m | 5 ++++-
  modules/video_output/ios.m | 5 ++++-

+ 1 - 1
buildMobileVLCKit.sh

@@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min
 ROOT_DIR=empty
 ROOT_DIR=empty
 FARCH="all"
 FARCH="all"
 
 
-TESTEDHASH=dd26ae7ed
+TESTEDHASH=d0218470
 
 
 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