mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-27 12:30:34 -09:00
package/vlc: bump to version 3.0.22
Release notes: https://code.videolan.org/videolan/vlc/-/blob/3.0.22/NEWS Rebased patch 0005. Removed patch 0011 which is included in this release. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
committed by
Julien Olivain
Julien Olivain
parent
e1050a3a50
commit
a8c2ab3995
@@ -11,8 +11,8 @@ Fix compile error
|
||||
Code for #else condition was taken from
|
||||
http://patches.osdyson.org/patch/series/view/vlc/2.2.0~rc2-1+dyson2/dyson.patch
|
||||
|
||||
[Bernd: rebased for vlc-3.0.6 & 3.0.9.2]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Bernd: rebased for 3.0.22]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/posix/error.c | 4 ++++
|
||||
@@ -22,13 +22,13 @@ diff --git a/configure.ac b/configure.ac
|
||||
index dfb4c1c329..bfe43512a2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -590,7 +590,7 @@ dnl Check for system libs needed
|
||||
@@ -667,7 +667,7 @@
|
||||
need_libc=false
|
||||
|
||||
dnl Check for usual libc functions
|
||||
-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
|
||||
+AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale])
|
||||
AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
|
||||
AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
|
||||
AC_REPLACE_FUNCS([gettimeofday])
|
||||
AC_CHECK_FUNC(fdatasync,,
|
||||
diff --git a/src/posix/error.c b/src/posix/error.c
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
From 8befcbfa834b809602db24c9ba7456d8cfc25cdb Mon Sep 17 00:00:00 2001
|
||||
From: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
|
||||
Date: Sun, 2 Mar 2025 08:30:43 +0100
|
||||
Subject: [PATCH] live555: fix build with versions >= 2024.11.28
|
||||
|
||||
In the 2024.11.28 release (version 1732752000), live555 introduced
|
||||
`EventLoopWatchVariable` as a typedef for `std::atomic<char>`, replacing
|
||||
direct use of `char` in earlier versions. Add a conditional typedef to
|
||||
define it as `char` for older versions, and update `event_rtsp` and
|
||||
`event_data` to use `EventLoopWatchVariable`.
|
||||
|
||||
Upstream: https://code.videolan.org/videolan/vlc/-/commit/8befcbfa834b809602db24c9ba7456d8cfc25cdb
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
modules/access/live555.cpp | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
|
||||
index 461766661e49..cacea3c46952 100644
|
||||
--- a/modules/access/live555.cpp
|
||||
+++ b/modules/access/live555.cpp
|
||||
@@ -194,6 +194,10 @@ class RTSPClientVlc;
|
||||
#define CAP_SUBSESSION_PAUSE (1 << 3)
|
||||
#define CAPS_DEFAULT CAP_RATE_CONTROL
|
||||
|
||||
+#if LIVEMEDIA_LIBRARY_VERSION_INT < 1732752000 // 2024.11.28
|
||||
+typedef char EventLoopWatchVariable;
|
||||
+#endif
|
||||
+
|
||||
struct demux_sys_t
|
||||
{
|
||||
char *p_sdp; /* XXX mallocated */
|
||||
@@ -232,8 +236,8 @@ struct demux_sys_t
|
||||
bool b_no_data; /* if we never received any data */
|
||||
int i_no_data_ti; /* consecutive number of TaskInterrupt */
|
||||
|
||||
- char event_rtsp;
|
||||
- char event_data;
|
||||
+ EventLoopWatchVariable event_rtsp;
|
||||
+ EventLoopWatchVariable event_data;
|
||||
|
||||
bool b_get_param; /* Does the server support GET_PARAMETER */
|
||||
bool b_paused; /* Are we paused? */
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://get.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.sha256
|
||||
sha256 24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0 vlc-3.0.21.tar.xz
|
||||
# From https://get.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.sha1
|
||||
sha1 be8557fc2f4be58caebe4a8b1d70f03dc6b95792 vlc-3.0.21.tar.xz
|
||||
# From https://get.videolan.org/vlc/3.0.22/vlc-3.0.22.tar.xz.sha256
|
||||
sha256 e2cc1cf0ae0902a09da5a37c249a8a4e4b5ec4dc095443b8e1493c6a7cc138ea vlc-3.0.22.tar.xz
|
||||
# From https://get.videolan.org/vlc/3.0.22/vlc-3.0.22.tar.xz.sha1
|
||||
sha1 f9871439cdb281e18a78828c389cf7bf66d47d69 vlc-3.0.22.tar.xz
|
||||
# Locally computed
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VLC_VERSION = 3.0.21
|
||||
VLC_VERSION = 3.0.22
|
||||
VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION)
|
||||
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
|
||||
VLC_LICENSE = GPL-2.0+, LGPL-2.1+
|
||||
|
||||
Reference in New Issue
Block a user