From 2295b6a109bd017ec4eab750bf03b729bf204244 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 15 Mar 2023 16:47:40 +0100 Subject: [PATCH] CI ARM: enable holepunch,speex,ews and zfec - cmake needs to be held in a specific version because the more current version doesn't work with chrooted qemu-user-static arm --- .github/scripts/Linux/arm/bootstrap.sh | 6 +++++- .github/scripts/Linux/arm/build.sh | 4 ++-- .github/scripts/install-common-deps.sh | 10 ++++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/scripts/Linux/arm/bootstrap.sh b/.github/scripts/Linux/arm/bootstrap.sh index d2f7bb45d..2519f9610 100755 --- a/.github/scripts/Linux/arm/bootstrap.sh +++ b/.github/scripts/Linux/arm/bootstrap.sh @@ -28,11 +28,15 @@ if grep -q Raspbian /etc/os-release; then # https://bugs.launchpad.net/ubuntu/+s apt -y update fi +apt -y install cmake=3.13.4-1 cmake-data=3.13.4-1 # 3.16 in the above added repository is broken with chrooted qemu-user-static + apt -y install build-essential git pkg-config autoconf automake libtool -apt -y install libcurl4-openssl-dev libsoxr-dev libssl-dev +apt -y install libcurl4-openssl-dev libsoxr-dev libspeexdsp-dev libssl-dev apt -y install libasound2-dev portaudio19-dev libjack-dev apt -y install libglew-dev libglfw3-dev libglm-dev +/.github/scripts/install-common-deps.sh + # FFmpeg if [ "$ARCH" = armhf ]; then # Raspbian - build own FFmpeg with OMX camera patch apt -y install libraspberrypi-dev libdrm-dev diff --git a/.github/scripts/Linux/arm/build.sh b/.github/scripts/Linux/arm/build.sh index 522e3dfd0..9ee94a06a 100755 --- a/.github/scripts/Linux/arm/build.sh +++ b/.github/scripts/Linux/arm/build.sh @@ -10,12 +10,12 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:${PKG_CONFIG_PATH:+":$PKG_CONFIG ARCH=$(dpkg --print-architecture) APPNAME=UltraGrid-latest-${ARCH}.AppImage -set -- --enable-plugins --enable-openssl --enable-soxr # general +set -- --enable-plugins --enable-openssl --enable-soxr --enable-speexdsp # general set -- "$@" --enable-alsa --enable-jack --enable-jack-transport # audio set -- "$@" --enable-decklink --enable-file --enable-rtsp --enable-screen=x11 --enable-swmix --enable-v4l2 # vcap set -- "$@" --enable-gl-display --enable-panogl_disp --enable-sdl # display set -- "$@" --enable-libavcodec --enable-rtdxt --enable-libswscale --enable-uyvy # compression -set -- "$@" --enable-blank --enable-scale --enable-testcard-extras # extras (pp. etc) +set -- "$@" --enable-blank --enable-holepunch --enable-pcp --enable-scale --enable-sdp-http --enable-testcard-extras --enable-zfec # extras (pp. etc) if [ "$ARCH" = armhf ]; then # Raspbian set -- "$@" --enable-lavc-hw-accel-rpi4 fi diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh index b2dd182dd..d02292d97 100755 --- a/.github/scripts/install-common-deps.sh +++ b/.github/scripts/install-common-deps.sh @@ -7,7 +7,9 @@ case "$(uname -s)" in ;; *) - sudo="sudo" + if [ "$(id -u)" -ne 0 ]; then + sudo="sudo" + fi ;; esac @@ -15,6 +17,8 @@ if ! command -v nproc >/dev/null; then nproc() { sysctl -n hw.logicalcpu; } # mac fi +is_arm() { expr "$(dpkg --print-architecture)" : arm >/dev/null; } + # for Win only download here, compilation is handled differently download_install_cineform() {( cd "$GITHUB_WORKSPACE" @@ -62,7 +66,9 @@ install_zfec() {( ${sudo:+"$sudo" }mv zfec/zfec /usr/local/src )} -download_install_cineform +if ! is_arm; then + download_install_cineform +fi install_ews install_juice install_pcp