From 95727eff10140490ff31768781d9f621394e8f16 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 09:25:48 +0100 Subject: [PATCH 01/26] Use latest cm256cc and dsdcc. Swtich to fork of mbelib with CMake 4 support. --- external/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 33d5948c7..b72649126 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -9,10 +9,10 @@ # which version/tag/checkout to use set(CODEC2_TAG "v1.0.3") -set(CM256CC_TAG c0e92b92aca3d1d36c990b642b937c64d363c559) -set(MBELIB_TAG fe83b32c6a60cdd7bce8cecf3c7a0b9ec87a7667) +set(CM256CC_TAG "v1.1.2") +set(MBELIB_TAG fac842804e31369696051c0ee80f4eafbfdb4ee2) set(SERIALDV_TAG "v1.1.4") -set(DSDCC_TAG "v1.9.5") +set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG "v23.11.0") set(BLADERF_TAG "2021.02") set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) @@ -670,7 +670,7 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND (NOT LIBMBE_FOUND OR LIBMBE_EX set(LIBMBE_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") endif () ExternalProject_Add(mbelib - GIT_REPOSITORY https://github.com/kasper93/mbelib.git + GIT_REPOSITORY https://github.com/srcejon/mbelib GIT_TAG ${MBELIB_TAG} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/mbelib" CMAKE_ARGS -DDISABLE_TEST=ON ${COMMON_CMAKE_ARGS} From 0b5021783fb298ad9f725fd06d3212c2cc5e3b1d Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 09:50:37 +0100 Subject: [PATCH 02/26] Revert "Use latest cm256cc and dsdcc." This reverts commit 95727eff10140490ff31768781d9f621394e8f16. --- external/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index b72649126..33d5948c7 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -9,10 +9,10 @@ # which version/tag/checkout to use set(CODEC2_TAG "v1.0.3") -set(CM256CC_TAG "v1.1.2") -set(MBELIB_TAG fac842804e31369696051c0ee80f4eafbfdb4ee2) +set(CM256CC_TAG c0e92b92aca3d1d36c990b642b937c64d363c559) +set(MBELIB_TAG fe83b32c6a60cdd7bce8cecf3c7a0b9ec87a7667) set(SERIALDV_TAG "v1.1.4") -set(DSDCC_TAG "v1.9.6") +set(DSDCC_TAG "v1.9.5") set(LIMESUITE_TAG "v23.11.0") set(BLADERF_TAG "2021.02") set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) @@ -670,7 +670,7 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND (NOT LIBMBE_FOUND OR LIBMBE_EX set(LIBMBE_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") endif () ExternalProject_Add(mbelib - GIT_REPOSITORY https://github.com/srcejon/mbelib + GIT_REPOSITORY https://github.com/kasper93/mbelib.git GIT_TAG ${MBELIB_TAG} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/mbelib" CMAKE_ARGS -DDISABLE_TEST=ON ${COMMON_CMAKE_ARGS} From 160cd5c66ef39dfcee1d3ff4fd49bfa7a427308c Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 09:55:18 +0100 Subject: [PATCH 03/26] Update cm256cc and dsdcc to latest tags. Use fork of mbelib with cmake 4 support. --- external/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 35b236372..ca45bfde6 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -9,10 +9,10 @@ # which version/tag/checkout to use set(CODEC2_TAG "v1.1.1") -set(CM256CC_TAG c0e92b92aca3d1d36c990b642b937c64d363c559) -set(MBELIB_TAG fe83b32c6a60cdd7bce8cecf3c7a0b9ec87a7667) +set(CM256CC_TAG "v1.1.2") +set(MBELIB_TAG fac842804e31369696051c0ee80f4eafbfdb4ee2) set(SERIALDV_TAG "v1.1.5") -set(DSDCC_TAG "v1.9.5") +set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354) set(BLADERF_TAG "2021.02") set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) @@ -669,7 +669,7 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND (NOT LIBMBE_FOUND OR LIBMBE_EX set(LIBMBE_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") endif () ExternalProject_Add(mbelib - GIT_REPOSITORY https://github.com/kasper93/mbelib.git + GIT_REPOSITORY https://github.com/srcejon/mbelib GIT_TAG ${MBELIB_TAG} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/mbelib" CMAKE_ARGS -DDISABLE_TEST=ON ${COMMON_CMAKE_ARGS} From 1e61919ac60a32c8c1d0ea556199c710026c196c Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 09:58:09 +0100 Subject: [PATCH 04/26] Fix repo path --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index ca45bfde6..768ae6b17 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -669,7 +669,7 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND (NOT LIBMBE_FOUND OR LIBMBE_EX set(LIBMBE_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libmbe${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") endif () ExternalProject_Add(mbelib - GIT_REPOSITORY https://github.com/srcejon/mbelib + GIT_REPOSITORY https://github.com/srcejon/mbelib.git GIT_TAG ${MBELIB_TAG} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/mbelib" CMAKE_ARGS -DDISABLE_TEST=ON ${COMMON_CMAKE_ARGS} From ec926a019a178dce2a590fd589397120dd504958 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 12:13:31 +0100 Subject: [PATCH 05/26] Try master branch of dab-cmdline --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 768ae6b17..6e8c0e93f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -958,7 +958,7 @@ if (ZLIB_FOUND AND FAAD_FOUND AND ENABLE_CHANNELRX_DEMODDAB) if (WIN32) ExternalProject_Add(dab GIT_REPOSITORY https://github.com/srcejon/dab-cmdline.git - GIT_TAG msvc + GIT_TAG master DEPENDS ${PTHREADS4W_DEPENDS} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/dab" SOURCE_SUBDIR "library" From e46b8a953aa289f70456319bedb20ec3b7a0c18a Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 12:33:21 +0100 Subject: [PATCH 06/26] Try latest x265 for cmake 4 compatibility. --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 6e8c0e93f..f46429b86 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -421,7 +421,7 @@ if (NOT FFMPEG_FOUND AND NOT USE_PRECOMPILED_LIBS) if (NOT X265_FOUND OR X265_EXTERNAL) ExternalProject_Add(x265 GIT_REPOSITORY https://bitbucket.org/multicoreware/x265_git.git - GIT_TAG 4.1 + GIT_TAG 8f11c33acc267ba3f1d2bde60a6aa906e494cbde PREFIX "${EXTERNAL_BUILD_LIBRARIES}/x265" SOURCE_SUBDIR "source" CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX= From b58493262b82c52760dca686684f4c4101a6934f Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 15:32:29 +0100 Subject: [PATCH 07/26] Use ggmorse fork with cmake 4 fix --- external/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index f46429b86..beb32af3e 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -885,7 +885,8 @@ if(ENABLE_FEATURE_MORSEDECODER) set(GGMORSE_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libggmorse${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") endif() ExternalProject_Add(ggmorse - GIT_REPOSITORY https://github.com/ggerganov/ggmorse.git + GIT_REPOSITORY https://github.com/srcejon/ggmorse.git + GIT_TAG "cmake4" PREFIX "${EXTERNAL_BUILD_LIBRARIES}/ggmorse" CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DGGMORSE_BUILD_TESTS=OFF From b8f6859e6e804bb995dcfeeb851e4b7d04310544 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 15:33:10 +0100 Subject: [PATCH 08/26] Try master branch for dab --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index beb32af3e..8dcd7db3b 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -978,7 +978,7 @@ if (ZLIB_FOUND AND FAAD_FOUND AND ENABLE_CHANNELRX_DEMODDAB) else(WIN32) ExternalProject_Add(dab GIT_REPOSITORY https://github.com/srcejon/dab-cmdline.git - GIT_TAG msvc + GIT_TAG master DEPENDS ${ZLIB_DEPENDS} ${FAAD_DEPENDS} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/dab" SOURCE_SUBDIR "library" From 1fb03166a18571e63347503a4603cceacc5692d3 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 16:52:45 +0100 Subject: [PATCH 09/26] dab: revert to msvc branch --- external/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 8dcd7db3b..716ee5a09 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -959,7 +959,7 @@ if (ZLIB_FOUND AND FAAD_FOUND AND ENABLE_CHANNELRX_DEMODDAB) if (WIN32) ExternalProject_Add(dab GIT_REPOSITORY https://github.com/srcejon/dab-cmdline.git - GIT_TAG master + GIT_TAG msvc DEPENDS ${PTHREADS4W_DEPENDS} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/dab" SOURCE_SUBDIR "library" @@ -978,7 +978,7 @@ if (ZLIB_FOUND AND FAAD_FOUND AND ENABLE_CHANNELRX_DEMODDAB) else(WIN32) ExternalProject_Add(dab GIT_REPOSITORY https://github.com/srcejon/dab-cmdline.git - GIT_TAG master + GIT_TAG msvc DEPENDS ${ZLIB_DEPENDS} ${FAAD_DEPENDS} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/dab" SOURCE_SUBDIR "library" From 861fd941ba71dbf09d7ba094af4064ef1b23733d Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 17:53:49 +0100 Subject: [PATCH 10/26] Update soapysdr to latest for cmake 4 --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 716ee5a09..59fe21bf7 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -24,7 +24,7 @@ set(LIBSIGMF_TAG "new-namespaces") set(PTHREADS4W_TAG "Version-2-11-0-release") set(RTLSDR_TAG "v2.0.1") set(RTLSDR_UDEV OFF) -set(SOAPYSDR_TAG "soapy-sdr-0.7.1") +set(SOAPYSDR_TAG "1667b4e6301d7ad47b340dcdcd6e9969bf57d843") set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0") set(SOAPYSDR_AUDIO_TAG "soapy-audio-0.1.1") set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1") From 7717ed667786bebb07542861d217986e33e890b7 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 19:02:04 +0100 Subject: [PATCH 11/26] Update airspy tag to latest --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 59fe21bf7..d5c2df713 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -28,7 +28,7 @@ set(SOAPYSDR_TAG "1667b4e6301d7ad47b340dcdcd6e9969bf57d843") set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0") set(SOAPYSDR_AUDIO_TAG "soapy-audio-0.1.1") set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1") -set(AIRSPY_TAG "37c768ce9997b32e7328eb48972a7fda0a1f8554") +set(AIRSPY_TAG "a379373639ea0a33e5f1f96956c0909da60faeee") set(HACKRF_TAG "v2024.02.1") set(LIBXML2_TAG "v2.10.4") set(UHD_TAG "v4.7.0.0") From c527107b67e0d70995707d14ff123b48cecd0005 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 19:29:05 +0100 Subject: [PATCH 12/26] Use fork of airspy --- external/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d5c2df713..cef392e78 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -28,7 +28,7 @@ set(SOAPYSDR_TAG "1667b4e6301d7ad47b340dcdcd6e9969bf57d843") set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0") set(SOAPYSDR_AUDIO_TAG "soapy-audio-0.1.1") set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1") -set(AIRSPY_TAG "a379373639ea0a33e5f1f96956c0909da60faeee") +set(AIRSPY_TAG "cmake4") set(HACKRF_TAG "v2024.02.1") set(LIBXML2_TAG "v2.10.4") set(UHD_TAG "v4.7.0.0") @@ -1292,7 +1292,7 @@ if (WIN32 OR APPLE) # We need to set CMAKE_INSTALL_NAME_DIR, otherwise path to libs is set to install path of /usr/local/ # but as we don't install, macdeployqt will fail to find them ExternalProject_Add(airspy - GIT_REPOSITORY https://github.com/airspy/airspyone_host + GIT_REPOSITORY https://github.com/srcejon/airspyone_host.git GIT_TAG ${AIRSPY_TAG} DEPENDS ${PTHREADS4W_DEPENDS} ${LIBUSB_DEPENDS} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/airspy" From 680d823b875413d48994b4aef752169a03f1ce6e Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sat, 20 Sep 2025 22:17:10 +0100 Subject: [PATCH 13/26] Update to latest AirspyHF --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index cef392e78..882be5e52 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -16,7 +16,7 @@ set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354) set(BLADERF_TAG "2021.02") set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) -set(AIRSPYHF_TAG "1af81c0ca18944b8c9897c3c98dc0a991815b686") +set(AIRSPYHF_TAG "87cf12a30f3a0f10f313aab8e54999ca69b753af") set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) set(MIRISDR_TAG "v2.0.0") set(LIBSIGMF_TAG "new-namespaces") From 9945099dfedfed2af0130eb5296230d0fbb5db79 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 09:13:55 +0100 Subject: [PATCH 14/26] Update hackrf and bladerf to latest --- external/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 882be5e52..79755484a 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -14,7 +14,7 @@ set(MBELIB_TAG fac842804e31369696051c0ee80f4eafbfdb4ee2) set(SERIALDV_TAG "v1.1.5") set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354) -set(BLADERF_TAG "2021.02") +set(BLADERF_TAG 7d7d87f686ebedb29dba9f35c7313892ba286318) set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) set(AIRSPYHF_TAG "87cf12a30f3a0f10f313aab8e54999ca69b753af") set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) @@ -29,7 +29,7 @@ set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0") set(SOAPYSDR_AUDIO_TAG "soapy-audio-0.1.1") set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1") set(AIRSPY_TAG "cmake4") -set(HACKRF_TAG "v2024.02.1") +set(HACKRF_TAG "adc537331c5bc3165f47648043c570063518ef79") set(LIBXML2_TAG "v2.10.4") set(UHD_TAG "v4.7.0.0") set(BOOST_TAG "1.86.0") From 3429cbf7bfe6bc622a9d61b3993bdd4949d56db7 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 09:38:36 +0100 Subject: [PATCH 15/26] Set -DENABLE_LIBTECLA=OFF to remove dependency on ncurses --- external/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 79755484a..f5da481e1 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1534,6 +1534,7 @@ if (WIN32 OR APPLE) -DENABLE_HOST_BUILD=ON -DENABLE_BACKEND_CYAPI=OFF -DTREAT_WARNINGS_AS_ERRORS=OFF + -DENABLE_LIBTECLA=OFF BUILD_BYPRODUCTS "${LIBBLADERF_LIBRARIES}" INSTALL_COMMAND "" TEST_COMMAND "" From 184516c50071b8cddd5fd7829f35015ffafbbd05 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 10:01:49 +0100 Subject: [PATCH 16/26] Add ncurses needed by bladeRF-power, which we can't appear to disable --- .github/workflows/mac.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 10f2fbcd7..8bb8ffda7 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -20,7 +20,7 @@ jobs: - name: Update brew run: brew update - name: Install brew packages - run: brew install nasm subversion + run: brew install nasm subversion ncurses - name: Install SDRplay API run: | wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg @@ -95,7 +95,7 @@ jobs: - name: Update brew run: brew update - name: Install brew packages - run: brew install nasm subversion + run: brew install nasm subversion ncurses - name: Install SDRplay API run: | wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg From 6d2389309918b78132cf2b82e0f006099c734cdb Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 10:36:53 +0100 Subject: [PATCH 17/26] Update UHD to v4.9. --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index f5da481e1..83b395538 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -31,7 +31,7 @@ set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1") set(AIRSPY_TAG "cmake4") set(HACKRF_TAG "adc537331c5bc3165f47648043c570063518ef79") set(LIBXML2_TAG "v2.10.4") -set(UHD_TAG "v4.7.0.0") +set(UHD_TAG "v4.9.0.0") set(BOOST_TAG "1.86.0") set(BOOST_TAG2 "1_86_0") From 39757ecba304b2a2381f6d0069ac8bae73cb89e0 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 11:04:51 +0100 Subject: [PATCH 18/26] Update libiio to latest --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 83b395538..ffb8b1021 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -15,7 +15,7 @@ set(SERIALDV_TAG "v1.1.5") set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354) set(BLADERF_TAG 7d7d87f686ebedb29dba9f35c7313892ba286318) -set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) +set(LIBIIO_TAG 1935245b78d7e797539eb36aec82e46124c4ce28) set(AIRSPYHF_TAG "87cf12a30f3a0f10f313aab8e54999ca69b753af") set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) set(MIRISDR_TAG "v2.0.0") From 7290a48a3087aa5de29ea34158600a043425bbb5 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 11:36:46 +0100 Subject: [PATCH 19/26] Add ncurses for mac build, as needed by bladeRF-power --- .github/workflows/sdrangel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 8a2c0e321..c22c5371c 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -120,7 +120,7 @@ jobs: rm -f /usr/local/bin/2to3 brew install opencv - name: Install brew packages - run: brew install nasm boost hidapi libusb fftw ffmpeg@5 faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt subversion + run: brew install nasm boost hidapi libusb fftw ffmpeg@5 faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt subversion ncurses - name: Configure SDRangel run: | mkdir build && cd build From 3d5e61112d31fdbe252bf4782d3cee3ab2810bf7 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 14:09:10 +0100 Subject: [PATCH 20/26] Try v0.25 of libiio, as more recent versions have lots of API changes. --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index ffb8b1021..45818651f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -15,7 +15,7 @@ set(SERIALDV_TAG "v1.1.5") set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354) set(BLADERF_TAG 7d7d87f686ebedb29dba9f35c7313892ba286318) -set(LIBIIO_TAG 1935245b78d7e797539eb36aec82e46124c4ce28) +set(LIBIIO_TAG "v0.25") set(AIRSPYHF_TAG "87cf12a30f3a0f10f313aab8e54999ca69b753af") set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) set(MIRISDR_TAG "v2.0.0") From e8cf0adaa3bb781526f46ec99ffbbba922cb1d83 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 19:24:04 +0100 Subject: [PATCH 21/26] Use lib branch of mbelib to fix ninja multiple targets error --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 45818651f..d9720bb9b 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -10,7 +10,7 @@ # which version/tag/checkout to use set(CODEC2_TAG "v1.1.1") set(CM256CC_TAG "v1.1.2") -set(MBELIB_TAG fac842804e31369696051c0ee80f4eafbfdb4ee2) +set(MBELIB_TAG "lib") set(SERIALDV_TAG "v1.1.5") set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354) From acc9c6f76db894842ed87f1156e5b284f9f0cfe9 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 21 Sep 2025 21:18:50 +0100 Subject: [PATCH 22/26] Try new libusb include dir --- external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d9720bb9b..f8399e1a7 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1460,7 +1460,7 @@ if (WIN32 OR APPLE) set(LIBXML2_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/libxml2/lib/libxml2.a" CACHE INTERNAL "") endif () if (WIN32) - set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}) + set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/libusb-1.0) else () set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/..) endif () From 6d04a556d4fcf3e8e1b112842a7644acee5456c8 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 22 Sep 2025 10:09:50 +0100 Subject: [PATCH 23/26] Rollback libiio for windows. Use release version of BladeRF. --- external/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index f8399e1a7..63f1c27fb 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -14,8 +14,13 @@ set(MBELIB_TAG "lib") set(SERIALDV_TAG "v1.1.5") set(DSDCC_TAG "v1.9.6") set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354) -set(BLADERF_TAG 7d7d87f686ebedb29dba9f35c7313892ba286318) -set(LIBIIO_TAG "v0.25") +set(BLADERF_TAG "2024.05") +if (WIN32) + # Using old version of libiio on windows, as we get unresolved symbols in dll: serial_create_context_from_uri + set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) +else() + set(LIBIIO_TAG "v0.26") +endif() set(AIRSPYHF_TAG "87cf12a30f3a0f10f313aab8e54999ca69b753af") set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) set(MIRISDR_TAG "v2.0.0") @@ -1460,7 +1465,7 @@ if (WIN32 OR APPLE) set(LIBXML2_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/libxml2/lib/libxml2.a" CACHE INTERNAL "") endif () if (WIN32) - set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/libusb-1.0) + set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/) else () set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/..) endif () From ae2ab1dad6497ea3d933fdcaabcd821cabf5b229 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 22 Sep 2025 14:43:57 +0100 Subject: [PATCH 24/26] Install NSIS via chocolatey, as not included in Windows 2025 runner --- .github/workflows/sdrangel.yml | 3 ++- .github/workflows/windows.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index c22c5371c..0480fb256 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -47,9 +47,10 @@ jobs: - name: Install basic dependencies on Windows if: startsWith(matrix.config.os, 'windows') run: | - choco install ninja cmake + choco install ninja cmake nsis.install ninja --version cmake --version + makensis /VERSION - name: Install MSVC on Windows if: startsWith(matrix.config.os, 'windows') uses: ilammy/msvc-dev-cmd@v1 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 37517a457..fca314a48 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -43,9 +43,10 @@ jobs: - name: Install basic dependencies on Windows if: startsWith(matrix.config.os, 'windows') run: | - choco install ninja cmake + choco install ninja cmake nsis.install ninja --version cmake --version + makensis /VERSION - name: Install MSVC on Windows if: startsWith(matrix.config.os, 'windows') uses: ilammy/msvc-dev-cmd@v1 From ea5b474b1c3e3baa3ff99a2ad003a4eb3074c45a Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 22 Sep 2025 14:51:56 +0100 Subject: [PATCH 25/26] Set PATH so nsis can be found. --- .github/workflows/sdrangel.yml | 5 +++++ .github/workflows/windows.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 0480fb256..656133f72 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -50,6 +50,11 @@ jobs: choco install ninja cmake nsis.install ninja --version cmake --version + - name: Set PATH + shell: cmd + run: | + call refreshenv + echo ::set-env name=PATH::%PATH% makensis /VERSION - name: Install MSVC on Windows if: startsWith(matrix.config.os, 'windows') diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fca314a48..cf61fb658 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -46,6 +46,11 @@ jobs: choco install ninja cmake nsis.install ninja --version cmake --version + - name: Set PATH + shell: cmd + run: | + call refreshenv + echo ::set-env name=PATH::%PATH% makensis /VERSION - name: Install MSVC on Windows if: startsWith(matrix.config.os, 'windows') From 55e5d52656d856faef75d91624983adc99acd0b7 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 22 Sep 2025 15:04:01 +0100 Subject: [PATCH 26/26] Tey using bash to set path --- .github/workflows/sdrangel.yml | 9 ++++----- .github/workflows/windows.yml | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 656133f72..404d747e1 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -44,17 +44,16 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.12' + - name: Set PATH + shell: bash + run: | + echo "C:\Program Files (x86)\NSIS" >> "$GITHUB_PATH" - name: Install basic dependencies on Windows if: startsWith(matrix.config.os, 'windows') run: | choco install ninja cmake nsis.install ninja --version cmake --version - - name: Set PATH - shell: cmd - run: | - call refreshenv - echo ::set-env name=PATH::%PATH% makensis /VERSION - name: Install MSVC on Windows if: startsWith(matrix.config.os, 'windows') diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cf61fb658..9ed125c2e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,17 +40,16 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.12' + - name: Set PATH + shell: bash + run: | + echo "C:\Program Files (x86)\NSIS" >> "$GITHUB_PATH" - name: Install basic dependencies on Windows if: startsWith(matrix.config.os, 'windows') run: | choco install ninja cmake nsis.install ninja --version cmake --version - - name: Set PATH - shell: cmd - run: | - call refreshenv - echo ::set-env name=PATH::%PATH% makensis /VERSION - name: Install MSVC on Windows if: startsWith(matrix.config.os, 'windows')