mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-23 16:34:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryzerth 2021-04-26 17:03:52 +02:00
parent 27697bb638
commit 128e52e33a
27 changed files with 22 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/build_all.yml vendored
View File

@ -96,28 +96,6 @@ jobs:
name: sdrpp_debian_bullseye_amd64 name: sdrpp_debian_bullseye_amd64
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb 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: build_ubuntu_focal:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(sdrpp) project(sdrpp)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

2
airspy_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(airspy_source) project(airspy_source)
if (MSVC) if (MSVC)

2
airspyhf_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(airspyhf_source) project(airspyhf_source)
if (MSVC) if (MSVC)

2
audio_sink/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(audio_sink) project(audio_sink)
if (MSVC) if (MSVC)

2
bladerf_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(bladerf_source) project(bladerf_source)
if (MSVC) if (MSVC)

2
core/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(sdrpp_core) project(sdrpp_core)
# Set compiler options # Set compiler options

4
core/src/config.cpp
View File

@ -2,11 +2,7 @@
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <fstream> #include <fstream>
#ifdef USE_EXPERIMENTAL_FS
#include <experimental/filesystem>
#else
#include <filesystem> #include <filesystem>
#endif
ConfigManager::ConfigManager() { ConfigManager::ConfigManager() {

4
core/src/dsp/math.h
View File

@ -30,11 +30,7 @@ namespace dsp {
} }
if constexpr (std::is_same_v<T, complex_t> || std::is_same_v<T, stereo_t>) { 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); volk_32fc_x2_add_32fc((lv_32fc_t*)out.writeBuf, (lv_32fc_t*)_a->readBuf, (lv_32fc_t*)_b->readBuf, a_count);
#endif
} }
else { else {
volk_32f_x2_add_32f(out.writeBuf, _a->readBuf, _b->readBuf, a_count); volk_32f_x2_add_32f(out.writeBuf, _a->readBuf, _b->readBuf, a_count);

2
demo_module/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(demo) project(demo)
if (MSVC) if (MSVC)

2
discord_integration/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(discord_integration) project(discord_integration)
if (MSVC) if (MSVC)

4
docker_builds/ubuntu_bionic/Dockerfile
View File

@ -1,4 +0,0 @@
FROM ubuntu:bionic
ENV DEBIAN_FRONTEND=noninteractive
COPY do_build.sh /root
RUN chmod +x /root/do_build.sh

24
docker_builds/ubuntu_bionic/do_build.sh
View File

@ -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

2
falcon9_decoder/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(falcon9_decoder) project(falcon9_decoder)
if (MSVC) if (MSVC)

2
file_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(file_source) project(file_source)
if (MSVC) if (MSVC)

2
hackrf_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(hackrf_source) project(hackrf_source)
if (MSVC) if (MSVC)

2
meteor_demodulator/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(meteor_demodulator) project(meteor_demodulator)
if (MSVC) if (MSVC)

2
plutosdr_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(plutosdr_source) project(plutosdr_source)
if (MSVC) if (MSVC)

2
radio/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(radio) project(radio)
if (MSVC) if (MSVC)

2
recorder/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(recorder) project(recorder)
if (MSVC) if (MSVC)

2
rtl_sdr_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(rtl_sdr_source) project(rtl_sdr_source)
if (MSVC) if (MSVC)

2
rtl_tcp_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(rtl_tcp_source) project(rtl_tcp_source)
if (MSVC) if (MSVC)

2
rx888_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(rx888_source) project(rx888_source)
if (MSVC) if (MSVC)

2
sdrplay_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(sdrplay_source) project(sdrplay_source)
if (MSVC) if (MSVC)

2
soapy_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(soapy_source) project(soapy_source)
if (MSVC) if (MSVC)

2
spyserver_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(spyserver_source) project(spyserver_source)
if (MSVC) if (MSVC)

2
weather_sat_decoder/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project(weather_sat_decoder) project(weather_sat_decoder)
if (MSVC) if (MSVC)