From 640bdfeb9f4750e9133c81e02408f4efd733ca19 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Thu, 15 Oct 2026 12:19:15 +0100 Subject: [PATCH] Build FDK AAC, rather than use Ubuntu version, which doesn't support xHE-AAC. --- debian/control | 1 - flatpak/org.sdrangel.SDRangel.yaml | 19 +++++++++++++++++++ modemdrm/CMakeLists.txt | 9 +++++---- plugins/channelrx/CMakeLists.txt | 4 ++-- snap/snapcraft.yaml | 18 ++++++++++++++++-- 5 files changed, 42 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index 45544659a..ee4ee338a 100644 --- a/debian/control +++ b/debian/control @@ -48,7 +48,6 @@ Build-Depends: debhelper (>= 9), ninja-build, libfaad-dev, libflac-dev, - libfdk-aac-dev, libavcodec-dev, libavformat-dev, libavfilter-dev, diff --git a/flatpak/org.sdrangel.SDRangel.yaml b/flatpak/org.sdrangel.SDRangel.yaml index 58bb96bbd..ebd54dd42 100644 --- a/flatpak/org.sdrangel.SDRangel.yaml +++ b/flatpak/org.sdrangel.SDRangel.yaml @@ -255,6 +255,25 @@ modules: url: https://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/faad2-2.8.8.tar.gz sha256: 985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d + - name: fdk-aac + buildsystem: cmake-ninja + config-opts: + - -DBUILD_SHARED_LIBS=OFF + - -DCMAKE_POSITION_INDEPENDENT_CODE=ON + - -DBUILD_PROGRAMS=OFF + sources: + - type: git + url: https://github.com/mstorsjo/fdk-aac.git + tag: v2.0.3 + commit: 716f4394641d53f0d79c9ddac3fa93b03a49f278 + post-install: + - install -Dm644 NOTICE ${FLATPAK_DEST}/share/licenses/fdk-aac/NOTICE + cleanup: + - /include/fdk-aac + - /lib/libfdk-aac.a + - /lib/pkgconfig/fdk-aac.pc + - /lib/cmake/fdk-aac + - name: hidapi buildsystem: cmake-ninja sources: diff --git a/modemdrm/CMakeLists.txt b/modemdrm/CMakeLists.txt index 95d1d74b4..1d977ead2 100644 --- a/modemdrm/CMakeLists.txt +++ b/modemdrm/CMakeLists.txt @@ -66,10 +66,11 @@ if(FDKAAC_FOUND) if(DEFINED FDKAAC_DEPENDS) add_dependencies(modemdrm ${FDKAAC_DEPENDS}) endif() - # The external FDK is private to modemdrm. Do not re-export its aacDecoder_* - # symbols from a shared modemdrm, so they cannot interpose on (or be - # interposed by) the libfdk-aac that FFmpeg loads in the same process. - if(FDKAAC_EXTERNAL AND BUILD_SHARED_LIBS AND UNIX AND NOT APPLE) + # A static FDK (the external one, or one built for a package) is private to + # modemdrm. Do not re-export its aacDecoder_* symbols from a shared + # modemdrm, so they cannot interpose on (or be interposed by) the + # libfdk-aac that FFmpeg loads in the same process. + if((FDKAAC_EXTERNAL OR FDKAAC_LIBRARY MATCHES "\\.a$") AND BUILD_SHARED_LIBS AND UNIX AND NOT APPLE) target_link_options(modemdrm PRIVATE "LINKER:--exclude-libs,libfdk-aac.a") endif() endif() diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt index 4b9c3a11f..336c54645 100644 --- a/plugins/channelrx/CMakeLists.txt +++ b/plugins/channelrx/CMakeLists.txt @@ -145,10 +145,10 @@ else() message(STATUS "Not building demoddroneid (ENABLE_CHANNELRX_DEMODDRONEID=${ENABLE_CHANNELRX_DEMODDRONEID})") endif() -if(ENABLE_CHANNELRX_DEMODDAB AND DAB_FOUND AND ZLIB_FOUND AND FAAD_FOUND) +if(ENABLE_CHANNELRX_DEMODDAB) add_subdirectory(demoddab) else() - message(STATUS "Not building demoddab (ENABLE_CHANNELRX_DEMODDAB=${ENABLE_CHANNELRX_DEMODDAB} DAB_FOUND=${DAB_FOUND} ZLIB_FOUND=${ZLIB_FOUND} FAAD_FOUND=${FAAD_FOUND})") + message(STATUS "Not building demoddab (ENABLE_CHANNELRX_DEMODDAB=${ENABLE_CHANNELRX_DEMODDAB})") endif() if(ENABLE_CHANNELRX_DEMODDRM) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index eaecf8ef1..5f08b0fab 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -169,7 +169,7 @@ parts: override-pull: | craftctl default craftctl set version="$(git describe --tags --abbrev=0 | sed 's/v//')" - after: [apt, mbelib, serialdv, dsdcc, codec2, sgp4, cspice, inmarsatc, cm265cc, airspy, rtlsdr, pluto, bladerf, hackrf, limesuite, airspyhf, uhd, uhdfpga, soapysdr, soapyremote] + after: [apt, mbelib, serialdv, dsdcc, codec2, sgp4, cspice, inmarsatc, cm265cc, fdkaac, airspy, rtlsdr, pluto, bladerf, hackrf, limesuite, airspyhf, uhd, uhdfpga, soapysdr, soapyremote] cmake-parameters: - -DDEBUG_OUTPUT=OFF - -DBUILD_TYPE=RELEASE @@ -198,6 +198,7 @@ parts: - -DCSPICE_DIR=$CRAFT_STAGE/opt/install/sdrangel - -DINMARSATC_DIR=$CRAFT_STAGE/opt/install/sdrangel - -DLIBSIGMF_DIR=$CRAFT_STAGE/opt/install/sdrangel + - -DFDKAAC_DIR=$CRAFT_STAGE/opt/install/sdrangel - -DARCH_OPT=nehalem build-packages: - libfftw3-dev @@ -224,7 +225,6 @@ parts: - qt6-location-plugins - libfaad-dev - libflac-dev - - libfdk-aac-dev - zlib1g-dev - libboost-all-dev - libasound2-dev @@ -511,6 +511,20 @@ parts: cmake-parameters: - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel + fdkaac: + plugin: cmake + source: https://github.com/mstorsjo/fdk-aac.git + source-type: git + source-tag: v2.0.3 + cmake-parameters: + - -DCMAKE_INSTALL_PREFIX=/opt/install/sdrangel + - -DBUILD_SHARED_LIBS=OFF + - -DCMAKE_POSITION_INDEPENDENT_CODE=ON + - -DBUILD_PROGRAMS=OFF + override-build: | + craftctl default + install -Dm644 $CRAFT_PART_SRC/NOTICE $CRAFT_PART_INSTALL/opt/install/sdrangel/share/licenses/fdk-aac/NOTICE + # libsigmf: # plugin: cmake # source: https://github.com/f4exb/libsigmf.git