mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-26 19:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10886 from akallabeth/nightly-deb

Browse Source 
[ci,nightly] make fdk-aac optional
This commit is contained in:
akallabeth 2024-11-22 11:41:14 +01:00 committed by GitHub
commit bb6642e92f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/deb/freerdp-nightly/control
View File

@ -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,

6
packaging/deb/freerdp-nightly/rules
View File

@ -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)