Fixed support for older distro (update ffs)

This commit is contained in:
AlexandreRouma 2022-01-26 20:51:59 +01:00
parent 963c5c6581
commit 80dcf2d968
3 changed files with 6 additions and 5 deletions

View File

@ -74,7 +74,6 @@ namespace server {
// Initialize compressor // Initialize compressor
cctx = ZSTD_createCCtx(); cctx = ZSTD_createCCtx();
ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, 1);
core::configManager.acquire(); core::configManager.acquire();
std::string modulesDir = core::configManager.conf["modulesDirectory"]; std::string modulesDir = core::configManager.conf["modulesDirectory"];
@ -226,8 +225,7 @@ namespace server {
// Compress data if needed and fill out header fields // Compress data if needed and fill out header fields
if (compression) { if (compression) {
bb_pkt_hdr->type = PACKET_TYPE_BASEBAND_COMPRESSED; bb_pkt_hdr->type = PACKET_TYPE_BASEBAND_COMPRESSED;
bb_pkt_hdr->size = sizeof(PacketHeader) + (uint32_t)ZSTD_compress2(cctx, &bbuf[sizeof(PacketHeader)], SERVER_MAX_PACKET_SIZE, data, count); bb_pkt_hdr->size = sizeof(PacketHeader) + (uint32_t)ZSTD_compressCCtx(cctx, &bbuf[sizeof(PacketHeader)], SERVER_MAX_PACKET_SIZE, data, count, 1);
} }
else { else {
bb_pkt_hdr->type = PACKET_TYPE_BASEBAND; bb_pkt_hdr->type = PACKET_TYPE_BASEBAND;

View File

@ -78,7 +78,8 @@ brew install \
portaudio \ portaudio \
rtl-sdr \ rtl-sdr \
soapyrtlsdr \ soapyrtlsdr \
volk volk \
zstd
mkdir build mkdir build
cd build cd build
cmake .. \ cmake .. \
@ -115,6 +116,7 @@ After this, install the following dependencies using vcpkg:
* fftw3 * fftw3
* glfw3 * glfw3
* zstd
You are probably going to build in 64 bit so make sure vcpkg installs the correct versions using `.\vcpkg.exe install <package>:x64-windows` You are probably going to build in 64 bit so make sure vcpkg installs the correct versions using `.\vcpkg.exe install <package>:x64-windows`
@ -221,6 +223,7 @@ you can disable it using the module parameter listed in the table below
* fftw3 * fftw3
* glfw * glfw
* libvolk * libvolk
* zstd
Next install dependencies based on the modules you wish to build (See previous step) Next install dependencies based on the modules you wish to build (See previous step)

View File

@ -5,7 +5,7 @@ set -e
echo "Installing dependencies" echo "Installing dependencies"
sudo apt update sudo apt update
sudo apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev \ sudo apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk1-dev libzstd-dev libsoapysdr-dev libairspyhf-dev libairspy-dev \
libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
echo "Preparing build" echo "Preparing build"