From b325d0b78ddf62e9d97b0094a84cb2879e148571 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 11 Jun 2024 11:00:57 +0200 Subject: [PATCH] CI: arm build fix The commit bd91d16b (2024-05-31) causes the live555 being build on all platforms, including arm Linux. But the plaform is not valid for that, so replace linux-64bit with linux. Also enforce live555 in this case. --- .github/scripts/Linux/arm/build.sh | 1 + .github/scripts/install-common-deps.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/Linux/arm/build.sh b/.github/scripts/Linux/arm/build.sh index 977ba9682..fd47c6053 100755 --- a/.github/scripts/Linux/arm/build.sh +++ b/.github/scripts/Linux/arm/build.sh @@ -19,6 +19,7 @@ set -- "$@" --enable-caca --enable-gl-display --enable-panogl_disp --enable-sdl set -- "$@" --enable-libavcodec --enable-rtdxt --enable-libswscale --enable-uyvy # compression set -- "$@" --enable-blank --enable-holepunch --enable-natpmp --enable-pcp --enable-resize --enable-scale --enable-sdp-http --enable-testcard-extras --enable-text --enable-video-mixer --enable-zfec # extras (pp. etc) set -- "$@" --enable-drm +set -- "$@" --enable-rtsp-server if [ "$ARCH" = arm64 ]; then set -- "$@" --enable-vulkan fi diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh index 38582f09c..37808992c 100755 --- a/.github/scripts/install-common-deps.sh +++ b/.github/scripts/install-common-deps.sh @@ -82,7 +82,7 @@ download_build_live555() { # ensure binutils ld is used (not lld) pacman -Sy --noconfirm binutils elif [ "$(uname -s)" = Linux ]; then - target=linux-64bit + target=linux else target=macosx fi