This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 726510888a gnu: vlc: Update to 3.0.23.
726510888a is described below
commit 726510888ad4f4c621a2aa380aec59d6e61d7300
Author: Andy Tai <[email protected]>
AuthorDate: Sat Jan 24 04:19:56 2026 -0800
gnu: vlc: Update to 3.0.23.
* gnu/packages/video.scm (vlc): Update to 3.0.23.
[source]: Remove patch.
* gnu/packages/patches/vlc-livemedia-2024.11.28.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Change-Id: Ie09f143de9edbcddc96dc836b439ebd7fcf64d6a
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/local.mk | 1 -
.../patches/vlc-livemedia-2024.11.28.patch | 45 ----------------------
gnu/packages/video.scm | 5 +--
3 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index bb0cde0774..013ca3135b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2483,7 +2483,6 @@ dist_patch_DATA =
\
%D%/packages/patches/vcmi-disable-privacy-breach.patch \
%D%/packages/patches/vinagre-newer-freerdp.patch \
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \
- %D%/packages/patches/vlc-livemedia-2024.11.28.patch \
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
diff --git a/gnu/packages/patches/vlc-livemedia-2024.11.28.patch
b/gnu/packages/patches/vlc-livemedia-2024.11.28.patch
deleted file mode 100644
index 824673d0a5..0000000000
--- a/gnu/packages/patches/vlc-livemedia-2024.11.28.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From upstream vlc.
-
-From 8befcbfa834b809602db24c9ba7456d8cfc25cdb Mon Sep 17 00:00:00 2001
-From: Florian Albrechtskirchinger <[email protected]>
-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`.
----
- 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 461766661e..cacea3c469 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? */
---
-2.52.0
-
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 4103d9f475..2186cfdbd0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2482,7 +2482,7 @@ media, 2D/3D graphics and ECMAScript.")
(define-public vlc
(package
(name "vlc")
- (version "3.0.21")
+ (version "3.0.23")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2491,8 +2491,7 @@ media, 2D/3D graphics and ECMAScript.")
"/vlc-" version ".tar.xz"))
(sha256
(base32
- "1c7vbbicx95nymrybgvd2d3p65q0wayhpvsx9ncs1vpsglfvxnr4"))
- (patches (search-patches "vlc-livemedia-2024.11.28.patch"))))
+ "1q77ygpnjvk646diplmiv6kwfmdwbh8daws1z6dsdk9wmbkcm4g8"))))
(build-system gnu-build-system)
(native-inputs
(list flex bison gettext-minimal pkg-config))
