Dropping support for old volk and ubuntu versions, please update..;

2021-04-26 17:03:52 +02:00 · 2021-04-26 17:03:52 +02:00 · 128e52e33a
commit 128e52e33a
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@ -96,28 +96,6 @@ jobs:
              name: sdrpp_debian_bullseye_amd64
              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb

-    build_ubuntu_bionic:
-        runs-on: ubuntu-latest
-
-        steps:
-        - uses: actions/checkout@v2
-        
-        - name: Create Docker Image
-          run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_bionic && docker build . --tag sdrpp_build
-
-        - name: Run Container
-          run: docker run --name build sdrpp_build /root/do_build.sh
-
-        - name: Recover Deb Archive
-          working-directory: ${{runner.workspace}}
-          run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
-
-        - name: Save Deb Archive
-          uses: actions/upload-artifact@v2
-          with:
-              name: sdrpp_ubuntu_bionic_amd64
-              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
-
    build_ubuntu_focal:
        runs-on: ubuntu-latest

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(sdrpp)

 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--- a/airspy_source/CMakeLists.txt
+++ b/airspy_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(airspy_source)

 if (MSVC)
--- a/airspyhf_source/CMakeLists.txt
+++ b/airspyhf_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(airspyhf_source)

 if (MSVC)
--- a/audio_sink/CMakeLists.txt
+++ b/audio_sink/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(audio_sink)

 if (MSVC)
--- a/bladerf_source/CMakeLists.txt
+++ b/bladerf_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(bladerf_source)

 if (MSVC)
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(sdrpp_core)

 # Set compiler options
--- a/core/src/config.cpp
+++ b/core/src/config.cpp
@ -2,11 +2,7 @@
 #include <spdlog/spdlog.h>
 #include <fstream>

-#ifdef USE_EXPERIMENTAL_FS
-#include <experimental/filesystem>
-#else
 #include <filesystem>
-#endif

 ConfigManager::ConfigManager() {

--- a/core/src/dsp/math.h
+++ b/core/src/dsp/math.h
@ -30,11 +30,7 @@ namespace dsp {
            }

            if constexpr (std::is_same_v<T, complex_t> || std::is_same_v<T, stereo_t>) {
-#ifdef USE_OLD_VOLK_ADD
-                volk_32f_x2_add_32f((float*)out.writeBuf, (float*)_a->readBuf, (float*)_b->readBuf, a_count * 2);
-#else
                volk_32fc_x2_add_32fc((lv_32fc_t*)out.writeBuf, (lv_32fc_t*)_a->readBuf, (lv_32fc_t*)_b->readBuf, a_count);
-#endif
            }
            else {
                volk_32f_x2_add_32f(out.writeBuf, _a->readBuf, _b->readBuf, a_count);
--- a/demo_module/CMakeLists.txt
+++ b/demo_module/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(demo)

 if (MSVC)
--- a/discord_integration/CMakeLists.txt
+++ b/discord_integration/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(discord_integration)

 if (MSVC)
--- a/docker_builds/ubuntu_bionic/Dockerfile
+++ b/docker_builds/ubuntu_bionic/Dockerfile
@ -1,4 +0,0 @@
-FROM ubuntu:bionic
-ENV DEBIAN_FRONTEND=noninteractive 
-COPY do_build.sh /root
-RUN chmod +x /root/do_build.sh
--- a/docker_builds/ubuntu_bionic/do_build.sh
+++ b/docker_builds/ubuntu_bionic/do_build.sh
@ -1,24 +0,0 @@
-#!/bin/bash
-set -e
-cd /root
-
-apt update
-apt install -y software-properties-common
-add-apt-repository -y ppa:ubuntu-toolchain-r/test
-apt update
-
-apt install -y dpkg-dev make gcc-10 g++-10 cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev
-
-update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7
-update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1000 --slave /usr/bin/g++ g++ /usr/bin/g++-10
-
-git clone https://github.com/AlexandreRouma/SDRPlusPlus
-
-cd SDRPlusPlus
-mkdir build
-cd build
-cmake ..
-make CXX_FLAGS='-DUSE_OLD_VOLK_ADD=1 -DUSE_EXPERIMENTAL_FS=1' -j2
-
-cd ..
-sh make_debian_package.sh ./build
--- a/falcon9_decoder/CMakeLists.txt
+++ b/falcon9_decoder/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(falcon9_decoder)

 if (MSVC)
--- a/file_source/CMakeLists.txt
+++ b/file_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(file_source)

 if (MSVC)
--- a/hackrf_source/CMakeLists.txt
+++ b/hackrf_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(hackrf_source)

 if (MSVC)
--- a/meteor_demodulator/CMakeLists.txt
+++ b/meteor_demodulator/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(meteor_demodulator)

 if (MSVC)
--- a/plutosdr_source/CMakeLists.txt
+++ b/plutosdr_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(plutosdr_source)

 if (MSVC)
--- a/radio/CMakeLists.txt
+++ b/radio/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(radio)

 if (MSVC)
--- a/recorder/CMakeLists.txt
+++ b/recorder/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(recorder)

 if (MSVC)
--- a/rtl_sdr_source/CMakeLists.txt
+++ b/rtl_sdr_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(rtl_sdr_source)

 if (MSVC)
--- a/rtl_tcp_source/CMakeLists.txt
+++ b/rtl_tcp_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(rtl_tcp_source)

 if (MSVC)
--- a/rx888_source/CMakeLists.txt
+++ b/rx888_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(rx888_source)

 if (MSVC)
--- a/sdrplay_source/CMakeLists.txt
+++ b/sdrplay_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(sdrplay_source)

 if (MSVC)
--- a/soapy_source/CMakeLists.txt
+++ b/soapy_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(soapy_source)

 if (MSVC)
--- a/spyserver_source/CMakeLists.txt
+++ b/spyserver_source/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(spyserver_source)

 if (MSVC)
--- a/weather_sat_decoder/CMakeLists.txt
+++ b/weather_sat_decoder/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(weather_sat_decoder)

 if (MSVC)