From 603d5f8b6dac8a7033697b9cf3e22285b960972d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 17 Oct 2022 09:31:05 +0200 Subject: [PATCH] CI: added Soxr --- .github/scripts/Linux/prepare.sh | 2 +- .github/scripts/Windows/prepare_msys.sh | 2 +- .github/scripts/macOS/prepare.sh | 2 +- .github/workflows/ccpp.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index 1f68a07a3..5bcd4bfb3 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -18,7 +18,7 @@ sudo apt --no-install-recommends install nvidia-cuda-toolkit sudo apt install libglew-dev libglfw3-dev sudo apt install libglm-dev sudo apt install libx11-dev -sudo apt install libspeexdsp-dev +sudo apt install libsoxr-dev libspeexdsp-dev sudo apt install libssl-dev sudo apt install libasound-dev libjack-jackd2-dev libnatpmp-dev libv4l-dev portaudio19-dev sudo apt install libopencv-core-dev libopencv-imgproc-dev diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index 7f8a84cd6..9ddd8b380 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -45,7 +45,7 @@ PACMAN_INSTALL='pacman -Sy --needed --noconfirm --disable-download-timeout' MINGW_PACKAGE_PREFIX=mingw-w64-clang-x86_64 $PACMAN_INSTALL automake autoconf git make pkgconf ${MINGW_PACKAGE_PREFIX}-toolchain ${MINGW_PACKAGE_PREFIX}-cppunit unzip zip $PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-ffmpeg -$PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-speexdsp +$PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-libsoxr ${MINGW_PACKAGE_PREFIX}-speexdsp $PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-glew ${MINGW_PACKAGE_PREFIX}-SDL2 ${MINGW_PACKAGE_PREFIX}-SDL2_mixer ${MINGW_PACKAGE_PREFIX}-SDL2_ttf ${MINGW_PACKAGE_PREFIX}-glfw $PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-glm $PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-portaudio # in case of problems build PA with --with-winapi=wmme,directx,wasapi diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 696e5e319..2aa55e967 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -18,7 +18,7 @@ echo "/usr/local/opt/qt/bin" >> "$GITHUB_PATH" echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> "$GITHUB_ENV" brew install autoconf automake cppunit libtool pkg-config -brew install speexdsp +brew install libsoxr speexdsp brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf brew install imagemagick jack libnatpmp opencv openssl brew install ossp-uuid # for cineform diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 21d7cd59d..f55d45a9a 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-aja --enable-blank --enable-cineform --enable-decklink --enable-file --enable-gl --enable-gl-display --enable-holepunch --enable-jack --enable-jack-transport --enable-libavcodec --enable-natpmp --enable-ndi --enable-openssl --enable-pcp --enable-portaudio --enable-qt --enable-resize --enable-rtdxt --enable-rtsp --enable-rtsp-server --enable-scale --enable-sdl2 --enable-sdl_mixer --enable-sdp-http --enable-speexdsp --enable-swmix --enable-libswscale --enable-testcard-extras=all --enable-text --enable-video-mixer --enable-ximea --enable-zfec' + FEATURES: '--enable-option-checking=fatal --with-live555=/usr/local --enable-aja --enable-blank --enable-cineform --enable-decklink --enable-file --enable-gl --enable-gl-display --enable-holepunch --enable-jack --enable-jack-transport --enable-libavcodec --enable-natpmp --enable-ndi --enable-openssl --enable-pcp --enable-portaudio --enable-qt --enable-resize --enable-rtdxt --enable-rtsp --enable-rtsp-server --enable-scale --enable-sdl2 --enable-sdl_mixer --enable-sdp-http --enable-soxr --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: