Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 41 additions & 30 deletions org.sdrangel.SDRangel.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
id: org.sdrangel.SDRangel
runtime: org.kde.Platform
runtime-version: '6.9'
runtime-version: '6.10'
sdk: org.kde.Sdk
base: io.qt.qtwebengine.BaseApp
base-version: '6.9'
base-version: '6.10'
command: sdrangel
rename-desktop-file: sdrangel.desktop
rename-icon: sdrangel_icon
Expand All @@ -18,26 +18,9 @@ finish-args:
- --system-talk-name=org.freedesktop.GeoClue2
cleanup-commands:
- /app/cleanup-BaseApp.sh
- mkdir -p ${FLATPAK_DEST}/lib/ffmpeg
add-extensions:
org.freedesktop.Platform.ffmpeg-full:
directory: lib/ffmpeg
add-ld-path: .
version: '24.08'
autodownload: true
autodelete: false

modules:
- shared-modules/linux-audio/fftw3f.json
- shared-modules/libusb/libusb.json

- name: libxml2
config-opts:
- --without-python
sources:
- type: archive
url: https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.1.tar.xz
sha256: c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c

- name: boost
buildsystem: simple
Expand Down Expand Up @@ -252,6 +235,7 @@ modules:
cxxflags: -Wno-error
cxxflags-override: true
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -Wno-dev
sources:
- type: git
Expand All @@ -268,6 +252,8 @@ modules:

- name: aptdec
buildsystem: cmake-ninja
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
sources:
- type: git
url: https://github.com/srcejon/aptdec.git
Expand All @@ -276,6 +262,8 @@ modules:

- name: ggmorse
buildsystem: cmake-ninja
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
sources:
- type: git
url: https://github.com/f4exb/ggmorse.git
Expand All @@ -293,7 +281,10 @@ modules:

- name: airspy
buildsystem: cmake-ninja
build-options:
cflags: -std=gnu17
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -Wno-dev
sources:
- type: archive
Expand All @@ -302,7 +293,10 @@ modules:

- name: airspyhf
buildsystem: cmake-ninja
build-options:
cflags: -std=gnu17
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -DINSTALL_UDEV_RULES=OFF
- -Wno-dev
sources:
Expand All @@ -323,6 +317,8 @@ modules:
buildsystem: cmake-ninja
build-options:
cflags: -Wno-calloc-transposed-args
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
sources:
- type: git
url: https://github.com/Nuand/bladeRF.git
Expand All @@ -343,6 +339,7 @@ modules:
- name: plutosdr
buildsystem: cmake-ninja
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -DINSTALL_UDEV_RULE=OFF
- -DHAVE_DNS_SD=OFF
- -Wno-dev
Expand All @@ -364,7 +361,14 @@ modules:

- name: limesdr
buildsystem: cmake-ninja
build-options:
arch:
x86_64:
config-opts:
- -DARCH_OPT=nehalem
cflags: -std=gnu17
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -DENABLE_QUICKTEST=OFF
- -DENABLE_GUI=OFF
- -DENABLE_SOAPY_LMS7=OFF
Expand All @@ -380,27 +384,31 @@ modules:
- name: perseus
buildsystem: cmake-ninja
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -Wno-dev
sources:
- type: git
url: https://github.com/f4exb/libperseus-sdr.git
commit: 30de6c708fa6afe2040a80df74afb39dcdc6e74a

- name: xtrx
buildsystem: cmake-ninja
subdir: sources
config-opts:
- -DENABLE_SOAPY=NO
- -Wno-dev
sources:
- type: git
url: https://github.com/xtrx-sdr/images.git
commit: e7c68fa621004ee0d6a65171c786fd9d5a1f2ce6
- type: patch
path: patches/perseus-newer-cmake-fix.patch

# - name: xtrx
# buildsystem: cmake-ninja
# subdir: sources
# config-opts:
# - -DENABLE_SOAPY=NO
# - -Wno-dev
# sources:
# - type: git
# url: https://github.com/xtrx-sdr/images.git
# commit: e7c68fa621004ee0d6a65171c786fd9d5a1f2ce6

- name: uhd
buildsystem: cmake-ninja
subdir: host
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -DENABLE_PYTHON_API=OFF
- -DINSTALL_UDEV_RULES=OFF
- -Wno-dev
Expand All @@ -411,6 +419,7 @@ modules:
sha256: a2159491949477dca67f5a9b05f5a80d8c2b32e91b95dd7fac8ddd3893e36d09
- type: patch
paths:
- patches/uhd-add-missing-cstdint-includes.patch
- patches/uhd-disable-ascii-art-dft.patch
- patches/uhd-disable-latency-utils.patch

Expand All @@ -427,6 +436,7 @@ modules:
- name: libmirisdr
buildsystem: cmake-ninja
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -Wno-dev
sources:
- type: archive
Expand All @@ -436,6 +446,7 @@ modules:
- name: soapy
buildsystem: cmake-ninja
config-opts:
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- -Wno-dev
sources:
- type: archive
Expand Down
4 changes: 2 additions & 2 deletions patches/metainfo.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml b/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml
index 4d9644838..f3802062d 100644
index 4d9644838..71dae812e 100644
--- a/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml
+++ b/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml
@@ -16,7 +16,7 @@
</p>
<p>
It has native support for Airspy, Airspy HF, Airspy Discovery, bladeRF, FUNcube, HackRF, KiwiSDR, LimeSDR, LimeSDR Mini, LimeRFE, Perseus, PlutoSDR,
- RTL-SDR, SDRplay RSP1, RSP2, RSPduo, RSPdx, USRP B210, XTRX, and more devices via Soapy and audio interfaces.
+ RTL-SDR, USRP B210, XTRX, and more devices via Soapy and audio interfaces.
+ RTL-SDR, USRP B210, and more devices via Soapy and audio interfaces.
</p>
</description>
<screenshots>
Expand Down
18 changes: 18 additions & 0 deletions patches/perseus-newer-cmake-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d50dd09..999b285 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.1.0)
-cmake_policy(SET CMP0043 OLD)
+cmake_policy(SET CMP0043 NEW)

include(FindPkgConfig)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
@@ -56,4 +56,4 @@ target_link_libraries(perseus-sdr
)

install(FILES perseusfx2.h perseus-in.h perseus-sdr.h DESTINATION include)
-install(TARGETS perseus-sdr DESTINATION ${LIB_INSTALL_DIR})
\ No newline at end of file
+install(TARGETS perseus-sdr DESTINATION ${LIB_INSTALL_DIR})
36 changes: 36 additions & 0 deletions patches/uhd-add-missing-cstdint-includes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 14337e23e4e073be5377dbcefc96ed04515ac51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Thu, 13 Mar 2025 18:44:13 +0100
Subject: [PATCH] uhd: Add some missing cstdint includes

This aids with making UHD gcc-15 compatible (more fixes are required for
full compatibility).
---
host/include/uhd/features/ref_clk_calibration_iface.hpp | 1 +
host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp | 1 +
2 files changed, 2 insertions(+)

diff --git a/host/include/uhd/features/ref_clk_calibration_iface.hpp b/host/include/uhd/features/ref_clk_calibration_iface.hpp
index 86a20053c..7aa80628e 100644
--- a/host/include/uhd/features/ref_clk_calibration_iface.hpp
+++ b/host/include/uhd/features/ref_clk_calibration_iface.hpp
@@ -8,6 +8,7 @@

#include <uhd/config.hpp>
#include <uhd/features/discoverable_feature.hpp>
+#include <cstdint>
#include <memory>

namespace uhd { namespace features {
diff --git a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp
index fd23fb8ef..8f1fc4e91 100644
--- a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp
+++ b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp
@@ -10,6 +10,7 @@
#include <unordered_map>
#include <array>
#include <cstddef>
+#include <cstdint>
#include <cstring>
#include <list>
#include <map>