mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

multimedia/vlc: Fix build with net/liveMedia >= 2024.11.28

Browse source 
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
This commit is contained in:
Jason E. Hale 2025-02-08 01:43:52 -05:00
parent bdd363e1be
commit 9526f730d5
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/vlc/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= vlc PORTNAME= vlc
DISTVERSION= 3.0.21 DISTVERSION= 3.0.21
PORTREVISION= 11 PORTREVISION= 12
PORTEPOCH= 4 PORTEPOCH= 4
CATEGORIES= multimedia audio net www CATEGORIES= multimedia audio net www
MASTER_SITES= https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \ MASTER_SITES= https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \

17
multimedia/vlc/files/patch-modules_access_live555.cpp Normal file
View file

@ -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? */