From 372c59dd74fce3d46ddf286cbff47887f61d6383 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 17 Feb 2025 06:56:41 +0100 Subject: [PATCH] [ci,nightly] build debian sdl2 and sdl3 build SDL2 client and optionally SDL3 client if the dependencies are available --- packaging/deb/freerdp-nightly/control | 4 ++++ packaging/deb/freerdp-nightly/rules | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index d410a3ec5..5fb7ea241 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -45,6 +45,10 @@ Build-Depends: libpam0g-dev, uuid-dev, libjson-c-dev | libcjson-dev, + libsdl2-2.0-0, + libsdl2-dev, + libsdl2-ttf-dev, + libsdl2-image-dev, libsdl3-0 | libsdl2-2.0-0, libsdl3-dev | libsdl2-dev, libsdl3-ttf-dev | libsdl2-ttf-dev, diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules index f699e6256..afaf47a92 100755 --- a/packaging/deb/freerdp-nightly/rules +++ b/packaging/deb/freerdp-nightly/rules @@ -4,10 +4,16 @@ 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 $$?) +DEB_SDL3_SUPPORT=$(shell dpkg-query -s libsdl3-dev libsdl3-image-dev libsdl3-ttf-dev 2>&1 >/dev/null; echo $$?) ifeq ($(DEB_FDK_SUPPORT),0) AAC_SUPPORT = -DWITH_FDK_AAC=ON endif +ifeq ($(DEB_SDL3_SUPPORT),0) + SDL3_SUPPORT = -DWITH_CLIENT_SDL3=ON +else + SDL3_SUPPORT = -DWITH_CLIENT_SDL3=OFF +endif SANITIZE_ADDRESS = -DWITH_SANITIZE_ADDRESS=ON DEB_CMAKE_EXTRA_FLAGS := -GNinja \ @@ -38,6 +44,7 @@ DEB_CMAKE_EXTRA_FLAGS := -GNinja \ -DWITH_TIMEZONE_FROM_FILE=ON \ -DSDL_USE_COMPILED_RESOURCES=OFF \ -DWITH_SDL_IMAGE_DIALOGS=ON \ + -DWITH_CLIENT_SDL_VERSIONED=ON \ -DRDTK_FORCE_STATIC_BUILD=ON \ -DUWAC_FORCE_STATIC_BUILD=ON \ -DWITH_BINARY_VERSIONING=ON \ @@ -53,6 +60,7 @@ DEB_CMAKE_EXTRA_FLAGS := -GNinja \ -DSAMPLE_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ -DSDL_USE_VENDOR_PRODUCT_CONFIG_DIR=ON \ $(AAC_SUPPORT) \ + $(SDL3_SUPPORT) \ $(SANITIZE_ADDRESS) \ $(NULL)