From 2ceabe6794d0de7eaecc86483c2b1a855bae2c20 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 14 Mar 2025 13:27:19 +0100 Subject: [PATCH] [ci,alt-arch] fix gsm, simplify config --- .github/workflows/alt-architectures.yml | 7 +------ ci/cmake-preloads/config-linux-alt-arch.txt | 6 ++++-- packaging/deb/freerdp-nightly/control | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/alt-architectures.yml b/.github/workflows/alt-architectures.yml index 84660acca..af36f2733 100644 --- a/.github/workflows/alt-architectures.yml +++ b/.github/workflows/alt-architectures.yml @@ -38,8 +38,6 @@ jobs: install: | echo "whoami: $(whoami)" echo "working directory: $(pwd)" - find /etc/apt -name "*.list" -exec sed -i '/deb-src/s/^# //' {} \; - find /etc/apt -name "*.sources" -exec sed -i '/Types: deb/Types: deb deb-src//' {} \; apt-get update -q -y apt-get install -q -y devscripts clang ninja-build ccache equivs @@ -53,9 +51,6 @@ jobs: -S . \ -DCMAKE_INSTALL_PREFIX=/tmp/ci-test \ -DCMAKE_C_COMPILER=/usr/bin/clang \ - -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \ - -DUSE_UNWIND=OFF \ - -DUSE_EXECINFO=OFF \ - -DWITH_SANITIZE_ADDRESS=OFF + -DCMAKE_CXX_COMPILER=/usr/bin/clang++ cmake --build ci-build --parallel $(nproc) --target install cmake --build ci-build --parallel $(nproc) --target test diff --git a/ci/cmake-preloads/config-linux-alt-arch.txt b/ci/cmake-preloads/config-linux-alt-arch.txt index 8adb991db..6b6915838 100644 --- a/ci/cmake-preloads/config-linux-alt-arch.txt +++ b/ci/cmake-preloads/config-linux-alt-arch.txt @@ -10,7 +10,7 @@ set(WITH_WAYLAND ON CACHE BOOL "preload") set(WITH_KRB5 ON CACHE BOOL "preload") set(WITH_PCSC ON CACHE BOOL "preload") set(WITH_JPEG ON CACHE BOOL "preload") -set(WITH_GSM OFF CACHE BOOL "preload") +set(WITH_GSM ON CACHE BOOL "preload") set(CHANNEL_URBDRC ON CACHE BOOL "preload") set(CHANNEL_URBDRC_CLIENT ON CACHE BOOL "preload") set(WITH_SERVER ON CACHE BOOL "preload") @@ -46,7 +46,9 @@ set(WITH_DEBUG_X11_LOCAL_MOVESIZE OFF CACHE BOOL "preload") set(WITH_DEBUG_XV OFF CACHE BOOL "preload") set(WITH_SAMPLE ON CACHE BOOL "preload") set(WITH_NO_UNDEFINED ON CACHE BOOL "preload") -set(WITH_SANITIZE_ADDRESS ON CACHE BOOL "preload") +set(WITH_SANITIZE_ADDRESS OFF CACHE BOOL "preload") +set(USE_UNWIND OFF CACHE BOOL "preload") +set(USE_EXECINFO OFF CACHE BOOL "preload") set(WITH_FFMPEG ON CACHE BOOL "preload") set(WITH_SWSCALE ON CACHE BOOL "preload") set(WITH_DSP_FFMPEG ON CACHE BOOL "preload") diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index 380e2e201..72fa6577f 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -37,6 +37,7 @@ Build-Depends: libavcodec-dev, libavutil-dev, libfuse3-dev, + libgsm1-dev, libswresample-dev | libavresample-dev, libusb-1.0-0-dev, libudev-dev,