From d4347ec2ad691ba513ba9417bb73acbed8190752 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 20 Nov 2024 10:06:38 +0100 Subject: [PATCH 1/2] [ci,nightly] add fdk-aac support for rpm --- packaging/rpm/freerdp-nightly.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec index a44239adf..030bc77c2 100644 --- a/packaging/rpm/freerdp-nightly.spec +++ b/packaging/rpm/freerdp-nightly.spec @@ -121,6 +121,10 @@ BuildRequires: libjpeg-turbo-devel BuildRequires: wayland-devel %endif +%if 0%{?fedora} || 0%{?rhel} > 8 +BuildRequires: (fdk-aac-devel or fdk-aac-free-devel) +%endif + %if 0%{?fedora} >= 36 || 0%{?rhel} >= 8 BuildRequires: (ffmpeg-free-devel or ffmpeg-devel) %endif @@ -176,6 +180,9 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version -DWINPR_USE_LEGACY_RESOURCE_DIR=OFF \ -DRDTK_FORCE_STATIC_BUILD=ON \ -DUWAC_FORCE_STATIC_BUILD=ON \ +%if 0%{?fedora} || 0%{?rhel} > 8 + -DWITH_FDK_AAC=ON \ +%endif %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 || 0%{?suse_version} -DWITH_FFMPEG=ON \ -DWITH_DSP_FFMPEG=ON \ From 2a8bbcc993acd64069c5fce0400635dcc85d87a6 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 20 Nov 2024 10:08:59 +0100 Subject: [PATCH 2/2] [ci,nightly] add fdk-aac support for deb --- packaging/deb/freerdp-nightly/control | 1 + packaging/deb/freerdp-nightly/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index bf4b3e768..301cd16e8 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -39,6 +39,7 @@ Build-Depends: libswresample-dev | libavresample-dev, libusb-1.0-0-dev, libudev-dev, + libfdk-aac-dev, libsoxr-dev, libdbus-glib-1-dev, libpam0g-dev, diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules index 13adc88cd..967c5053e 100755 --- a/packaging/deb/freerdp-nightly/rules +++ b/packaging/deb/freerdp-nightly/rules @@ -11,6 +11,7 @@ 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 \