浏览代码

libvlc: update tested hash and patches

Felix Paul Kühne 5 年之前
父节点
当前提交
1efbeed00c

+ 1 - 1
compileAndBuildVLCKit.sh

@@ -24,7 +24,7 @@ OSVERSIONMINLDFLAG=ios
 ROOT_DIR=empty
 FARCH="all"
 
-TESTEDHASH="b932973a9" # libvlc hash that this version of VLCKit is build on
+TESTEDHASH="0455fc1dd" # libvlc hash that this version of VLCKit is build on
 
 usage()
 {

+ 3 - 3
libvlc/patches/0001-http-add-vlc_http_cookies_clear.patch

@@ -1,7 +1,7 @@
-From eb78ac3dae31753ac033be14ddbdbc809250b1fb Mon Sep 17 00:00:00 2001
+From e4f9f7b73e6f833b9696ebe03a0a655d20e30d06 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
-Subject: [PATCH 01/18] http: add vlc_http_cookies_clear
+Subject: [PATCH 01/17] http: add vlc_http_cookies_clear
 
 Clear all cookies without deleting the jar.
 ---
@@ -23,7 +23,7 @@ index 383a1ed354..33d04eb749 100644
  
  /**
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index 9680cd35f2..fb5b32a5a4 100644
+index b704d24f28..7c5c68c581 100644
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
 @@ -134,6 +134,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader

+ 2 - 2
libvlc/patches/0002-libvlc_media-add-cookie_jar-API.patch

@@ -1,7 +1,7 @@
-From c63d67c88c05bf22fc01e80e29abf1a58d80a52b Mon Sep 17 00:00:00 2001
+From 980fbe5397358cb97008a1bf4c57d0311284b6ec Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
-Subject: [PATCH 02/18] libvlc_media: add cookie_jar API
+Subject: [PATCH 02/17] libvlc_media: add cookie_jar API
 
 ---
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++

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

@@ -1,7 +1,7 @@
-From 541cd9b67aa1e2eba554d304ac2c5d2057307d9f Mon Sep 17 00:00:00 2001
+From 969912479cad55ee294daa1b1e4d36342462ffb7 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
libvlc/patches/0004-disable-neon-volume-plugin.patch

@@ -1,7 +1,7 @@
-From 980dace684ffb5e71526cc1dffd7f1dd585f6ae7 Mon Sep 17 00:00:00 2001
+From e7eada4b331ce1ffb07ae3f276bc5a9af0d190b9 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] disable neon volume plugin
+Subject: [PATCH 04/17] disable neon volume plugin
 
 ---
  modules/arm_neon/Makefile.am | 1 -

+ 2 - 2
libvlc/patches/0005-Enable-System-DL.patch

@@ -1,7 +1,7 @@
-From 897f625eab22b1d0288d7880278f2b5eb7e290bf Mon Sep 17 00:00:00 2001
+From 5c538fb989a1c2ccf3fec2ec4d57c349f9f46292 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 05/18] Enable System DL
+Subject: [PATCH 05/17] Enable System DL
 
 ---
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++

+ 2 - 2
libvlc/patches/0006-contrib-use-live555-version-that-is-compatible-with-.patch

@@ -1,7 +1,7 @@
-From 7d21485ef1e1d436652038b00c4164bceeb2aa0b Mon Sep 17 00:00:00 2001
+From 131e8b3b5775b1b9602c052d1bd157c3dd4b9bff Mon Sep 17 00:00:00 2001
 From: Carola Nitz <nitz.carola@googlemail.com>
 Date: Fri, 29 Sep 2017 14:49:02 +0200
-Subject: [PATCH 06/18] contrib: use live555 version that is compatible with
+Subject: [PATCH 06/17] contrib: use live555 version that is compatible with
  LGPL2
 
 ---

+ 2 - 2
libvlc/patches/0007-modules-common-Use-the-full-module-name-as-MODULE_NA.patch

@@ -1,7 +1,7 @@
-From 6341900b91d307da447ad17df70186b2d2baae20 Mon Sep 17 00:00:00 2001
+From 0af3f8871ef00eea6f402fc6588bb225b9c8ffbc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
 Date: Mon, 26 Mar 2018 16:44:44 +0200
-Subject: [PATCH 07/18] modules:common: Use the full module name as MODULE_NAME
+Subject: [PATCH 07/17] modules:common: Use the full module name as MODULE_NAME
 
 This avoid conflicts when linking modules staticly on platforms that don't have objdump
 ---

+ 2 - 2
libvlc/patches/0008-http-access-retain-auth-struct-for-the-runtime-of-th.patch

@@ -1,7 +1,7 @@
-From 80748d6d90d16c6495d245a2096816989fd4b7e5 Mon Sep 17 00:00:00 2001
+From f72729af3b7015a5b98817ec1813b60ed5405663 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
 Date: Mon, 10 Sep 2018 20:55:11 +0200
-Subject: [PATCH 08/18] http access: retain auth struct for the runtime of the
+Subject: [PATCH 08/17] http access: retain auth struct for the runtime of the
  module
 
 Previously, it was retained for a given connection only, so all information needed for a digest login was lost as soon as the module was reconnecting due to the expected 401 on attempted basic login

+ 2 - 2
libvlc/patches/0009-access_output-file-Add-error-dialog-for-write-open.patch

@@ -1,7 +1,7 @@
-From b758eddb9b31fffb97a3307274985f530cecf2fd Mon Sep 17 00:00:00 2001
+From 59fc6445a393bd696b69b239fd2146af1ebb97fc Mon Sep 17 00:00:00 2001
 From: Soomin Lee <bubu@mikan.io>
 Date: Mon, 1 Oct 2018 15:37:57 +0200
-Subject: [PATCH 09/18] access_output: file: Add error dialog for write/open
+Subject: [PATCH 09/17] access_output: file: Add error dialog for write/open
 
 ---
  modules/access_output/file.c | 8 ++++++++

+ 2 - 2
libvlc/patches/0010-Replace-thread-local-with-pthread-TSD.patch

@@ -1,7 +1,7 @@
-From 0d338cf75087490aa9f49a5bb651400a6d8ca5aa Mon Sep 17 00:00:00 2001
+From c7ef2e5b008b7a91559a202f3a27c570aa0e7fa5 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Mon, 17 Jul 2017 17:03:24 +0200
-Subject: [PATCH 10/18] Replace thread local with pthread TSD
+Subject: [PATCH 10/17] Replace thread local with pthread TSD
 
 ---
  src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++

+ 2 - 2
libvlc/patches/0011-libvlc-add-a-basic-API-to-change-freetype-s-color-bo.patch

@@ -1,7 +1,7 @@
-From 7333dfe91fd717b0822f6ed9ded731d1246b4001 Mon Sep 17 00:00:00 2001
+From d44d6e266092030f8584ea3b2b36c0cbea9aaa27 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
 Date: Sun, 17 Dec 2017 18:05:40 +0100
-Subject: [PATCH 11/18] libvlc: add a basic API to change freetype's color,
+Subject: [PATCH 11/17] libvlc: add a basic API to change freetype's color,
  bold, font and size variables on-the-fly
 
 ---

+ 3 - 3
libvlc/patches/0012-core-expose-config_AutoSaveConfigFile.patch

@@ -1,7 +1,7 @@
-From dde887cb110407b671a163bef4e9f3b1e0598cf5 Mon Sep 17 00:00:00 2001
+From d13a39d5551db4943e1cedb72b7e39869cbf14e0 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Wed, 17 Jan 2018 10:06:13 +0200
-Subject: [PATCH 12/18] core: expose config_AutoSaveConfigFile
+Subject: [PATCH 12/17] core: expose config_AutoSaveConfigFile
 
 ---
  include/vlc_configuration.h | 2 ++
@@ -48,7 +48,7 @@ index e6b10e5c02..4275a7ad00 100644
  {
      int ret = 0;
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index fb5b32a5a4..2f7cb3bb85 100644
+index 7c5c68c581..77c2034c6d 100644
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
 @@ -48,6 +48,7 @@ block_Realloc

+ 2 - 2
libvlc/patches/0013-libvlc-media_player-Add-record-method.patch

@@ -1,7 +1,7 @@
-From e2920fa71793d8924c133df2fda7392d14652a98 Mon Sep 17 00:00:00 2001
+From 10b2bba36b7f2b2d6756ae779f91cd79c2e23a64 Mon Sep 17 00:00:00 2001
 From: Soomin Lee <bubu@mikan.io>
 Date: Wed, 31 Oct 2018 10:08:55 +0100
-Subject: [PATCH 13/18] libvlc: media_player: Add record method
+Subject: [PATCH 13/17] libvlc: media_player: Add record method
 
 ---
  include/vlc/libvlc_media_player.h | 13 +++++++++++++

+ 2 - 2
libvlc/patches/0014-libvlc-events-Add-callbacks-for-record.patch

@@ -1,7 +1,7 @@
-From 418a5d18571040627b7dfefb444ce7223bdffe9b Mon Sep 17 00:00:00 2001
+From d04abec94ecba4c3f666d9e918a31523e9e430b6 Mon Sep 17 00:00:00 2001
 From: Soomin Lee <bubu@mikan.io>
 Date: Thu, 27 Sep 2018 18:40:39 +0200
-Subject: [PATCH 14/18] libvlc: events: Add callbacks for record
+Subject: [PATCH 14/17] libvlc: events: Add callbacks for record
 
 ---
  include/vlc/libvlc_events.h |  9 +++++++++

+ 2 - 2
libvlc/patches/0015-Work-around-lack-of-__thread-storage-qualifier-on-ol.patch

@@ -1,7 +1,7 @@
-From 3126e494521ea1a04376f52d4351906dd90783da Mon Sep 17 00:00:00 2001
+From 4e3308deb6b68b4d27c23abc6ee4df18345412c3 Mon Sep 17 00:00:00 2001
 From: Carola Nitz <nitz.carola@googlemail.com>
 Date: Fri, 23 Feb 2018 13:16:41 +0100
-Subject: [PATCH 15/18] Work around lack of __thread storage qualifier on old
+Subject: [PATCH 15/17] Work around lack of __thread storage qualifier on old
  macOS
 
 ---

+ 2 - 2
libvlc/patches/0016-lib-save-configuration-after-playback-parse.patch

@@ -1,7 +1,7 @@
-From fdaf6ad0b6dc9e1c2a4a9cdd2b5dc92f9c7b6d6d Mon Sep 17 00:00:00 2001
+From 1c8e0317c24393dafccd691ffdf1ccddd228d40d Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Wed, 17 Jan 2018 10:06:13 +0200
-Subject: [PATCH 16/18] lib: save configuration after playback/parse
+Subject: [PATCH 16/17] lib: save configuration after playback/parse
 
 The configuration is also saved when the libvlc instance is terminated but this doesn't happen often. Indeed, apps using libvlc will generally hold the libvlc instance during all its lifetime and won't be able to clean it up in a lot of case (app killed by OS to free up memory, crashes, reboot, force close...).
 ---

+ 2 - 2
libvlc/patches/0017-src-threads-add-hack-to-retain-compilation-support-f.patch

@@ -1,7 +1,7 @@
-From 4a03b0d4b159d7c7f7e131e0c800438f4e23370d Mon Sep 17 00:00:00 2001
+From 9f12f8c32ed2c4e8a5483905ca4d4020f9bceba0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
 Date: Wed, 27 Nov 2019 14:39:44 +0100
-Subject: [PATCH 17/18] src/threads: add hack to retain compilation support for
+Subject: [PATCH 17/17] src/threads: add hack to retain compilation support for
  i386
 
 This leads to potentially undefined behavior when using the 32bit iOS Simulator. This code path never ends-up in production.

+ 0 - 35
libvlc/patches/0018-contrib-gpg-error-remove-appleOS-hacks.patch

@@ -1,36 +0,0 @@
-From 17e2fda214de9c912b876a5bc59c3f879ef1e7e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
-Date: Wed, 22 Jan 2020 17:59:47 +0100
-Subject: [PATCH 18/18] contrib/gpg-error: remove appleOS hacks
-
----
- contrib/src/gpg-error/rules.mak | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
-index badf00cf57..d08ac94384 100644
---- a/contrib/src/gpg-error/rules.mak
-+++ b/contrib/src/gpg-error/rules.mak
-@@ -32,19 +32,6 @@ else
- 	cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
- endif
- endif
--ifdef HAVE_DARWIN_OS
--ifdef HAVE_ARMV7A
--	cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
--else
--ifeq ($(ARCH),aarch64)
--ifneq ($(HOST),aarch64-apple-darwin)
--	cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
--endif
--else
--	cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
--endif
--endif
--endif
- ifdef HAVE_NACL
- ifeq ($(ARCH),i386) # 32bits intel
- 	cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.nacl.h
-2.21.1 (Apple Git-122.3)
-