Browse Source

Bump libvlc hash and add a patch fixing chromecast stability

pipelines/135724
Nicolas Pomepuy 6 years ago
parent
commit
e089bea0bf
  1. 2
      buildsystem/compile.sh
  2. 9
      libvlc/patches/vlc3/0001-compat-Workaround-sendmsg-bug-on-android.patch
  3. 13
      libvlc/patches/vlc3/0002-libvlc-events-Add-callbacks-for-record.patch
  4. 13
      libvlc/patches/vlc3/0003-network-tls-Handle-errors-from-older-kernels.patch
  5. 13
      libvlc/patches/vlc3/0004-access_output-file-Add-error-dialog-for-write-open.patch
  6. 13
      libvlc/patches/vlc3/0005-libvlc-media_player-Add-record-method.patch
  7. 13
      libvlc/patches/vlc3/0006-input-es_out-set-video-exclusive.patch
  8. 15
      libvlc/patches/vlc3/0007-stream_ReadLine-increase-line-length-limit.patch
  9. 47
      libvlc/patches/vlc3/0008-httpd-update-activity-time-before-processing-timeout.patch

2
buildsystem/compile.sh

@ -269,7 +269,7 @@ fi
# Fetch VLC source #
####################
TESTED_HASH=820ac2382b0597610ab41c80f42ecefd822e203f
TESTED_HASH=b5c0d65b661e0a710075c9fcbfae7fd6d0d9dee0
VLC_REPOSITORY=https://git.videolan.org/git/vlc/vlc-3.0.git
if [ ! -d "vlc" ]; then
diagnostic "VLC sources: not found, cloning"

9
libvlc/patches/vlc3/0001-compat-Workaround-sendmsg-bug-on-android.patch

@ -1,11 +1,12 @@
From 87030933b1aae776c8446cf765589f8ac8b5ba7c Mon Sep 17 00:00:00 2001
Message-Id: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
From 4b80ba0cb27cadee99cf18b8f13fd7d16f19066b Mon Sep 17 00:00:00 2001
Message-Id: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Thu, 28 Mar 2019 15:23:48 +0100
Subject: [PATCH 1/7] compat: Workaround sendmsg bug on android
Subject: [PATCH 1/8] compat: Workaround sendmsg bug on android
This only happens on 64bits builds, see compat/sendmsg.c comments
Message-Id: <b75b490465c538e50780039dc796724974033db0.1593695247.git.thomas@gllm.fr>
Message-Id: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
---
compat/sendmsg.c | 24 ++++++++++++++++++++++++
configure.ac | 3 +++
@ -79,5 +80,5 @@ index 010454a01c..1b36e3d574 100644
}
# endif
--
2.17.1
2.25.1

13
libvlc/patches/vlc3/0002-libvlc-events-Add-callbacks-for-record.patch

@ -1,12 +1,13 @@
From 68a0f5e3a48eb05cc647084ec4886986132f83ce Mon Sep 17 00:00:00 2001
Message-Id: <68a0f5e3a48eb05cc647084ec4886986132f83ce.1599040437.git.nicolas@videolabs.io>
In-Reply-To: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
References: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
From 851c589a755be952134547dc240861b5295abb33 Mon Sep 17 00:00:00 2001
Message-Id: <851c589a755be952134547dc240861b5295abb33.1601374253.git.nicolas@videolabs.io>
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: Soomin Lee <bubu@mikan.io>
Date: Thu, 27 Sep 2018 18:40:39 +0200
Subject: [PATCH 2/7] libvlc: events: Add callbacks for record
Subject: [PATCH 2/8] libvlc: events: Add callbacks for record
Message-Id: <5b9396f1f52bbbde75adaf92922b9e45a1fb1e78.1593695247.git.thomas@gllm.fr>
Message-Id: <68a0f5e3a48eb05cc647084ec4886986132f83ce.1599040437.git.nicolas@videolabs.io>
---
include/vlc/libvlc_events.h | 9 +++++++++
lib/media_player.c | 16 ++++++++++++++++
@ -74,5 +75,5 @@ index a9a22fee15..ad8d2a80cc 100644
return VLC_SUCCESS;
}
--
2.17.1
2.25.1

13
libvlc/patches/vlc3/0003-network-tls-Handle-errors-from-older-kernels.patch

@ -1,10 +1,10 @@
From 6d461a59b74aab4637ea73ccfb0e5b8936eb9b60 Mon Sep 17 00:00:00 2001
Message-Id: <6d461a59b74aab4637ea73ccfb0e5b8936eb9b60.1599040437.git.nicolas@videolabs.io>
In-Reply-To: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
References: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
From 6bfd70a03bee179e762df24697b4c2df9107a71d Mon Sep 17 00:00:00 2001
Message-Id: <6bfd70a03bee179e762df24697b4c2df9107a71d.1601374253.git.nicolas@videolabs.io>
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Fri, 29 Mar 2019 10:56:26 +0100
Subject: [PATCH 3/7] network: tls: Handle errors from older kernels
Subject: [PATCH 3/8] network: tls: Handle errors from older kernels
If MSG_FASTOPEN is defined, but turns out to be unimplemented by the
underlying kernel (as is the case on android where the NDK claims to
@ -17,6 +17,7 @@ Treating EPIPE as a synonym for EOPNOTSUPP here allows for the
connection to proceed, and the first call to sendmsg to complete as
expected.
Message-Id: <a90ead426217722818e46a40281ca8581969749e.1593695247.git.thomas@gllm.fr>
Message-Id: <6d461a59b74aab4637ea73ccfb0e5b8936eb9b60.1599040437.git.nicolas@videolabs.io>
---
src/network/tls.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
@ -39,5 +40,5 @@ index 56e04d6ce7..3c3c083c30 100644
#else
tls->writev = vlc_tls_SocketWrite;
--
2.17.1
2.25.1

13
libvlc/patches/vlc3/0004-access_output-file-Add-error-dialog-for-write-open.patch

@ -1,12 +1,13 @@
From edf369375dd3937286034267c8a614f188fb51e4 Mon Sep 17 00:00:00 2001
Message-Id: <edf369375dd3937286034267c8a614f188fb51e4.1599040437.git.nicolas@videolabs.io>
In-Reply-To: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
References: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
From 026f2ef961331f72fd0af03f9b9c3d1ada75fb33 Mon Sep 17 00:00:00 2001
Message-Id: <026f2ef961331f72fd0af03f9b9c3d1ada75fb33.1601374253.git.nicolas@videolabs.io>
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: Soomin Lee <bubu@mikan.io>
Date: Mon, 1 Oct 2018 15:37:57 +0200
Subject: [PATCH 4/7] access_output: file: Add error dialog for write/open
Subject: [PATCH 4/8] access_output: file: Add error dialog for write/open
Message-Id: <b95a09a0bb9cb649ab7c8f0ac0034013dad55247.1593695247.git.thomas@gllm.fr>
Message-Id: <edf369375dd3937286034267c8a614f188fb51e4.1599040437.git.nicolas@videolabs.io>
---
modules/access_output/file.c | 8 ++++++++
1 file changed, 8 insertions(+)
@ -40,5 +41,5 @@ index ef4f2d18d1..55e4822b90 100644
break;
flags &= ~O_EXCL;
--
2.17.1
2.25.1

13
libvlc/patches/vlc3/0005-libvlc-media_player-Add-record-method.patch

@ -1,12 +1,13 @@
From 369e9c1443a233fb747af79758de0acde8d6ae53 Mon Sep 17 00:00:00 2001
Message-Id: <369e9c1443a233fb747af79758de0acde8d6ae53.1599040437.git.nicolas@videolabs.io>
In-Reply-To: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
References: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
From 6b3ab57d266a081d0cd9e6cdd818be08821014d6 Mon Sep 17 00:00:00 2001
Message-Id: <6b3ab57d266a081d0cd9e6cdd818be08821014d6.1601374253.git.nicolas@videolabs.io>
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: Soomin Lee <bubu@mikan.io>
Date: Wed, 31 Oct 2018 10:08:55 +0100
Subject: [PATCH 5/7] libvlc: media_player: Add record method
Subject: [PATCH 5/8] libvlc: media_player: Add record method
Message-Id: <4c22fcedd313e51abfc506a8670cd06e3cf6d0e7.1593695247.git.thomas@gllm.fr>
Message-Id: <369e9c1443a233fb747af79758de0acde8d6ae53.1599040437.git.nicolas@videolabs.io>
---
include/vlc/libvlc_media_player.h | 13 +++++++++++++
lib/media_player.c | 19 +++++++++++++++++++
@ -78,5 +79,5 @@ index ad8d2a80cc..e337cf7197 100644
+ return VLC_SUCCESS;
+}
--
2.17.1
2.25.1

13
libvlc/patches/vlc3/0006-input-es_out-set-video-exclusive.patch

@ -1,14 +1,15 @@
From d767224cec28af8642d9fca53c4aef459979d6d3 Mon Sep 17 00:00:00 2001
Message-Id: <d767224cec28af8642d9fca53c4aef459979d6d3.1599040437.git.nicolas@videolabs.io>
In-Reply-To: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
References: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
From 1decddc1682a0923b619a0d1e4ada808134aaf8b Mon Sep 17 00:00:00 2001
Message-Id: <1decddc1682a0923b619a0d1e4ada808134aaf8b.1601374253.git.nicolas@videolabs.io>
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: Thomas Guillem <thomas@gllm.fr>
Date: Thu, 2 Jul 2020 15:05:01 +0200
Subject: [PATCH 6/7] input: es_out: set video exclusive
Subject: [PATCH 6/8] input: es_out: set video exclusive
Since there can be only one video at a time for now (only one Surface is
supported).
Message-Id: <30a515f551c3531931ab624f8c1b5ffa9b4e4c36.1593695247.git.thomas@gllm.fr>
Message-Id: <d767224cec28af8642d9fca53c4aef459979d6d3.1599040437.git.nicolas@videolabs.io>
---
src/input/es_out.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@ -27,5 +28,5 @@ index 5a2b194688..c700f31db5 100644
EsOutPropsInit( &p_sys->audio, true, p_input, ES_OUT_ES_POLICY_EXCLUSIVE,
"audio-track-id", "audio-track", "audio-language", "audio" );
--
2.17.1
2.25.1

15
libvlc/patches/vlc3/0007-stream_ReadLine-increase-line-length-limit.patch

@ -1,10 +1,10 @@
From 70866e5b1dbec781ad1c989bed9a40f37ddbb729 Mon Sep 17 00:00:00 2001
Message-Id: <70866e5b1dbec781ad1c989bed9a40f37ddbb729.1599040437.git.nicolas@videolabs.io>
In-Reply-To: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
References: <87030933b1aae776c8446cf765589f8ac8b5ba7c.1599040437.git.nicolas@videolabs.io>
From c44db7efa3212b2974181646ba1c396cc6540fc4 Mon Sep 17 00:00:00 2001
Message-Id: <c44db7efa3212b2974181646ba1c396cc6540fc4.1601374253.git.nicolas@videolabs.io>
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: Pierre Ynard <linkfanel@yahoo.fr>
Date: Mon, 20 Jul 2020 13:11:34 +0200
Subject: [PATCH 7/7] stream_ReadLine: increase line length limit
Subject: [PATCH 7/8] stream_ReadLine: increase line length limit
Very long lines are occasionally encountered in text web resources such
as HTML, JSON or other API data. This bumps the hardcoded limit from
@ -14,12 +14,13 @@ them, but still reasonable to prevent any issue.
Fixes #24957
This is relevant for fixing YouTube playback in 3.0
Message-Id: <70866e5b1dbec781ad1c989bed9a40f37ddbb729.1599040437.git.nicolas@videolabs.io>
---
src/input/stream.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/input/stream.c b/src/input/stream.c
index 07f3f886f7..b2f2e06141 100644
index a191a1de40..7fcac788ba 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -168,7 +168,7 @@ stream_t *(vlc_stream_NewMRL)(vlc_object_t* parent, const char* mrl )
@ -32,5 +33,5 @@ index 07f3f886f7..b2f2e06141 100644
{
stream_priv_t *priv = (stream_priv_t *)s;
--
2.17.1
2.25.1

47
libvlc/patches/vlc3/0008-httpd-update-activity-time-before-processing-timeout.patch

@ -0,0 +1,47 @@
From 0bb4737b520e5d4edd0dd50e48f747fff90b8df2 Mon Sep 17 00:00:00 2001
Message-Id: <0bb4737b520e5d4edd0dd50e48f747fff90b8df2.1601374253.git.nicolas@videolabs.io>
In-Reply-To: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
References: <4b80ba0cb27cadee99cf18b8f13fd7d16f19066b.1601374253.git.nicolas@videolabs.io>
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Mon, 28 Sep 2020 17:52:16 +0200
Subject: [PATCH 8/8] httpd: update activity time before processing timeout
(#25151)
as connection state handling block has moved in
67cdaeea58641d6d515728596f8b194f52538e2b
sockets can now timeout when still active.
---
src/network/httpd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/network/httpd.c b/src/network/httpd.c
index 3197fb2ec9..d9c19c2c29 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -1730,6 +1730,11 @@ static void httpdLoop(httpd_host_t *host)
break;
}
+ if (val == 0) {
+ cl->i_activity_date = now;
+ delay = 0;
+ }
+
if (cl->i_ref < 0 || (cl->i_ref == 0 &&
(cl->i_state == HTTPD_CLIENT_DEAD ||
(cl->i_activity_timeout > 0 &&
@@ -1740,11 +1745,6 @@ static void httpdLoop(httpd_host_t *host)
continue;
}
- if (val == 0) {
- cl->i_activity_date = now;
- delay = 0;
- }
-
struct pollfd *pufd = ufd + nfd;
assert (pufd < ufd + (sizeof (ufd) / sizeof (ufd[0])));
--
2.25.1
Loading…
Cancel
Save