Skip to content

Commit 1c5cacb

Browse files
committed
Update the runtime to 6.10
1 parent a225c69 commit 1c5cacb

File tree

4 files changed

+94
-16
lines changed

4 files changed

+94
-16
lines changed

org.sdrangel.SDRangel.yaml

Lines changed: 38 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
@@ -23,7 +23,7 @@ add-extensions:
2323
org.freedesktop.Platform.ffmpeg-full:
2424
directory: lib/ffmpeg
2525
add-ld-path: .
26-
version: '24.08'
26+
version: '25.08'
2727
autodownload: true
2828
autodelete: false
2929

@@ -252,6 +252,7 @@ modules:
252252
cxxflags: -Wno-error
253253
cxxflags-override: true
254254
config-opts:
255+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
255256
- -Wno-dev
256257
sources:
257258
- type: git
@@ -268,6 +269,8 @@ modules:
268269

269270
- name: aptdec
270271
buildsystem: cmake-ninja
272+
config-opts:
273+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
271274
sources:
272275
- type: git
273276
url: https://github.com/srcejon/aptdec.git
@@ -276,6 +279,8 @@ modules:
276279

277280
- name: ggmorse
278281
buildsystem: cmake-ninja
282+
config-opts:
283+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
279284
sources:
280285
- type: git
281286
url: https://github.com/f4exb/ggmorse.git
@@ -293,7 +298,10 @@ modules:
293298

294299
- name: airspy
295300
buildsystem: cmake-ninja
301+
build-options:
302+
cflags: -std=gnu17
296303
config-opts:
304+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
297305
- -Wno-dev
298306
sources:
299307
- type: archive
@@ -302,7 +310,10 @@ modules:
302310

303311
- name: airspyhf
304312
buildsystem: cmake-ninja
313+
build-options:
314+
cflags: -std=gnu17
305315
config-opts:
316+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
306317
- -DINSTALL_UDEV_RULES=OFF
307318
- -Wno-dev
308319
sources:
@@ -314,6 +325,8 @@ modules:
314325
buildsystem: cmake-ninja
315326
build-options:
316327
cflags: -Wno-calloc-transposed-args
328+
config-opts:
329+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
317330
sources:
318331
- type: git
319332
url: https://github.com/Nuand/bladeRF.git
@@ -334,6 +347,7 @@ modules:
334347
- name: plutosdr
335348
buildsystem: cmake-ninja
336349
config-opts:
350+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
337351
- -DINSTALL_UDEV_RULE=OFF
338352
- -DHAVE_DNS_SD=OFF
339353
- -Wno-dev
@@ -355,7 +369,10 @@ modules:
355369

356370
- name: limesdr
357371
buildsystem: cmake-ninja
372+
build-options:
373+
cflags: -std=gnu17
358374
config-opts:
375+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
359376
- -DENABLE_QUICKTEST=OFF
360377
- -DENABLE_GUI=OFF
361378
- -DENABLE_SOAPY_LMS7=OFF
@@ -371,27 +388,31 @@ modules:
371388
- name: perseus
372389
buildsystem: cmake-ninja
373390
config-opts:
391+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
374392
- -Wno-dev
375393
sources:
376394
- type: git
377395
url: https://github.com/f4exb/libperseus-sdr.git
378396
commit: 30de6c708fa6afe2040a80df74afb39dcdc6e74a
379-
380-
- name: xtrx
381-
buildsystem: cmake-ninja
382-
subdir: sources
383-
config-opts:
384-
- -DENABLE_SOAPY=NO
385-
- -Wno-dev
386-
sources:
387-
- type: git
388-
url: https://github.com/xtrx-sdr/images.git
389-
commit: e7c68fa621004ee0d6a65171c786fd9d5a1f2ce6
397+
- type: patch
398+
path: patches/perseus-newer-cmake-fix.patch
399+
400+
# - name: xtrx
401+
# buildsystem: cmake-ninja
402+
# subdir: sources
403+
# config-opts:
404+
# - -DENABLE_SOAPY=NO
405+
# - -Wno-dev
406+
# sources:
407+
# - type: git
408+
# url: https://github.com/xtrx-sdr/images.git
409+
# commit: e7c68fa621004ee0d6a65171c786fd9d5a1f2ce6
390410

391411
- name: uhd
392412
buildsystem: cmake-ninja
393413
subdir: host
394414
config-opts:
415+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
395416
- -DENABLE_PYTHON_API=OFF
396417
- -DINSTALL_UDEV_RULES=OFF
397418
- -Wno-dev
@@ -402,12 +423,14 @@ modules:
402423
sha256: a2159491949477dca67f5a9b05f5a80d8c2b32e91b95dd7fac8ddd3893e36d09
403424
- type: patch
404425
paths:
426+
- patches/uhd-add-missing-cstdint-includes.patch
405427
- patches/uhd-disable-ascii-art-dft.patch
406428
- patches/uhd-disable-latency-utils.patch
407429

408430
- name: libmirisdr
409431
buildsystem: cmake-ninja
410432
config-opts:
433+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
411434
- -Wno-dev
412435
sources:
413436
- type: archive
@@ -417,6 +440,7 @@ modules:
417440
- name: soapy
418441
buildsystem: cmake-ninja
419442
config-opts:
443+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
420444
- -Wno-dev
421445
sources:
422446
- 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)