From c8252a06107e400d9ff228c3c1ffb7a2e89d689b Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 22 Nov 2024 11:36:24 +0100 Subject: [PATCH] [ci,nightly] make fdk-aac optional --- packaging/deb/freerdp-nightly/control | 2 +- packaging/deb/freerdp-nightly/rules | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index 301cd16e8..d410a3ec5 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -39,7 +39,7 @@ Build-Depends: libswresample-dev | libavresample-dev, libusb-1.0-0-dev, libudev-dev, - libfdk-aac-dev, + libfdk-aac-dev | libfaad-dev, libsoxr-dev, libdbus-glib-1-dev, libpam0g-dev, diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules index 967c5053e..f699e6256 100755 --- a/packaging/deb/freerdp-nightly/rules +++ b/packaging/deb/freerdp-nightly/rules @@ -3,7 +3,11 @@ NULL = DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_FDK_SUPPORT=$(shell dpkg-query -s libfdk-aac-dev 2>&1 >/dev/null; echo $$?) +ifeq ($(DEB_FDK_SUPPORT),0) + AAC_SUPPORT = -DWITH_FDK_AAC=ON +endif SANITIZE_ADDRESS = -DWITH_SANITIZE_ADDRESS=ON DEB_CMAKE_EXTRA_FLAGS := -GNinja \ @@ -11,7 +15,6 @@ DEB_CMAKE_EXTRA_FLAGS := -GNinja \ -DCMAKE_SKIP_INSTALL_RPATH=FALSE \ -DWITH_PULSE=ON \ -DWITH_CHANNELS=ON \ - -DWITH_FDK_AAC=ON \ -DWITH_AAD=ON \ -DWITH_CUPS=ON \ -DWITH_KRB5=ON \ @@ -49,6 +52,7 @@ DEB_CMAKE_EXTRA_FLAGS := -GNinja \ -DFREERDP_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ -DSAMPLE_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ -DSDL_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ + $(AAC_SUPPORT) \ $(SANITIZE_ADDRESS) \ $(NULL)