From 7b9cb9e2421d48996c545d07e71e3819abc4d1f8 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 5 Dec 2024 17:39:13 +0100 Subject: [PATCH] rebuild for live555 Adapt to new EventLoopWatchVariable type in live555-2024.11.28. --- live555.patch | 17 +++++++++++++++++ vlc.spec | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 live555.patch diff --git a/live555.patch b/live555.patch new file mode 100644 index 0000000..b2f35db --- /dev/null +++ b/live555.patch @@ -0,0 +1,17 @@ +diff -up vlc-3.0.21/modules/access/live555.cpp.orig vlc-3.0.21/modules/access/live555.cpp +--- vlc-3.0.21/modules/access/live555.cpp.orig 2024-06-05 17:56:07.000000000 +0200 ++++ vlc-3.0.21/modules/access/live555.cpp 2024-12-06 11:41:08.633053039 +0100 +@@ -236,8 +236,13 @@ struct demux_sys_t + bool b_no_data; /* if we never received any data */ + int i_no_data_ti; /* consecutive number of TaskInterrupt */ + ++#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1732752000 ++ std::atomic_char event_rtsp; ++ std::atomic_char event_data; ++#else + char event_rtsp; + char event_data; ++#endif + + bool b_get_param; /* Does the server support GET_PARAMETER */ + bool b_paused; /* Are we paused? */ diff --git a/vlc.spec b/vlc.spec index e8fdc5a..1d62ae9 100644 --- a/vlc.spec +++ b/vlc.spec @@ -59,6 +59,8 @@ Patch: libidn2.patch Patch: lua-math.patch # update to freerdp2 api; backport from master Patch: freerdp2.patch +# fix build with live555-2024.11.28 +Patch: live555.patch %{load:%{S:1}} %global __provides_exclude_from ^%{vlc_plugindir}/.*$