diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index 6b37a2f6a..f91dba53a 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -25,7 +25,7 @@ sudo apt install libcppunit-dev sudo apt --no-install-recommends install nvidia-cuda-toolkit sudo apt install libglew-dev freeglut3-dev libgl1-mesa-dev sudo apt install libx11-dev -sudo apt install libsdl2-dev +sudo apt install libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev sudo apt install libspeexdsp-dev sudo apt install libssl-dev sudo apt install libasound-dev libjack-jackd2-dev libnatpmp-dev libv4l-dev portaudio19-dev diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index 2de318bab..8076d3270 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -42,7 +42,7 @@ PACMAN_INSTALL='pacman -Sy --needed --noconfirm --disable-download-timeout' MSYS_REPO=mingw-w64-ucrt-x86_64 $PACMAN_INSTALL automake autoconf git make pkgconf ${MSYS_REPO}-toolchain ${MSYS_REPO}-cppunit unzip zip $PACMAN_INSTALL ${MSYS_REPO}-speexdsp -$PACMAN_INSTALL ${MSYS_REPO}-glew ${MSYS_REPO}-SDL2 ${MSYS_REPO}-freeglut +$PACMAN_INSTALL ${MSYS_REPO}-glew ${MSYS_REPO}-SDL2 ${MSYS_REPO}-SDL2_mixer ${MSYS_REPO}-SDL2_ttf ${MSYS_REPO}-freeglut $PACMAN_INSTALL ${MSYS_REPO}-portaudio # in case of problems build PA with --with-winapi=wmme,directx,wasapi $PACMAN_INSTALL ${MSYS_REPO}-glib2 ${MSYS_REPO}-curl # RTSP capture pacman -Scc --noconfirm # make some free space diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 0760f9754..2532865e4 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -15,7 +15,7 @@ echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> $GITHUB_ENV brew install autoconf automake cppunit libtool pkg-config brew install speexdsp -brew install ffmpeg portaudio sdl2 +brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf brew install imagemagick jack libnatpmp opencv openssl brew install ossp-uuid # for cineform ( git submodule update --init cineform-sdk && cd cineform-sdk/ && cmake -DBUILD_TOOLS=OFF . && make -j $(sysctl -n hw.ncpu) CFHDCodecStatic || exit 1 ) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 010f45b27..2e0be2935 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1,7 +1,7 @@ name: C/C++ CI env: - FEATURES: '--enable-option-checking=fatal --with-live555=/usr/local --enable-blank --enable-cineform --enable-decklink --enable-file --enable-gl --enable-holepunch --enable-jack --enable-jack-transport --enable-libavcodec --enable-natpmp --enable-ndi --enable-openssl --enable-pcp --enable-portaudio --enable-qt --enable-rtdxt --enable-rtsp --enable-rtsp-server --enable-scale --enable-sdl2 --enable-sdp-http --enable-speexdsp --enable-swmix --enable-libswscale --enable-text --enable-video-mixer --enable-ximea --enable-zfec' + FEATURES: '--enable-option-checking=fatal --with-live555=/usr/local --enable-blank --enable-cineform --enable-decklink --enable-file --enable-gl --enable-holepunch --enable-jack --enable-jack-transport --enable-libavcodec --enable-natpmp --enable-ndi --enable-openssl --enable-pcp --enable-portaudio --enable-qt --enable-rtdxt --enable-rtsp --enable-rtsp-server --enable-scale --enable-sdl2 --enable-sdp-http --enable-speexdsp --enable-swmix --enable-libswscale --enable-testcard-extras=all --enable-text --enable-video-mixer --enable-ximea --enable-zfec' CUDA_FEATURES: '--enable-cuda_dxt --enable-gpujpeg --enable-ldgm-gpu --enable-uyvy' on: