diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 09d2353d..0f5c12ba 100644 --- 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index c43d6f27..5ced26f5 100644 --- 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") diff --git a/airspy_source/CMakeLists.txt b/airspy_source/CMakeLists.txt index 197fd646..43c9131e 100644 --- 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) diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt index 14b525d6..a69b31b6 100644 --- 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) diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt index 4e67b199..dad1a828 100644 --- 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) diff --git a/bladerf_source/CMakeLists.txt b/bladerf_source/CMakeLists.txt index b523e3ec..b9cf1dd0 100644 --- 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) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index f0f16aa5..5ac25ef4 100644 --- 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 diff --git a/core/src/config.cpp b/core/src/config.cpp index b92531c3..301e9c7b 100644 --- a/core/src/config.cpp +++ b/core/src/config.cpp @@ -2,11 +2,7 @@ #include #include -#ifdef USE_EXPERIMENTAL_FS -#include -#else #include -#endif ConfigManager::ConfigManager() { diff --git a/core/src/dsp/math.h b/core/src/dsp/math.h index e0eda3f4..62241d1f 100644 --- a/core/src/dsp/math.h +++ b/core/src/dsp/math.h @@ -30,11 +30,7 @@ namespace dsp { } if constexpr (std::is_same_v || std::is_same_v) { -#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); diff --git a/demo_module/CMakeLists.txt b/demo_module/CMakeLists.txt index 20cce9f2..c03009f9 100644 --- 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) diff --git a/discord_integration/CMakeLists.txt b/discord_integration/CMakeLists.txt index e7c2c64e..e1d511d1 100644 --- 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) diff --git a/docker_builds/ubuntu_bionic/Dockerfile b/docker_builds/ubuntu_bionic/Dockerfile deleted file mode 100644 index d4928b91..00000000 --- a/docker_builds/ubuntu_bionic/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:bionic -ENV DEBIAN_FRONTEND=noninteractive -COPY do_build.sh /root -RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh deleted file mode 100644 index 2abfecb5..00000000 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/falcon9_decoder/CMakeLists.txt b/falcon9_decoder/CMakeLists.txt index e81d2f6b..cbd2a1df 100644 --- 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) diff --git a/file_source/CMakeLists.txt b/file_source/CMakeLists.txt index 8c21a197..9c991d62 100644 --- 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) diff --git a/hackrf_source/CMakeLists.txt b/hackrf_source/CMakeLists.txt index cd7ced2e..29433196 100644 --- 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) diff --git a/meteor_demodulator/CMakeLists.txt b/meteor_demodulator/CMakeLists.txt index 720e7c9b..797690ad 100644 --- 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) diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt index 0ba6f688..33ac123f 100644 --- 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) diff --git a/radio/CMakeLists.txt b/radio/CMakeLists.txt index 350e253a..2e88d612 100644 --- 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) diff --git a/recorder/CMakeLists.txt b/recorder/CMakeLists.txt index 2c5eb3aa..83767028 100644 --- 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) diff --git a/rtl_sdr_source/CMakeLists.txt b/rtl_sdr_source/CMakeLists.txt index d6e40f7f..6d6ac6bc 100644 --- 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) diff --git a/rtl_tcp_source/CMakeLists.txt b/rtl_tcp_source/CMakeLists.txt index 00e6d8d2..739f0b66 100644 --- 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) diff --git a/rx888_source/CMakeLists.txt b/rx888_source/CMakeLists.txt index a1bfec2d..9ed580a0 100644 --- 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) diff --git a/sdrplay_source/CMakeLists.txt b/sdrplay_source/CMakeLists.txt index ba503a3f..02b6586f 100644 --- 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) diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt index 2d25b0f8..fda01301 100644 --- 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) diff --git a/spyserver_source/CMakeLists.txt b/spyserver_source/CMakeLists.txt index d1057a31..4f4232a2 100644 --- 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) diff --git a/weather_sat_decoder/CMakeLists.txt b/weather_sat_decoder/CMakeLists.txt index 8445f548..e41506a3 100644 --- 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)