Commit 035a0340 authored by Felix Paul Kühne's avatar Felix Paul Kühne

libvlc: update to merge vout fixes and remove patch merged upstream

Manual forward-port of a3af5464
parent 5cff123b
From 64890108ef8aef81a9b6186ef8745ca569188826 Mon Sep 17 00:00:00 2001
From 2f150030470b72b65a323b415e232cef6263b5a0 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 01/26] arm_neon: work-around libtool issue
Subject: [PATCH 01/25] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 03ad0d48a5159a9124197b966915b5fed33497fa Mon Sep 17 00:00:00 2001
From 4f106a840a01ec607c5c45be53b8a10366c3a13e 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 02/26] disable neon volume plugin
Subject: [PATCH 02/25] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From d1c41dee6b96fef60e36adfc4515cb1916430b85 Mon Sep 17 00:00:00 2001
From a872eb73e7f8cfee1c89cdf344a2bd6a9c97b1c0 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 03/26] Enable System DL
Subject: [PATCH 03/25] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......
From 3e4862b9283804a5e6ce73269095adb8d58e9579 Mon Sep 17 00:00:00 2001
From 21bd6a724177eae2474ac71c000d9030876d4969 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 04/26] http: add vlc_http_cookies_clear
Subject: [PATCH 04/25] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......
From de133ee95ebdad8e1f2fa70986d04524f714fc05 Mon Sep 17 00:00:00 2001
From ca9c67b0d095332e76c1d4b9b40873f3df6f1941 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 05/26] libvlc_media: add cookie_jar API
Subject: [PATCH 05/25] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......
From b24dfc5e996d9650dd5caa4e7e29dba26ee44a49 Mon Sep 17 00:00:00 2001
From fb8203c1e73d37f8cc95bdf0f786e5a102684bf7 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 06/26] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 06/25] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......
From 42fe1b30f4f4ffbe34f5d5fc19ee5c3f89c6600b Mon Sep 17 00:00:00 2001
From effc78557ff4dc6a42e12cd0b64342aa860020a3 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 07/26] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 07/25] contrib/gcrypt: fix tvOS compilation
---
.../src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......
From 8fa0595eac3f94adfd0632f1221c3eb75240cbbc Mon Sep 17 00:00:00 2001
From 13658e3b14706343eaac6e86f97bdbdc4b8c601e 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 08/26] contrib/gcrypt: update patches
Subject: [PATCH 08/25] contrib/gcrypt: update patches
---
.../src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 +++++++++++++++++-
......
From 882b0df73fe66f6548f0dcbea4aad13d076dad14 Mon Sep 17 00:00:00 2001
From c20415c39eb7f13738a7536c4fcb86d52fd286d5 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 09/26] Replace thread local with pthread TSD
Subject: [PATCH 09/25] Replace thread local with pthread TSD
---
src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
......
From e9bf297b30a286c26681dd733530b4d6a02d39d5 Mon Sep 17 00:00:00 2001
From 24dc4bc8ee931bb0766e2c2e6f040421eecd269d 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 10/26] contrib: use live555 version that is compatible with
Subject: [PATCH 10/25] contrib: use live555 version that is compatible with
LGPL2
---
......
From 68e12bd41f54948d9e70526767394687057243fd Mon Sep 17 00:00:00 2001
From 5da293c4d3fa9621851beeb93e5c7b090a0078b1 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/26] libvlc: add a basic API to change freetype's color,
Subject: [PATCH 11/25] libvlc: add a basic API to change freetype's color,
bold, font and size variables on-the-fly
---
......@@ -13,7 +13,7 @@ Subject: [PATCH 11/26] libvlc: add a basic API to change freetype's color,
5 files changed, 134 insertions(+), 5 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 4336df9442..20b220448b 100644
index c431c235e9..4582688b27 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1567,6 +1567,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
......
From c7fa4b11280181e7e70ff7d59b3e435223fa1342 Mon Sep 17 00:00:00 2001
From 188b586bbebfb289f522802f489076721391fa0c 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/26] Work around lack of __thread storage qualifier on old
Subject: [PATCH 12/25] Work around lack of __thread storage qualifier on old
macOS
---
......
From c43ac7a5c3bb40f8828d460d84166ad17616a615 Mon Sep 17 00:00:00 2001
From 1de70527b032cdd82be21dbb4d0fa9846ee5018a 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 13/26] modules:common: Use the full module name as MODULE_NAME
Subject: [PATCH 13/25] 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 432a13a097b951873c8d874af0fad37771e5301c Mon Sep 17 00:00:00 2001
From 83b4903d7a450ab8e66ef3f8ec0958f2edbd66b1 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Mon, 30 Apr 2018 14:33:08 +0100
Subject: [PATCH 14/26] add auto deinterlacer-mode which is also valid
Subject: [PATCH 14/25] add auto deinterlacer-mode which is also valid
---
lib/video.c | 3 ++-
......
From 712b67bfd1a0826ca25fd0c1dc8a03c8d8a57bf2 Mon Sep 17 00:00:00 2001
From 2b75844b58d3d1ce45a6b0a6013bc368b6097ae0 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Wed, 9 May 2018 10:44:43 +0100
Subject: [PATCH 15/26] Users will be able to change the deinterlace mode
Subject: [PATCH 15/25] Users will be able to change the deinterlace mode
without forcing it.
---
......@@ -10,7 +10,7 @@ Subject: [PATCH 15/26] Users will be able to change the deinterlace mode
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 20b220448b..cbb5ec251a 100644
index 4582688b27..4e951292c9 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1419,9 +1419,12 @@ int libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, unsigned num,
......
From 90f1eb3dc688384f43a82fc49bfab5530008439f Mon Sep 17 00:00:00 2001
From eeeb15dbfd3d65e7c2dc9d83503cfd0472536e92 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 27 Mar 2018 16:49:34 +0200
Subject: [PATCH 16/26] contrib: ffmpeg: enable videotoolbox encoder
Subject: [PATCH 16/25] contrib: ffmpeg: enable videotoolbox encoder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
......
From 855cff247d0a55638f1946fcd7d9758d1ad7a452 Mon Sep 17 00:00:00 2001
From aa9c3123921049670be603e9d0ed905b1ff43455 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 27 Mar 2018 16:52:35 +0200
Subject: [PATCH 17/26] chromecast: use vt encoder from avcodec
Subject: [PATCH 17/25] chromecast: use vt encoder from avcodec
---
modules/stream_out/chromecast/cast.cpp | 13 +++++++++++++
......
From 349a07bff41310f005b72891a5b9cd26ff1981d5 Mon Sep 17 00:00:00 2001
From 237824957bbb38de8e170e3e477330b014f2c089 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 18 Jun 2018 12:31:13 +0200
Subject: [PATCH 18/26] ffmpeg: backport vtenc patches
Subject: [PATCH 18/25] ffmpeg: backport vtenc patches
---
...lboxenc-fix-mutex-cond-leak-in-error.patch | 35 ++++++
......
From cf0f351691b8d6666d718d13c3648f1f6d6e2167 Mon Sep 17 00:00:00 2001
From f1123cd046a2950c977175f6bc6cc96782c31717 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 19/26] core: expose config_AutoSaveConfigFile
Subject: [PATCH 19/25] core: expose config_AutoSaveConfigFile
---
include/vlc_configuration.h | 2 ++
......
From ad73e55b2722b03b45441789c51424a10bb14e4d Mon Sep 17 00:00:00 2001
From b9c4f2f45f9abcb5e4cd22933f0806afea77b291 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 20/26] lib: save configuration after playback/parse
Subject: [PATCH 20/25] 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
......
From 28057c731541e6464be47cbe9e8e5e43f88ce76a Mon Sep 17 00:00:00 2001
From 549df2379c1ff1896fd63c708d4f802366b4e963 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 21/26] http access: retain auth struct for the runtime of the
Subject: [PATCH 21/25] 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 b45614dc091e8c776be6e3de5c58a49424ec4dde Mon Sep 17 00:00:00 2001
From 3bf2a0f10af8987e96ee4033e9ba82895e1dace7 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Wed, 31 Oct 2018 10:08:55 +0100
Subject: [PATCH 22/26] libvlc: media_player: Add record method
Subject: [PATCH 22/25] libvlc: media_player: Add record method
---
include/vlc/libvlc_media_player.h | 13 +++++++++++++
......@@ -9,7 +9,7 @@ Subject: [PATCH 22/26] libvlc: media_player: Add record method
2 files changed, 34 insertions(+)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index cbb5ec251a..d58dc4ddcf 100644
index 4e951292c9..363779fd3d 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -2108,6 +2108,19 @@ LIBVLC_API int libvlc_media_player_get_role(libvlc_media_player_t *p_mi);
......
From 232211d15629f0088e556d6c720293a6b6c21e79 Mon Sep 17 00:00:00 2001
From b608537b37e1944f42d56762b985a0663c7c4c61 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Thu, 27 Sep 2018 18:40:39 +0200
Subject: [PATCH 23/26] libvlc: events: Add callbacks for record
Subject: [PATCH 23/25] libvlc: events: Add callbacks for record
---
include/vlc/libvlc_events.h | 9 +++++++++
......
From b43ef3424c1f691f402152240816d64033253473 Mon Sep 17 00:00:00 2001
From a869647a6e8479d9e5963ed19fffdf5a3961723d Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Mon, 1 Oct 2018 15:37:57 +0200
Subject: [PATCH 24/26] access_output: file: Add error dialog for write/open
Subject: [PATCH 24/25] access_output: file: Add error dialog for write/open
---
modules/access_output/file.c | 8 ++++++++
......
From 6e97e67be576b21e07d4b5c31579a8a132a6fa40 Mon Sep 17 00:00:00 2001
From 1cb6affcfdd0595147c19e2dc2114cf6505ef707 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Wed, 28 Nov 2018 18:27:16 +0100
Subject: [PATCH 25/26] transcode: add support for mutliple venc parameters
Subject: [PATCH 25/25] transcode: add support for mutliple venc parameters
Add support for multiple venc parameters for transcoding. Venc
parameters are tested in th given order and fallback if the encoder
......
From bd9e279907ce374ecb0e99b583b04c6af6d12993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Fri, 18 Jan 2019 21:44:13 +0100
Subject: [PATCH 26/26] contrib: add meson support for iOS, macOS and tvOS
---
contrib/bootstrap | 20 +++++++++++++++++---
contrib/src/main.mak | 15 ++++++++++++++-
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 20ce524926..b7cab040a5 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -303,9 +303,23 @@ case "${OS}" in
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
case "${HOST}" in
- *arm*)
- add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
- ;;
+ *armv7s*)
+ add_make "PLATFORM_SHORT_ARCH := armv7s"
+ add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
+ ;;
+ *arm*)
+ add_make "PLATFORM_SHORT_ARCH := armv7"
+ add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
+ ;;
+ *arm64*|*aarch64*)
+ add_make "PLATFORM_SHORT_ARCH := arm64"
+ ;;
+ *x86_64*)
+ add_make "PLATFORM_SHORT_ARCH := x86_64"
+ ;;
+ *86*)
+ add_make "PLATFORM_SHORT_ARCH := i386"
+ ;;
esac;
fi
if test "$BUILDFORTVOS"
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6b70974651..b062ba6c91 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -538,12 +538,25 @@ crossfile.meson:
echo "windres = '$(WINDRES)'" >> $@
echo "[properties]" >> $@
echo "needs_exe_wrapper = true" >> $@
+ifdef HAVE_IOS
+ifdef HAVE_TVOS
+ echo "c_args = ['-isysroot', '$(IOS_SDK)', '-mtvos-version-min=10.2', '-arch', '$(PLATFORM_SHORT_ARCH)', '-fembed-bitcode']" >> $@
+ echo "c_link_args = ['-isysroot', '$(IOS_SDK)', '-arch', '$(PLATFORM_SHORT_ARCH)', '-fembed-bitcode']" >> $@
+else
+ echo "c_args = ['-isysroot', '$(IOS_SDK)', '-miphoneos-version-min=8.4', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
+ echo "c_link_args = ['-isysroot', '$(IOS_SDK)', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
+endif
+endif
+ifdef HAVE_MACOSX
+ echo "c_args = ['-isysroot', '$(MACOSX_SDK)', '-mmacosx-version-min=10.10', '-arch', '$(ARCH)']" >> $@
+ echo "c_link_args = ['-isysroot', '$(MACOSX_SDK)', '-arch', '$(ARCH)']" >> $@
+endif
ifdef HAVE_CROSS_COMPILE
echo "[host_machine]" >> $@
ifdef HAVE_WIN32
echo "system = 'windows'" >> $@
else
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
echo "system = 'darwin'" >> $@
else
ifdef HAVE_ANDROID
--
2.20.1
......@@ -25,7 +25,7 @@ OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR=empty
FARCH="all"
TESTEDHASH="5ec99d0db3" # libvlc hash that this version of VLCKit is build on
TESTEDHASH="563b25c5c1" # libvlc hash that this version of VLCKit is build on
if [ -z "$MAKE_JOBS" ]; then
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
......
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