diff --git a/.github/scripts/Linux/arm/bootstrap.sh b/.github/scripts/Linux/arm/bootstrap.sh index aed37d57b..5afa6f132 100755 --- a/.github/scripts/Linux/arm/bootstrap.sh +++ b/.github/scripts/Linux/arm/bootstrap.sh @@ -47,7 +47,8 @@ apt -y install libasound2-dev portaudio19-dev libjack-dev apt -y install libglew-dev libglfw3-dev libglm-dev apt -y install libcaca-dev libmagickwand-dev libnatpmp-dev libopencv-core-dev libopencv-imgproc-dev libv4l-dev apt -y install libavcodec-dev libavformat-dev libswscale-dev libraspberrypi-dev -apt -y install libdrm-dev +apt -y install libdrm-dev\ + libsdl2-mixer-dev libsdl2-ttf-dev\ /.github/scripts/install-common-deps.sh /.github/scripts/Linux/install_others.sh ndi pipewire ximea diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index 1ae6a615c..8efed1454 100644 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -31,6 +31,10 @@ export CHANNEL TAG VERSION printf '%b' "CHANNEL=$CHANNEL\nTAG=$TAG\nVERSION=$VERSION\n" >> "$GITHUB_ENV" +is_arm() { + [ "$(uname -m)" = arm64 ] || [ "$GITHUB_WORKFLOW" = 'ARM builds' ] +} + export FEATURES="\ --enable-option-checking=fatal\ --with-live555=/usr/local\ @@ -74,9 +78,14 @@ export FEATURES="\ CUDA_FEATURES="--enable-cuda_dxt --enable-gpujpeg --enable-ldgm-gpu --enable-uyvy" case "$RUNNER_OS" in Linux) - FEATURES="$FEATURES $CUDA_FEATURES --enable-plugins\ - --enable-alsa --enable-lavc-hw-accel-vaapi --enable-lavc-hw-accel-vdpau\ - --enable-pipewire-audio --enable-v4l2" + FEATURES="$FEATURES --enable-plugins --enable-alsa \ +--enable-pipewire-audio --enable-v4l2" + if is_arm; then + FEATURES="$FEATURES --disable-qt" + else + FEATURES="$FEATURES $CUDA_FEATURES \ +--enable-lavc-hw-accel-vaapi --enable-lavc-hw-accel-vdpau" + fi ;; macOS) FEATURES="$FEATURES --enable-avfoundation --enable-coreaudio --enable-syphon" @@ -90,7 +99,7 @@ case "$RUNNER_OS" in ;; esac -if [ "$(uname -s)" != Darwin ] || [ "$(uname -m)" != arm64 ]; then +if ! is_arm; then FEATURES="$FEATURES --enable-cineform" fi diff --git a/.github/workflows/arm-build.yml b/.github/workflows/arm-build.yml index c8a7681f4..725379ff0 100644 --- a/.github/workflows/arm-build.yml +++ b/.github/workflows/arm-build.yml @@ -29,6 +29,8 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Init environment variables + run: . .github/scripts/environment.sh - name: Prepare run: | sudo apt update @@ -76,6 +78,7 @@ jobs: run: | sudo cp -ar $GITHUB_WORKSPACE ~/chroot/UltraGrid env | grep -v '^\(HOME\)\|\(USER\)' | sed -e "s/=/='/" -e "s/$/'/" | sudo tee ~/chroot/envvars + echo "FEATURES=\"$FEATURES\"" | sudo tee -a ~/chroot/envvars sudo chroot ~/chroot /bin/sh -ec "set -a; . /envvars; set +a; cd UltraGrid; .github/scripts/Linux/arm/build.sh" - name: Upload Release Asset id: upload-release-asset