diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index e0a877748..8d80d46f8 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -37,3 +37,12 @@ if [ -n "$sdk_pass" ]; then make fi +# Install live555 +git clone https://github.com/xanview/live555/ +cd live555 +git checkout 35c375 +./genMakefiles linux-64bit +sudo make install CPLUSPLUS_COMPILER="c++ -DXLOCALE_NOT_USED" + +cd .. + diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index ba21181da..73958afcd 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -38,6 +38,14 @@ if test -d /c/AJA; then data/scripts/build_aja_lib_win64.sh fi +# Install live555 +git clone https://github.com/xanview/live555/ +cd live555 +git checkout 35c375 +./genMakefiles mingw +make install +cd .. + # Install FFMPEG wget --no-verbose https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-latest-win64-dev.zip && wget --no-verbose https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-latest-win64-shared.zip && unzip ffmpeg-latest-win64-dev.zip && unzip ffmpeg-latest-win64-shared.zip && cp -r ffmpeg-latest-win64-dev/include/* /usr/local/include && cp -r ffmpeg-latest-win64-dev/lib/* /usr/local/lib && cp -r ffmpeg-latest-win64-shared/bin/* /usr/local/bin && rm -rf ffmpeg-latest-* diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index a7cf49048..51ce1361f 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -36,3 +36,10 @@ if [ -n "$sdk_pass" ]; then sudo ln -fs /usr/local/lib/libajantv2.dylib /usr/local/lib/ajantv2.dylib fi +# Install live555 +git clone https://github.com/xanview/live555/ +cd live555 +git checkout 35c375 +./genMakefiles macosx +make install +cd .. diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 42714c166..81d7f2c93 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -45,7 +45,7 @@ jobs: if: steps.cache-qt-linux.outputs.cache-hit != 'true' run: .github/scripts/Linux/build-qt.sh - name: configure - run: ./autogen.sh --enable-qt --enable-static-qt --with-cuda-host-compiler=gcc-6 --enable-plugins + run: ./autogen.sh --enable-qt --enable-static-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local - name: make run: make - name: make check @@ -83,7 +83,7 @@ jobs: if: steps.cache-qt-mac.outputs.cache-hit != 'true' run: .github/scripts/macOS/build-qt.sh - name: configure - run: ./autogen.sh --enable-qt --enable-static-qt + run: ./autogen.sh --enable-qt --enable-static-qt --with-live555=/usr/local - name: make run: make osx-gui-dmg - name: make check @@ -114,7 +114,7 @@ jobs: - name: bootsrap MSYS2 run: C:\msys64\usr\bin\bash -lc '$GITHUB_WORKSPACE/.github/scripts/Windows/prepare_msys.sh' - name: configure - run: C:\msys64\usr\bin\bash -lc "./autogen.sh --enable-qt --disable-ndi" + run: C:\msys64\usr\bin\bash -lc "./autogen.sh --enable-qt --disable-ndi --with-live555=/usr/local" - name: make run: C:\msys64\usr\bin\bash -lc "make" - name: make check diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 3eeec4659..6f6aef5d0 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -27,7 +27,7 @@ jobs: run: | sudo apt install qtbase5-dev - name: configure - run: ./autogen.sh --enable-qt --with-cuda-host-compiler=gcc-6 --enable-plugins + run: ./autogen.sh --enable-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local - name: Build with cov-build run: | /tmp/cov-analysis*/bin/cov-build --dir cov-int make -j 2 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0622e7b85..de28679a0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -73,7 +73,7 @@ jobs: if: steps.cache-qt-linux.outputs.cache-hit != 'true' run: .github/scripts/Linux/build-qt.sh - name: configure - run: ./autogen.sh --enable-qt --enable-static-qt --with-cuda-host-compiler=gcc-6 --enable-plugins + run: ./autogen.sh --enable-qt --enable-static-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local - name: make run: make - name: make check @@ -114,7 +114,7 @@ jobs: if: steps.cache-qt-mac.outputs.cache-hit != 'true' run: .github/scripts/macOS/build-qt.sh - name: configure - run: ./autogen.sh --enable-qt --enable-static-qt + run: ./autogen.sh --enable-qt --enable-static-qt --with-live555=/usr/local - name: make run: make osx-gui-dmg - name: make check @@ -148,7 +148,7 @@ jobs: - name: bootsrap MSYS2 run: C:\msys64\usr\bin\bash -lc '$GITHUB_WORKSPACE/.github/scripts/Windows/prepare_msys.sh' - name: configure - run: C:\msys64\usr\bin\bash -lc "./autogen.sh --enable-qt --disable-ndi" + run: C:\msys64\usr\bin\bash -lc "./autogen.sh --enable-qt --disable-ndi --with-live555=/usr/local" - name: make run: C:\msys64\usr\bin\bash -lc "make" - name: make check