From bf32e79d714cae8111fccfb1de9e7482c924fec7 Mon Sep 17 00:00:00 2001 From: Neals <16183049+NealsSec@users.noreply.github.com> Date: Tue, 27 Jan 2026 20:15:17 -0600 Subject: [PATCH 1/6] Add ettus ppa to linux cicd --- .github/workflows/linux.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9e93b838d..17d659ce1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -22,6 +22,9 @@ jobs: - name: Install dependencies run: | sudo apt-get update + sudo apt-get install software-properties-common + add-apt-repository ppa:ettusresearch/uhd + apt-get update sudo apt-get -y install build-essential cmake git xxd \ devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libopengl-dev libqt5opengl5-dev \ qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \ From a2dff68f4add0732eb53394c67fc4af5d6f3851c Mon Sep 17 00:00:00 2001 From: Neals <16183049+NealsSec@users.noreply.github.com> Date: Tue, 27 Jan 2026 20:25:25 -0600 Subject: [PATCH 2/6] forgot to add ppa flag --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 17d659ce1..9551a5649 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,7 +23,7 @@ jobs: run: | sudo apt-get update sudo apt-get install software-properties-common - add-apt-repository ppa:ettusresearch/uhd + add-apt-repository -y ppa:ettusresearch/uhd apt-get update sudo apt-get -y install build-essential cmake git xxd \ devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libopengl-dev libqt5opengl5-dev \ From cec1419bbabd4d334b49149530796eb4a9bb2da3 Mon Sep 17 00:00:00 2001 From: Neals <16183049+NealsSec@users.noreply.github.com> Date: Thu, 29 Jan 2026 19:08:17 -0600 Subject: [PATCH 3/6] Update flatpak uhd lib --- flatpak/org.sdrangel.SDRangel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flatpak/org.sdrangel.SDRangel.yaml b/flatpak/org.sdrangel.SDRangel.yaml index 059091051..77d12fa9d 100644 --- a/flatpak/org.sdrangel.SDRangel.yaml +++ b/flatpak/org.sdrangel.SDRangel.yaml @@ -431,8 +431,8 @@ modules: - -DINSTALL_UDEV_RULES=OFF sources: - type: archive - url: https://github.com/EttusResearch/uhd/archive/refs/tags/v4.5.0.0.tar.gz - sha256: ca8217b1f0591fb99432a94f225e74fb4d0fe541d496ec1386221b6438d4875d + url: https://github.com/EttusResearch/uhd/archive/refs/tags/v4.9.0.1.tar.gz + sha256: 0be26a139f23041c1fb6e9666d84cba839460e3c756057dc48dc067cc356a7bc - type: patch paths: - uhd-disable-ascii-art-dft.patch From 50e843b952cdef4b80318ee448c0bcb8ed9341ab Mon Sep 17 00:00:00 2001 From: Neals <16183049+NealsSec@users.noreply.github.com> Date: Fri, 30 Jan 2026 02:10:05 -0600 Subject: [PATCH 4/6] Fix flatpak patches --- flatpak/uhd-disable-ascii-art-dft.patch | 12 ++++++++---- flatpak/uhd-disable-latency-utils.patch | 10 ++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/flatpak/uhd-disable-ascii-art-dft.patch b/flatpak/uhd-disable-ascii-art-dft.patch index 211fd2377..2e2ef8694 100644 --- a/flatpak/uhd-disable-ascii-art-dft.patch +++ b/flatpak/uhd-disable-ascii-art-dft.patch @@ -14,20 +14,24 @@ index 69e84f95d..26b2306b4 100644 -if(CURSES_FOUND) - include_directories(${CURSES_INCLUDE_DIR}) - add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) +- target_link_libraries(rx_ascii_art_dft +- PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) +#if(CURSES_FOUND) +# include_directories(${CURSES_INCLUDE_DIR}) +# add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -+# target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) ++# target_link_libraries(rx_ascii_art_dft ++# PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) +# UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) +- target_link_libraries(twinrx_freq_hopping +- PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) - UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) -endif(CURSES_FOUND) +# add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -+# target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) ++# target_link_libraries(twinrx_freq_hopping ++# PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) +# UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) +#endif(CURSES_FOUND) diff --git a/flatpak/uhd-disable-latency-utils.patch b/flatpak/uhd-disable-latency-utils.patch index 4ec02cd3f..c2cd6d3aa 100644 --- a/flatpak/uhd-disable-latency-utils.patch +++ b/flatpak/uhd-disable-latency-utils.patch @@ -38,15 +38,17 @@ index e4cd4d171..e806d8da0 100644 - foreach(source ${sources}) - get_filename_component(name ${source} NAME_WE) - add_executable(${name} ${source} ${latency_lib_path}) -- LIBUHD_APPEND_SOURCES(${name}) -- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) -- UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) +- LIBUHD_APPEND_SOURCES(${name}) +- target_link_libraries(${name} +- PUBLIC uhd Boost::program_options ${CURSES_LIBRARIES}) +- UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - endforeach(source) +# foreach(source ${sources}) +# get_filename_component(name ${source} NAME_WE) +# add_executable(${name} ${source} ${latency_lib_path}) +# LIBUHD_APPEND_SOURCES(${name}) -+# target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) ++# target_link_libraries(${name} ++# PUBLIC uhd Boost::program_options ${CURSES_LIBRARIES}) +# UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) +# endforeach(source) From d3b6a90045cb4102e4f95b832af4e07f912979c5 Mon Sep 17 00:00:00 2001 From: Neals <16183049+NealsSec@users.noreply.github.com> Date: Fri, 30 Jan 2026 23:04:20 -0600 Subject: [PATCH 5/6] Revert "Fix flatpak patches" This reverts commit 50e843b952cdef4b80318ee448c0bcb8ed9341ab. --- flatpak/uhd-disable-ascii-art-dft.patch | 12 ++++-------- flatpak/uhd-disable-latency-utils.patch | 10 ++++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/flatpak/uhd-disable-ascii-art-dft.patch b/flatpak/uhd-disable-ascii-art-dft.patch index 2e2ef8694..211fd2377 100644 --- a/flatpak/uhd-disable-ascii-art-dft.patch +++ b/flatpak/uhd-disable-ascii-art-dft.patch @@ -14,24 +14,20 @@ index 69e84f95d..26b2306b4 100644 -if(CURSES_FOUND) - include_directories(${CURSES_INCLUDE_DIR}) - add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- target_link_libraries(rx_ascii_art_dft -- PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) +- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) +#if(CURSES_FOUND) +# include_directories(${CURSES_INCLUDE_DIR}) +# add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -+# target_link_libraries(rx_ascii_art_dft -+# PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) ++# target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) +# UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -- target_link_libraries(twinrx_freq_hopping -- PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) +- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) -endif(CURSES_FOUND) +# add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -+# target_link_libraries(twinrx_freq_hopping -+# PUBLIC uhd ${CURSES_LIBRARIES} Boost::program_options) ++# target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) +# UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) +#endif(CURSES_FOUND) diff --git a/flatpak/uhd-disable-latency-utils.patch b/flatpak/uhd-disable-latency-utils.patch index c2cd6d3aa..4ec02cd3f 100644 --- a/flatpak/uhd-disable-latency-utils.patch +++ b/flatpak/uhd-disable-latency-utils.patch @@ -38,17 +38,15 @@ index e4cd4d171..e806d8da0 100644 - foreach(source ${sources}) - get_filename_component(name ${source} NAME_WE) - add_executable(${name} ${source} ${latency_lib_path}) -- LIBUHD_APPEND_SOURCES(${name}) -- target_link_libraries(${name} -- PUBLIC uhd Boost::program_options ${CURSES_LIBRARIES}) -- UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) +- LIBUHD_APPEND_SOURCES(${name}) +- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) +- UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - endforeach(source) +# foreach(source ${sources}) +# get_filename_component(name ${source} NAME_WE) +# add_executable(${name} ${source} ${latency_lib_path}) +# LIBUHD_APPEND_SOURCES(${name}) -+# target_link_libraries(${name} -+# PUBLIC uhd Boost::program_options ${CURSES_LIBRARIES}) ++# target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) +# UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) +# endforeach(source) From 43924ab33e06d8ae252bab9fecb6e38e698551d8 Mon Sep 17 00:00:00 2001 From: Neals <16183049+NealsSec@users.noreply.github.com> Date: Fri, 30 Jan 2026 23:04:25 -0600 Subject: [PATCH 6/6] Revert "Update flatpak uhd lib" This reverts commit cec1419bbabd4d334b49149530796eb4a9bb2da3. --- flatpak/org.sdrangel.SDRangel.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flatpak/org.sdrangel.SDRangel.yaml b/flatpak/org.sdrangel.SDRangel.yaml index 77d12fa9d..059091051 100644 --- a/flatpak/org.sdrangel.SDRangel.yaml +++ b/flatpak/org.sdrangel.SDRangel.yaml @@ -431,8 +431,8 @@ modules: - -DINSTALL_UDEV_RULES=OFF sources: - type: archive - url: https://github.com/EttusResearch/uhd/archive/refs/tags/v4.9.0.1.tar.gz - sha256: 0be26a139f23041c1fb6e9666d84cba839460e3c756057dc48dc067cc356a7bc + url: https://github.com/EttusResearch/uhd/archive/refs/tags/v4.5.0.0.tar.gz + sha256: ca8217b1f0591fb99432a94f225e74fb4d0fe541d496ec1386221b6438d4875d - type: patch paths: - uhd-disable-ascii-art-dft.patch