mirror of
https://github.com/outbackdingo/UltraGrid.git
synced 2026-03-20 16:40:12 +00:00
CI mac: fix broken live555 test
live555 HEAD commit is now f4a4e8fb0 testRTSPClient.cpp:64:24: error: copying variable of type 'EventLoopWatchVariable' (aka 'atomic<char>') invokes deleted constructor 64 | EventLoopWatchVariable eventLoopWatchVariable = 0;
This commit is contained in:
7
.github/scripts/install-common-deps.sh
vendored
7
.github/scripts/install-common-deps.sh
vendored
@@ -79,6 +79,12 @@ install_juice() {
|
||||
)
|
||||
}
|
||||
|
||||
# fixes broken live555 test
|
||||
live555_rm_tests() {
|
||||
sed -e '/TESTPROGS_DIR.*MAKE/d' Makefile > Makefile.fix
|
||||
mv -f Makefile.fix Makefile
|
||||
}
|
||||
|
||||
download_build_live555() {(
|
||||
git clone --depth 1 https://github.com/xanview/live555/
|
||||
cd live555
|
||||
@@ -95,6 +101,7 @@ download_build_live555() {(
|
||||
make -j "$(nproc)" CPLUSPLUS_COMPILER="c++ -DNO_STD_LIB"
|
||||
else
|
||||
./genMakefiles macosx-no-openssl
|
||||
live555_rm_tests
|
||||
make -j "$(nproc)" CPLUSPLUS_COMPILER="c++ -std=c++11"
|
||||
fi
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user