From d59542b41f3946338cfc729ca413a19f99f13caf Mon Sep 17 00:00:00 2001
From: Thomas Neder <thomas.neder@freenet.de>
Date: Sun, 6 Oct 2024 19:08:39 +0200
Subject: [PATCH] Update to FDK-AAC 2.0.3 regarding issue #16

---
 CMakeLists.txt                                |  5 ++--
 README.md                                     | 25 ++++++++++---------
 .../cmake_and_build_for_appimage.sh           |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3271f8..3f05c7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ try_find_vcpkg_toolset_path()
 print(CMAKE_TOOLCHAIN_FILE)
 
 ##############################
-project(DABstar VERSION 2.6.0)
+project(DABstar VERSION 2.7.0)
 ##############################
 
 set(objectName "dabstar")
@@ -132,7 +132,7 @@ option(USE_HBF "Use oversampling with half band filter (needs liquid-dsp)" OFF)
 option(DATA_STREAMER OFF)
 option(VITERBI_SSE OFF)
 option(VITERBI_NEON OFF)
-option(FDK_AAC OFF)
+option(FDK_AAC ON)
 
 set(USE_FFT FFTW3 CACHE STRING "Choose FFT out of these free: FFTW3 KISS NAYUKI")
 set_property(CACHE USE_FFT PROPERTY STRINGS "FFTW3;KISS;NAYUKI")
@@ -444,6 +444,7 @@ if (FDK_AAC)
     list(APPEND extraLibs ${FDK_AAC_LIBRARIES})
     add_definitions(-D__WITH_FDK_AAC__)
 elseif (NOT FDK_AAC)
+    message(FATAL_ERROR "libfaad made issues, use better FDK_ACC (>= 2.0.3), or comment out this message")
     find_package(Faad)
     if (NOT FAAD_FOUND)
         message(FATAL_ERROR "Please install libfaad")
diff --git a/README.md b/README.md
index ae25f75..42eae71 100644
--- a/README.md
+++ b/README.md
@@ -188,21 +188,22 @@ sudo apt-get install libfftw3-dev
 sudo apt-get install portaudio19-dev
 sudo apt-get install zlib1g-dev
 sudo apt-get install libsamplerate0-dev
-sudo apt-get install libfaad-dev
 sudo apt-get install libusb-1.0-0-dev
 sudo apt-get install libqwt-qt5-dev
 ```
 
-or same in fewer lines:
-
-```
-sudo apt-get update
-sudo apt-get install git cmake build-essential g++ libsndfile1-dev libfftw3-dev portaudio19-dev zlib1g-dev libsamplerate0-dev libfaad-dev libusb-1.0-0-dev
-```
-
-If you decide using FDK-ACC (use `-DFDK_AAC=ON` on `cmake` command) instead of faad you can omit installing `libfaad-dev` and install instead this:
+As libfaad had made issues with low rate services I switched over to FDK-AAC. 
+But also the repository version in Ubuntu 24.04 has still flaws with PS (Parametric Stereo) services.
+So I recommend to build it for your own. I used the latest main version which is v2.0.3.
 ```
-sudo apt-get install libfdk-aac-dev
+git clone /~https://github.com/mstorsjo/fdk-aac.git
+git checkout v2.0.3
+cd fdk-aac
+mkdir build
+cd build
+cmake ..
+make
+sudo make install
 ```
 
 For Qt5 try one of following (Ubuntu 22.04 needs the second one): 
@@ -224,7 +225,7 @@ git clone /~https://github.com/tomneda/DABstar.git
 cd DABstar
 mkdir build
 cd build
-cmake .. -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=OFF
+cmake .. -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=ON
 make  
 ```
 Reduce resp. adapt the `cmake` command line for the devices/features you need.
@@ -289,7 +290,7 @@ https://qwt.sourceforge.io/qwtinstall.html
                                                 
 ## Licences
 
-Rights of Qt-DAB, Qt, Qwt, FFTW, portaudio, libfaad, libsamplerate and libsndfile gratefully acknowledged.
+Rights of Qt-DAB, Qt, Qwt, FFTW, portaudio, FDK-AAC, libfaad, libsamplerate and libsndfile gratefully acknowledged.
 
 Rights of developers of RTLSDR library, SDRplay libraries, AIRspy library and others gratefully acknowledged.
 
diff --git a/appimage_creator/cmake_and_build_for_appimage.sh b/appimage_creator/cmake_and_build_for_appimage.sh
index 54bd794..79af774 100644
--- a/appimage_creator/cmake_and_build_for_appimage.sh
+++ b/appimage_creator/cmake_and_build_for_appimage.sh
@@ -10,7 +10,7 @@ rm -rf $DST
 mkdir -p $DST
 cd $DST || exit
 
-cmake $SRC $CMFLAG -DUSE_LTO=ON -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=OFF
+cmake $SRC $CMFLAG -DUSE_LTO=ON -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=ON
 
 if [ $? -eq 0 ]; then
     echo "cmake runs successfully, now we begin to build the application"