From 449c03dfcd15dae3b19a14a5a8ee5bcae6fe2e45 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 9 Mar 2023 13:16:41 +0100 Subject: [PATCH] CI: added caca --- .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 63ec4f17a..cbe0751dd 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -20,7 +20,7 @@ sudo apt install libglm-dev sudo apt install libx11-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 libasound-dev libcaca-dev libjack-jackd2-dev libnatpmp-dev libv4l-dev portaudio19-dev sudo apt install libopencv-core-dev libopencv-imgproc-dev sudo apt install libcurl4-nss-dev sudo apt install i965-va-driver-shaders # instead of i965-va-driver diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh index cf4eabe0b..0764c1dc0 100644 --- a/.github/scripts/Windows/prepare_msys.sh +++ b/.github/scripts/Windows/prepare_msys.sh @@ -46,7 +46,7 @@ MINGW_PACKAGE_PREFIX=mingw-w64-clang-x86_64 $PACMAN_INSTALL automake autoconf git make pkgconf ${MINGW_PACKAGE_PREFIX}-toolchain unzip zip $PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-ffmpeg $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}-glew ${MINGW_PACKAGE_PREFIX}-libcaca ${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 $PACMAN_INSTALL ${MINGW_PACKAGE_PREFIX}-curl # RTSP capture diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 139581ae5..33624ef18 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -20,7 +20,7 @@ brew install autoconf automake libtool pkg-config brew install libsoxr speexdsp brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf brew install molten-vk vulkan-headers -brew install imagemagick jack libnatpmp opencv wolfssl +brew install imagemagick libcaca libnatpmp jack opencv wolfssl brew install ossp-uuid # for cineform brew install qt@5 brew install glm diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ae77c6a5c..21d129783 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-soxr --enable-speexdsp --enable-swmix --enable-libswscale --enable-testcard-extras=all --enable-text --enable-video-mixer --enable-vulkan --enable-ximea --enable-zfec' + FEATURES: '--enable-option-checking=fatal --with-live555=/usr/local --enable-aja --enable-blank --enable-caca --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-vulkan --enable-ximea --enable-zfec' CUDA_FEATURES: '--enable-cuda_dxt --enable-gpujpeg --enable-ldgm-gpu --enable-uyvy' on: