git: 9526f730d524 - main - multimedia/vlc: Fix build with net/liveMedia >= 2024.11.28
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 08 Feb 2025 06:47:19 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9526f730d5241149cfb2f663bb433a8674c226ff
commit 9526f730d5241149cfb2f663bb433a8674c226ff
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-02-08 06:43:52 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-02-08 06:43:52 +0000
multimedia/vlc: Fix build with net/liveMedia >= 2024.11.28
access/live555.cpp:542:36: error: cannot initialize a parameter of type 'EventLoopWatchVariable *' (aka 'atomic<char> *') with an rvalue of type 'char *'
542 | p_sys->scheduler->doEventLoop( &p_sys->event_rtsp );
| ^~~~~~~~~~~~~~~~~~
/usr/local/include/UsageEnvironment/UsageEnvironment.hh:155:52: note: passing argument to parameter 'watchVariable' here
155 | virtual void doEventLoop(EventLoopWatchVariable* watchVariable = NULL) = 0;
| ^
access/live555.cpp:1444:36: error: cannot initialize a parameter of type 'EventLoopWatchVariable *' (aka 'atomic<char> *') with an rvalue of type 'char *'
1444 | p_sys->scheduler->doEventLoop( &p_sys->event_data );
| ^~~~~~~~~~~~~~~~~~
/usr/local/include/UsageEnvironment/UsageEnvironment.hh:155:52: note: passing argument to parameter 'watchVariable' here
155 | virtual void doEventLoop(EventLoopWatchVariable* watchVariable = NULL) = 0;
Reported by: pkg-fallout
---
multimedia/vlc/Makefile | 2 +-
multimedia/vlc/files/patch-modules_access_live555.cpp | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 8e9960fcb5b5..cab05edf8d5c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,6 +1,6 @@
PORTNAME= vlc
DISTVERSION= 3.0.21
-PORTREVISION= 11
+PORTREVISION= 12
PORTEPOCH= 4
CATEGORIES= multimedia audio net www
MASTER_SITES= https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/multimedia/vlc/files/patch-modules_access_live555.cpp b/multimedia/vlc/files/patch-modules_access_live555.cpp
new file mode 100644
index 000000000000..e2cdbce158dd
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_access_live555.cpp
@@ -0,0 +1,17 @@
+The signature of doEventLoop() was changed to match that of
+triggerEvent(), by using std::atomic_char as the 'watch variable'
+type in net/liveMedia 2024.11.28.
+
+--- modules/access/live555.cpp.orig 2024-06-05 15:56:07 UTC
++++ modules/access/live555.cpp
+@@ -236,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;
++ std::atomic_char event_rtsp;
++ std::atomic_char event_data;
+
+ bool b_get_param; /* Does the server support GET_PARAMETER */
+ bool b_paused; /* Are we paused? */