diff --git a/.github/scripts/Linux/arm/bootstrap.sh b/.github/scripts/Linux/arm/bootstrap.sh index 121b98dc7..660226eb1 100755 --- a/.github/scripts/Linux/arm/bootstrap.sh +++ b/.github/scripts/Linux/arm/bootstrap.sh @@ -29,13 +29,15 @@ 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 autoconf automake build-essential git pkg-config libtool sudo 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 +apt -y install libnatpmp-dev /.github/scripts/install-common-deps.sh /.github/scripts/Linux/install_others.sh ndi +/.github/scripts/Linux/install_others.sh ximea # FFmpeg if [ "$ARCH" = armhf ]; then # Raspbian - build own FFmpeg with OMX camera patch diff --git a/.github/scripts/Linux/arm/build.sh b/.github/scripts/Linux/arm/build.sh index ea805430d..f3f719509 100755 --- a/.github/scripts/Linux/arm/build.sh +++ b/.github/scripts/Linux/arm/build.sh @@ -12,10 +12,10 @@ APPNAME=UltraGrid-latest-${ARCH}.AppImage 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-ndi --enable-rtsp --enable-screen=x11 --enable-swmix --enable-v4l2 # vcap +set -- "$@" --enable-decklink --enable-file --enable-ndi --enable-rtsp --enable-screen=x11 --enable-swmix --enable-v4l2 --enable-ximea # 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-holepunch --enable-pcp --enable-scale --enable-sdp-http --enable-testcard-extras --enable-zfec # extras (pp. etc) +set -- "$@" --enable-blank --enable-holepunch --enable-natpmp --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/Linux/install_others.sh b/.github/scripts/Linux/install_others.sh index 1583a8c59..62d1bd532 100755 --- a/.github/scripts/Linux/install_others.sh +++ b/.github/scripts/Linux/install_others.sh @@ -5,10 +5,10 @@ if [ "$(id -u)" -eq 0 ]; then fi install_ximea() { - wget --no-verbose https://www.ximea.com/downloads/recent/XIMEA_Linux_SP.tgz + curl -LO https://www.ximea.com/downloads/recent/XIMEA_Linux_SP.tgz tar xzf XIMEA_Linux_SP.tgz cd package - sudo ./install + sudo ./install -noudev } # Install AJA