Skip to content

Commit e57a70d

Browse files
committed
Update the runtime to 6.10
1 parent ba5bb0d commit e57a70d

File tree

4 files changed

+95
-16
lines changed

4 files changed

+95
-16
lines changed

org.sdrangel.SDRangel.yaml

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
id: org.sdrangel.SDRangel
22
runtime: org.kde.Platform
3-
runtime-version: '6.9'
3+
runtime-version: '6.10'
44
sdk: org.kde.Sdk
55
base: io.qt.qtwebengine.BaseApp
6-
base-version: '6.9'
6+
base-version: '6.10'
77
command: sdrangel
88
rename-desktop-file: sdrangel.desktop
99
rename-icon: sdrangel_icon
@@ -22,7 +22,7 @@ add-extensions:
2222
org.freedesktop.Platform.ffmpeg-full:
2323
directory: lib/ffmpeg
2424
add-ld-path: .
25-
version: '24.08'
25+
version: '25.08'
2626
autodownload: true
2727
autodelete: false
2828

@@ -186,6 +186,7 @@ modules:
186186
- name: mbelib
187187
buildsystem: cmake-ninja
188188
config-opts:
189+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
189190
- -Wno-dev
190191
sources:
191192
- type: archive
@@ -261,6 +262,7 @@ modules:
261262
cxxflags: -Wno-error
262263
cxxflags-override: true
263264
config-opts:
265+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
264266
- -Wno-dev
265267
sources:
266268
- type: git
@@ -277,6 +279,8 @@ modules:
277279

278280
- name: aptdec
279281
buildsystem: cmake-ninja
282+
config-opts:
283+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
280284
sources:
281285
- type: git
282286
url: https://github.com/srcejon/aptdec.git
@@ -285,6 +289,8 @@ modules:
285289

286290
- name: ggmorse
287291
buildsystem: cmake-ninja
292+
config-opts:
293+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
288294
sources:
289295
- type: git
290296
url: https://github.com/f4exb/ggmorse.git
@@ -302,7 +308,10 @@ modules:
302308

303309
- name: airspy
304310
buildsystem: cmake-ninja
311+
build-options:
312+
cflags: -std=gnu17
305313
config-opts:
314+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
306315
- -Wno-dev
307316
sources:
308317
- type: archive
@@ -311,7 +320,10 @@ modules:
311320

312321
- name: airspyhf
313322
buildsystem: cmake-ninja
323+
build-options:
324+
cflags: -std=gnu17
314325
config-opts:
326+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
315327
- -DINSTALL_UDEV_RULES=OFF
316328
- -Wno-dev
317329
sources:
@@ -323,6 +335,8 @@ modules:
323335
buildsystem: cmake-ninja
324336
build-options:
325337
cflags: -Wno-calloc-transposed-args
338+
config-opts:
339+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
326340
sources:
327341
- type: git
328342
url: https://github.com/Nuand/bladeRF.git
@@ -343,6 +357,7 @@ modules:
343357
- name: plutosdr
344358
buildsystem: cmake-ninja
345359
config-opts:
360+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
346361
- -DINSTALL_UDEV_RULE=OFF
347362
- -DHAVE_DNS_SD=OFF
348363
- -Wno-dev
@@ -364,7 +379,10 @@ modules:
364379

365380
- name: limesdr
366381
buildsystem: cmake-ninja
382+
build-options:
383+
cflags: -std=gnu17
367384
config-opts:
385+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
368386
- -DENABLE_QUICKTEST=OFF
369387
- -DENABLE_GUI=OFF
370388
- -DENABLE_SOAPY_LMS7=OFF
@@ -380,27 +398,31 @@ modules:
380398
- name: perseus
381399
buildsystem: cmake-ninja
382400
config-opts:
401+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
383402
- -Wno-dev
384403
sources:
385404
- type: git
386405
url: https://github.com/f4exb/libperseus-sdr.git
387406
commit: 30de6c708fa6afe2040a80df74afb39dcdc6e74a
388-
389-
- name: xtrx
390-
buildsystem: cmake-ninja
391-
subdir: sources
392-
config-opts:
393-
- -DENABLE_SOAPY=NO
394-
- -Wno-dev
395-
sources:
396-
- type: git
397-
url: https://github.com/xtrx-sdr/images.git
398-
commit: e7c68fa621004ee0d6a65171c786fd9d5a1f2ce6
407+
- type: patch
408+
path: patches/perseus-newer-cmake-fix.patch
409+
410+
# - name: xtrx
411+
# buildsystem: cmake-ninja
412+
# subdir: sources
413+
# config-opts:
414+
# - -DENABLE_SOAPY=NO
415+
# - -Wno-dev
416+
# sources:
417+
# - type: git
418+
# url: https://github.com/xtrx-sdr/images.git
419+
# commit: e7c68fa621004ee0d6a65171c786fd9d5a1f2ce6
399420

400421
- name: uhd
401422
buildsystem: cmake-ninja
402423
subdir: host
403424
config-opts:
425+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
404426
- -DENABLE_PYTHON_API=OFF
405427
- -DINSTALL_UDEV_RULES=OFF
406428
- -Wno-dev
@@ -411,12 +433,14 @@ modules:
411433
sha256: a2159491949477dca67f5a9b05f5a80d8c2b32e91b95dd7fac8ddd3893e36d09
412434
- type: patch
413435
paths:
436+
- patches/uhd-add-missing-cstdint-includes.patch
414437
- patches/uhd-disable-ascii-art-dft.patch
415438
- patches/uhd-disable-latency-utils.patch
416439

417440
- name: libmirisdr
418441
buildsystem: cmake-ninja
419442
config-opts:
443+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
420444
- -Wno-dev
421445
sources:
422446
- type: archive
@@ -426,6 +450,7 @@ modules:
426450
- name: soapy
427451
buildsystem: cmake-ninja
428452
config-opts:
453+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
429454
- -Wno-dev
430455
sources:
431456
- type: archive

patches/metainfo.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml b/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml
2-
index 4d9644838..d305f382b 100644
2+
index 4d9644838..e968dd3bc 100644
33
--- a/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml
44
+++ b/cmake/cpack/org.sdrangel.SDRangel.metainfo.xml
55
@@ -16,7 +16,7 @@
66
</p>
77
<p>
88
It has native support for Airspy, Airspy HF, Airspy Discovery, bladeRF, FUNcube, HackRF, KiwiSDR, LimeSDR, LimeSDR Mini, LimeRFE, Perseus, PlutoSDR,
99
- RTL-SDR, SDRplay RSP1, RSP2, RSPduo, RSPdx, USRP B210, XTRX, and more devices via Soapy and audio interfaces.
10-
+ RTL-SDR, USRP B210, XTRX, and more devices via Soapy and audio interfaces.
10+
+ RTL-SDR, USRP B210, and more devices via Soapy and audio interfaces.
1111
</p>
1212
</description>
1313
<screenshots>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index d50dd09..999b285 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,5 +1,5 @@
6+
cmake_minimum_required(VERSION 3.1.0)
7+
-cmake_policy(SET CMP0043 OLD)
8+
+cmake_policy(SET CMP0043 NEW)
9+
10+
include(FindPkgConfig)
11+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
12+
@@ -56,4 +56,4 @@ target_link_libraries(perseus-sdr
13+
)
14+
15+
install(FILES perseusfx2.h perseus-in.h perseus-sdr.h DESTINATION include)
16+
-install(TARGETS perseus-sdr DESTINATION ${LIB_INSTALL_DIR})
17+
\ No newline at end of file
18+
+install(TARGETS perseus-sdr DESTINATION ${LIB_INSTALL_DIR})
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 14337e23e4e073be5377dbcefc96ed04515ac51a Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
3+
Date: Thu, 13 Mar 2025 18:44:13 +0100
4+
Subject: [PATCH] uhd: Add some missing cstdint includes
5+
6+
This aids with making UHD gcc-15 compatible (more fixes are required for
7+
full compatibility).
8+
---
9+
host/include/uhd/features/ref_clk_calibration_iface.hpp | 1 +
10+
host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp | 1 +
11+
2 files changed, 2 insertions(+)
12+
13+
diff --git a/host/include/uhd/features/ref_clk_calibration_iface.hpp b/host/include/uhd/features/ref_clk_calibration_iface.hpp
14+
index 86a20053c..7aa80628e 100644
15+
--- a/host/include/uhd/features/ref_clk_calibration_iface.hpp
16+
+++ b/host/include/uhd/features/ref_clk_calibration_iface.hpp
17+
@@ -8,6 +8,7 @@
18+
19+
#include <uhd/config.hpp>
20+
#include <uhd/features/discoverable_feature.hpp>
21+
+#include <cstdint>
22+
#include <memory>
23+
24+
namespace uhd { namespace features {
25+
diff --git a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp
26+
index fd23fb8ef..8f1fc4e91 100644
27+
--- a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp
28+
+++ b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp
29+
@@ -10,6 +10,7 @@
30+
#include <unordered_map>
31+
#include <array>
32+
#include <cstddef>
33+
+#include <cstdint>
34+
#include <cstring>
35+
#include <list>
36+
#include <map>

0 commit comments

Comments
 (0)