Commit 4b23a53f authored by Felix Paul Kühne's avatar Felix Paul Kühne

libvlc: rebase and remove patches merged upstream

parent 92b0f7b8
......@@ -25,7 +25,7 @@ OSVERSIONMINLDFLAG=ios
ROOT_DIR=empty
FARCH="all"
TESTEDHASH="fb26e2443" # libvlc hash that this version of VLCKit is build on
TESTEDHASH="9db9c1121" # libvlc hash that this version of VLCKit is build on
if [ -z "$MAKE_JOBS" ]; then
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
......
From 6dafec4d5815e7815cb6ad3b26c0fbfaaff42fef Mon Sep 17 00:00:00 2001
From a699e53e42165b2512e8606ef20fb7e3ff496b0e 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/20] http: add vlc_http_cookies_clear
Subject: [PATCH 01/16] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......
From 07139b673c9ed045e44ce5f9e44835c297dae725 Mon Sep 17 00:00:00 2001
From 39f02f586048c36925748aa04ef6cd5ede275595 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/20] libvlc_media: add cookie_jar API
Subject: [PATCH 02/16] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......
From 22409f3d2566657cda2fd9b0017497f63776522b Mon Sep 17 00:00:00 2001
From 8902ca63dad32369ae4ec5c2ead1d7300f906ca1 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/20] arm_neon: work-around libtool issue
Subject: [PATCH 03/16] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 11bde9a2d3f0db3439b0753c37e3f9ae42190ec9 Mon Sep 17 00:00:00 2001
From 76442688836a4391402873fc85ea0e34dd77ce31 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/20] disable neon volume plugin
Subject: [PATCH 04/16] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From 63c96e0db49337fc119b77612f8ed041bb45e694 Mon Sep 17 00:00:00 2001
From 424645783f23e5c9cea6d54c49c62ca8ae1fc839 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/20] Enable System DL
Subject: [PATCH 05/16] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......
From fcab24938b40731c7d8f5475667e14291e7bbc31 Mon Sep 17 00:00:00 2001
From d552e8d399fa1de9e8a959a8aa73da6bf23332cd 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/20] contrib: use live555 version that is compatible with
Subject: [PATCH 06/16] contrib: use live555 version that is compatible with
LGPL2
---
......
From 55928ee0f7216acbf48b80eaab522fef535870d8 Mon Sep 17 00:00:00 2001
From 0b8c28749d95ce86916cbcec2411fc3abf05acc5 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 08/20] modules:common: Use the full module name as MODULE_NAME
Subject: [PATCH 07/16] modules:common: Use the full module name as MODULE_NAME
This avoid conflicts when linking modules staticly on platforms that don't have objdump
---
......
From 0b0e3f59bd0f86b4080ac7cc86154950af343582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Wed, 17 Jul 2019 10:34:47 +0200
Subject: [PATCH 07/20] tools: fix libtool bootstapping on macOS
---
extras/tools/tools.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 7d677de1d8..937a324331 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -131,7 +131,7 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
$(APPLY) $(TOOLS)/libtool-2.4.6-san.patch
$(APPLY) $(TOOLS)/libtool-2.4.6-clang-libs.patch
$(APPLY) $(TOOLS)/libtool-2.4.6-response-files.patch
- (cd $(UNPACK_DIR) && autoreconf)
+ (cd $(UNPACK_DIR) && autoreconf -fv)
$(MOVE)
.buildlibtool: libtool .automake .help2man
--
2.20.1 (Apple Git-117)
From e489e76cd40a12913096f8932e4ae003568c99a6 Mon Sep 17 00:00:00 2001
From 01677160c9d1273e2e497dd63804278b2f5bbba2 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 09/20] http access: retain auth struct for the runtime of the
Subject: [PATCH 08/16] 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
......
From 718c54190386e9ab704fc5099f77724c2ccfc4ba Mon Sep 17 00:00:00 2001
From bf0f2eaa2be864409c66b9c1c2ba952016cfd994 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Mon, 1 Oct 2018 15:37:57 +0200
Subject: [PATCH 10/20] access_output: file: Add error dialog for write/open
Subject: [PATCH 09/16] access_output: file: Add error dialog for write/open
---
modules/access_output/file.c | 8 ++++++++
......
From 55aea7a102ebb1e10f9211e90e3593b44ed16b0e Mon Sep 17 00:00:00 2001
From a4d4646f35d755ab9a300bed4725eac4ea3c7dee Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 11/20] Replace thread local with pthread TSD
Subject: [PATCH 10/16] Replace thread local with pthread TSD
---
src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
src/misc/sort.c | 4 +++
src/misc/variables.c | 19 ++++++++++++++
2 files changed, 78 insertions(+)
3 files changed, 82 insertions(+)
diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c
index d2a04a72b3..75edb2d7c1 100644
......@@ -174,6 +175,22 @@ index d2a04a72b3..75edb2d7c1 100644
if (ctx == NULL)
return vlc_poll(fds, nfds, timeout);
diff --git a/src/misc/sort.c b/src/misc/sort.c
index fc62eb7fff..a96fb0104c 100644
--- a/src/misc/sort.c
+++ b/src/misc/sort.c
@@ -26,7 +26,11 @@
#include <vlc_common.h>
#include <vlc_sort.h>
+#ifdef I_CAN_HAZ_TSD
static thread_local struct
+#else
+static struct
+#endif
{
int (*compar)(const void *, const void *, void *);
void *arg;
diff --git a/src/misc/variables.c b/src/misc/variables.c
index a39fd4143f..30ce120fce 100644
--- a/src/misc/variables.c
......
From 7676899bbb73251c05e62a258b74c7d103ff307c Mon Sep 17 00:00:00 2001
From b1cde0aa486420bb1dd1d5f872088a7f159aeb60 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 12/20] Work around lack of __thread storage qualifier on old
Subject: [PATCH 11/16] Work around lack of __thread storage qualifier on old
macOS
---
configure.ac | 4 +-
include/vlc_fixups.h | 7 +++-
include/vlc_fixups.h | 6 ++-
po/POTFILES.in | 1 +
src/Makefile.am | 1 +
{compat => src/extras}/tdestroy.c | 67 ++++++++++++++++++-------------
5 files changed, 48 insertions(+), 32 deletions(-)
5 files changed, 47 insertions(+), 32 deletions(-)
rename {compat => src/extras}/tdestroy.c (59%)
diff --git a/configure.ac b/configure.ac
......@@ -29,24 +29,23 @@ index 38446812ca..81f64c7657 100644
AC_CHECK_FUNC(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 2164f690b1..709fe39301 100644
index 1518b84362..ffd64f382a 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -489,9 +489,12 @@ void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void
void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
void *lfind( const void *key, const void *base, size_t *nmemb,
size_t size, int(*cmp)(const void *, const void *) );
-#endif /* HAVE_SEARCH_H */
@@ -500,9 +500,11 @@ void *lfind( const void *key, const void *base, size_t *nmemb,
lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e))
#endif /* _WIN64 */
-#ifndef HAVE_TDESTROY
void tdestroy( void *root, void (*free_node)(void *nodep) );
+#else // HAVE_SEARCH_H
-#endif
+# ifndef HAVE_TDESTROY
+void vlc_tdestroy( void *, void (*)(void *) );
+# define tdestroy vlc_tdestroy
+# endif
#endif
/* Random numbers */
#ifndef HAVE_NRAND48
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1c2a5298a8..4f385589e8 100644
--- a/po/POTFILES.in
......
From b8f528df5cedec11b849c5b72cf9fa76a714ff4d Mon Sep 17 00:00:00 2001
From f7029fdee76892c213beab6c93ce59a0914ef8c7 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 13/20] libvlc: add a basic API to change freetype's color,
Subject: [PATCH 12/16] libvlc: add a basic API to change freetype's color,
bold, font and size variables on-the-fly
---
......
From 5150bced77dbf54ea8fa0a1b7a9071fc4a646fe3 Mon Sep 17 00:00:00 2001
From 67124257866654878786383e0aa26e0c2f91f63f Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 14/20] core: expose config_AutoSaveConfigFile
Subject: [PATCH 13/16] core: expose config_AutoSaveConfigFile
---
include/vlc_configuration.h | 2 ++
......@@ -11,10 +11,10 @@ Subject: [PATCH 14/20] core: expose config_AutoSaveConfigFile
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index ee4e57b7c6..33bef6f46c 100644
index f1467c9a0c..7ecc1ea174 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -246,6 +246,8 @@ VLC_API ssize_t config_GetPszChoices(const char *,
@@ -243,6 +243,8 @@ VLC_API ssize_t config_GetPszChoices(const char *,
VLC_API int config_SaveConfigFile( vlc_object_t * );
#define config_SaveConfigFile(a) config_SaveConfigFile(VLC_OBJECT(a))
......
From 09020ca7bbebad74d548965d44590142d9dd328d Mon Sep 17 00:00:00 2001
From b82413980d38b3ce336931177697fc99696acf9d Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 15/20] lib: save configuration after playback/parse
Subject: [PATCH 14/16] 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...).
---
......
From 000b11a8f28bd85ea6ee9477bcd8566cc6a7751a Mon Sep 17 00:00:00 2001
From b35c48d3a181265d438ff91390d74b0809ee39ce Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Wed, 31 Oct 2018 10:08:55 +0100
Subject: [PATCH 16/20] libvlc: media_player: Add record method
Subject: [PATCH 15/16] libvlc: media_player: Add record method
---
include/vlc/libvlc_media_player.h | 13 +++++++++++++
......
From 99a76fc98892c4b27ba4a3c7411c13bad7b68d3c Mon Sep 17 00:00:00 2001
From 59d8c11ae6ba5218ba89e7484878f8c63562c742 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Thu, 27 Sep 2018 18:40:39 +0200
Subject: [PATCH 17/20] libvlc: events: Add callbacks for record
Subject: [PATCH 16/16] libvlc: events: Add callbacks for record
---
include/vlc/libvlc_events.h | 9 +++++++++
......
From d65fb18dff3e9f13deeb3d2280846a695465cf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 22 Jul 2019 16:23:10 +0200
Subject: [PATCH 18/20] videotoolbox: require iOS 9.0
---
modules/codec/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 313ec0db0d..e77725014c 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -340,7 +340,7 @@ libvideotoolbox_plugin_la_SOURCES = \
packetizer/hevc_nal.c packetizer/hevc_nal.h
libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
if HAVE_IOS
-libvideotoolbox_plugin_la_OBJCFLAGS += -miphoneos-version-min=8.0
+libvideotoolbox_plugin_la_OBJCFLAGS += -miphoneos-version-min=9.0
endif
if HAVE_TVOS
libvideotoolbox_plugin_la_OBJCFLAGS += -mtvos-version-min=10.2
--
2.20.1 (Apple Git-117)
From 2d2305c5e7b7c23fe73e395d9d098316ca033c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 22 Jul 2019 16:23:46 +0200
Subject: [PATCH 19/20] Add hack to allow execution with i386 runtime in the
simulator
---
src/misc/sort.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/misc/sort.c b/src/misc/sort.c
index fc62eb7fff..a96fb0104c 100644
--- a/src/misc/sort.c
+++ b/src/misc/sort.c
@@ -26,7 +26,11 @@
#include <vlc_common.h>
#include <vlc_sort.h>
+#ifdef I_CAN_HAZ_TSD
static thread_local struct
+#else
+static struct
+#endif
{
int (*compar)(const void *, const void *, void *);
void *arg;
--
2.20.1 (Apple Git-117)
From 2a6c5dad3e858aef8b0297daf1bb8ed9e416c8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 22 Jul 2019 18:26:58 +0200
Subject: [PATCH 20/20] vout/ios: fix execution
---
modules/video_output/ios.m | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index d394e8a92a..4013ff22e2 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -148,7 +148,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
if (vout_display_cfg_IsWindowed(cfg))
return VLC_EGENERIC;
- vout_display_sys_t *sys = vlc_obj_calloc(vd, 1, sizeof(*sys));
+ vout_display_sys_t *sys = calloc(1, sizeof(*sys));
if (!sys)
return VLC_ENOMEM;
@@ -689,10 +689,6 @@ - (void)reshape
_place = place;
}
- vout_display_sys_t *sys = _voutDisplay->sys;
- vout_window_ReportSize(sys->embed, _viewSize.width * _scaleFactor,
- _viewSize.height * _scaleFactor);
-
vlc_mutex_unlock(&_mutex);
}
--
2.20.1 (Apple Git-117)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment