New version

Resolves: rhbz#1918161
2021-01-26 00:54:58 +01:00 · 2021-01-26 00:54:58 +01:00 · 9833c761ac
parent 653a3d51a1
commit 9833c761ac
4 changed files with 17 additions and 432 deletions
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (uhd-images_3.14.1.1.tar.xz) = d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
-SHA512 (uhd-3.15.0.0-rc2.tar.gz) = e4054ac9e481e1ee97f9046f0c2b3053c4d346bbe8df01e6ae515a1d592ac5a41e847537f4e20ba105f52a5d6aa3a5b5a356faa8cb220873521cbdb3a8cd56fd
+SHA512 (uhd-images_4.0.0.0.tar.xz) = 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
+SHA512 (uhd-4.0.0.0.tar.gz) = 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
--- a/uhd-bind-placeholders.patch
+++ b/uhd-bind-placeholders.patch
@ -1,182 +0,0 @@
--- uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake~	2020-06-03 14:17:53.758142936 +0100
-+++ uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake	2020-06-03 14:17:55.821143050 +0100
-@@ -260,6 +260,9 @@
-     # works for Boost 1.67.0 and newer & doesn't hurt older
-     add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
- 
-+    # Needed for Boost 1.73.0 to prevent warnings
-+    add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
-+
-     # Boost 1.70.0's find cmake scripts don't always set the expected
-     # return variables. Replicate the commit that fixes that issue here:
-     # https://github.com/boostorg/boost_install/commit/cfa8d55250dfc2635e907e42da423e4eb540dee5
--- uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp~	2020-06-03 14:27:43.441170397 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp	2020-06-03 14:27:48.015170596 +0100
-@@ -17,6 +17,7 @@
- 
- using namespace uhd;
- using namespace uhd::rfnoc;
-+using namespace boost::placeholders;
- 
- class dma_fifo_block_ctrl_impl : public dma_fifo_block_ctrl
- {
--- uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp~	2020-06-03 14:28:32.297172502 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp	2020-06-03 14:28:40.874172872 +0100
-@@ -31,6 +31,7 @@
- 
- using namespace uhd;
- using namespace uhd::usrp;
-+using namespace boost::placeholders;
- 
- const size_t multi_usrp::ALL_MBOARDS = size_t(~0);
- const size_t multi_usrp::ALL_CHANS = size_t(~0);
--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp~	2020-06-03 14:31:35.175180398 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp	2020-06-03 14:31:42.021180693 +0100
-@@ -37,6 +37,7 @@
- }
- 
- using namespace uhd;
-+using namespace boost::placeholders;
- 
- const double rx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0;
- const double rx_dsp_core_3000::DEFAULT_RATE        = 1e6;
--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp~	2020-06-03 14:32:19.984182329 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp	2020-06-03 14:32:25.278182557 +0100
-@@ -28,6 +28,7 @@
- }
- 
- using namespace uhd;
-+using namespace boost::placeholders;
- 
- const double tx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0;
- const double tx_dsp_core_3000::DEFAULT_RATE        = 1e6;
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp~	2020-06-03 14:33:42.513185887 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp	2020-06-03 14:33:44.167185959 +0100
-@@ -12,6 +12,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * Structors
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp~	2020-06-03 14:34:31.865188014 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp	2020-06-03 14:34:38.007188279 +0100
-@@ -65,6 +65,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * The TVRX2 types
--- uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp~	2020-06-03 14:35:57.858191722 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp	2020-06-03 14:36:02.680191929 +0100
-@@ -27,6 +27,7 @@
- using namespace uhd::usrp;
- using namespace uhd::rfnoc;
- using namespace uhd::usrp::x300;
-+using namespace boost::placeholders;
- 
- static const size_t IO_MASTER_RADIO = 0;
- 
--- uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp~	2020-06-03 14:36:19.706192663 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp	2020-06-03 14:36:25.680192921 +0100
-@@ -23,6 +23,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace uhd::transport;
-+using namespace boost::placeholders;
- 
- namespace {
-     constexpr uint16_t B100_VENDOR_ID  = 0x2500;
--- uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp~	2020-06-03 14:36:54.427194160 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp	2020-06-03 14:37:11.471194895 +0100
-@@ -34,6 +34,7 @@
- using namespace uhd;
- using namespace uhd::usrp_clock;
- using namespace uhd::transport;
-+using namespace boost::placeholders;
- namespace asio = boost::asio;
- namespace fs = boost::filesystem;
- 
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp~	2020-06-03 14:40:42.223206781 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp	2020-06-03 14:40:49.140207195 +0100
-@@ -13,6 +13,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * Structors
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp~	2020-06-03 14:41:03.583208062 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp	2020-06-03 14:41:12.806208613 +0100
-@@ -26,6 +26,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * The DBSRX2 constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp~	2020-06-03 14:41:26.807209454 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp	2020-06-03 14:41:38.846210175 +0100
-@@ -41,6 +41,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * The tvrx constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp~	2020-06-03 14:41:50.031210845 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp	2020-06-03 14:41:55.988211201 +0100
-@@ -31,6 +31,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * The DBSRX constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp~	2020-06-03 15:03:03.828285516 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp	2020-06-03 15:03:06.925285692 +0100
-@@ -10,6 +10,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- 
- /***********************************************************************
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp~	2020-06-03 15:03:37.135287400 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp	2020-06-03 15:03:46.203287915 +0100
-@@ -58,6 +58,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * The XCVR 2450 constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp~	2020-06-03 15:04:13.982289481 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp	2020-06-03 15:04:21.595289912 +0100
-@@ -13,6 +13,7 @@
- using namespace uhd;
- using namespace uhd::usrp;
- using namespace boost::assign;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * Structors
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp~	2020-06-03 15:20:39.628345132 +0100
-+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp	2020-06-03 15:20:48.073345609 +0100
-@@ -30,6 +30,7 @@
- 
- using namespace uhd;
- using namespace uhd::usrp;
-+using namespace boost::placeholders;
- 
- /***********************************************************************
-  * UBX Data Structures
--- a/uhd-gcc11.patch
+++ b/uhd-gcc11.patch
@ -1,228 +0,0 @@
-diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp
-index 3356510..55a8981 100644
--- a/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp
-+++ b/host/lib/usrp/dboard/e3xx/e31x_radio_ctrl_impl.cpp
-@@ -4,6 +4,7 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
- #include "e31x_radio_ctrl_impl.hpp"
- #include "e31x_regs.hpp"
- 
-diff --git a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp
-index c48cabc..0771aa0 100644
--- a/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp
-+++ b/host/lib/usrp/dboard/e3xx/e320_radio_ctrl_impl.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "e320_radio_ctrl_impl.hpp"
- #include "e320_regs.hpp"
- 
-diff --git a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp
-index d9cadc8..155a075 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp
-+++ b/host/lib/usrp/dboard/e3xx/e3xx_ad9361_iface.cpp
-@@ -4,6 +4,7 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
- #include "e3xx_ad9361_iface.hpp"
- #include <uhd/exception.hpp>
- #include <uhd/utils/log.hpp>
-diff --git a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp
-index 001cf5d..c13b7e8 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp
-+++ b/host/lib/usrp/dboard/e3xx/e3xx_bands.cpp
-@@ -4,6 +4,7 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
- #include "e3xx_constants.hpp"
- #include "e3xx_radio_ctrl_impl.hpp"
- #include <uhd/utils/math.hpp>
-diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp
-index 989b73b..587ef6d 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp
-+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_impl.cpp
-@@ -4,6 +4,7 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
- #include "e3xx_radio_ctrl_impl.hpp"
- #include "e3xx_constants.hpp"
- #include <uhd/rfnoc/node_ctrl_base.hpp>
-diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp
-index 5b33b33..bd5aac1 100644
--- a/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp
-+++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_ctrl_init.cpp
-@@ -4,6 +4,9 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+#include <stdexcept>
-+
- #include "e3xx_constants.hpp"
- #include "e3xx_radio_ctrl_impl.hpp"
- #include <uhd/transport/chdr.hpp>
-diff --git a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp
-index d7d1b43..d1308d1 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp
-+++ b/host/lib/usrp/dboard/magnesium/magnesium_ad9371_iface.cpp
-@@ -4,6 +4,7 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
- #include "magnesium_ad9371_iface.hpp"
- #include "magnesium_constants.hpp"
- #include <uhd/utils/log.hpp>
-diff --git a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp
-index 13cc52d..1bd71ae 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp
-+++ b/host/lib/usrp/dboard/magnesium/magnesium_bands.cpp
-@@ -6,6 +6,7 @@
- 
- // The band plan
- 
-+#include <thread>
- #include "magnesium_constants.hpp"
- #include "magnesium_radio_ctrl_impl.hpp"
- #include <uhd/utils/math.hpp>
-diff --git a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp
-index 67b20f5..7963153 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp
-+++ b/host/lib/usrp/dboard/magnesium/magnesium_gain_table.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "magnesium_gain_table.hpp"
- #include "magnesium_constants.hpp"
- #include <uhd/exception.hpp>
-diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
-index 679816a..26bf5fd 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
-+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_cpld.cpp
-@@ -4,6 +4,7 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
- #include "magnesium_constants.hpp"
- #include "magnesium_cpld_ctrl.hpp"
- #include "magnesium_radio_ctrl_impl.hpp"
-diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp
-index b66bd2e..041d651 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp
-+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_gain.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "magnesium_constants.hpp"
- #include "magnesium_gain_table.hpp"
- #include "magnesium_radio_ctrl_impl.hpp"
-diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
-index 405d595..5d3964b 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
-+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "magnesium_radio_ctrl_impl.hpp"
- #include "magnesium_constants.hpp"
- #include "magnesium_gain_table.hpp"
-diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
-index 89db614..893741c 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
-+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp
-@@ -4,6 +4,7 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
- #include "magnesium_constants.hpp"
- #include "magnesium_radio_ctrl_impl.hpp"
- #include <uhd/transport/chdr.hpp>
-diff --git a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp
-index ffa2061..eb3c1cf 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp
-+++ b/host/lib/usrp/dboard/rhodium/rhodium_bands.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "rhodium_radio_ctrl_impl.hpp"
- #include "rhodium_constants.hpp"
- #include <uhd/utils/math.hpp>
-diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp
-index 846a4ea..450c16c 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp
-+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_cpld.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "rhodium_radio_ctrl_impl.hpp"
- #include "rhodium_cpld_ctrl.hpp"
- #include "rhodium_constants.hpp"
-diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp
-index d6dbbc5..40e4c9c 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp
-+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_impl.cpp
-@@ -4,6 +4,9 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+#include <stdexcept>
-+
- #include "rhodium_radio_ctrl_impl.hpp"
- #include "rhodium_constants.hpp"
- #include <uhdlib/utils/narrow.hpp>
-diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp
-index 356932b..8420756 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp
-+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_init.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "rhodium_radio_ctrl_impl.hpp"
- #include "rhodium_constants.hpp"
- #include <uhdlib/usrp/cores/spi_core_3000.hpp>
-diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp
-index 4058624..f81a855 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp
-+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_ctrl_lo.cpp
-@@ -4,6 +4,8 @@
- // SPDX-License-Identifier: GPL-3.0-or-later
- //
- 
-+#include <thread>
-+
- #include "rhodium_radio_ctrl_impl.hpp"
- #include "rhodium_constants.hpp"
- #include <uhdlib/utils/narrow.hpp>
--- a/uhd.spec
+++ b/uhd.spec
@ -9,9 +9,7 @@
 # images you need to install appropriate tools (e.g. Xilinx ISE).
 %bcond_without binary_firmware

-# By default do not build with wireshark support, it's currently
-# broken (upstream ticket #268)
-%bcond_with wireshark
+%bcond_without wireshark

 # NEON support is by default disabled on ARMs
 # building with --with=neon will enable auto detection
@ -26,15 +24,12 @@
 %endif
 %endif

-%global ver 3.15.0.0
-%global verd 3.14.1.1
-
 Name:           uhd
 URL:            http://github.com/EttusResearch/uhd
-Version:        %{ver}
-Release:        0.10.rc2%{?dist}
+Version:        4.0.0.0
+Release:        1%{?dist}
 License:        GPLv3+
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
 BuildRequires:  boost-devel, libusb1-devel, python3-cheetah, ncurses-devel
@ -50,12 +45,9 @@ BuildRequires:  sdcc sed
 Requires(pre):  shadow-utils, glibc-common
 Requires:       python3-tkinter
 Summary:        Universal Hardware Driver for Ettus Research products
-#Source0:       %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz
-Source0:        %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz
+Source0:        %{url}/archive/v%{version}/uhd-%{version}.tar.gz
 Source1:        %{name}-limits.conf
-Source2:        %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz
-Patch0:         %{name}-bind-placeholders.patch
-Patch1:         %{name}-gcc11.patch
+Source2:        %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz

 %description
 The UHD is the universal hardware driver for Ettus Research products.
@ -102,9 +94,7 @@ Wireshark dissector plugins.
 %endif

 %prep
-%setup -q -n %{name}-%{ver}-rc2
-%patch0 -p1
-%patch1 -p1
+%setup -q

 # firmware
 %if %{with binary_firmware}
@ -156,9 +146,9 @@ done
 popd
 %endif

-#%%check
-#cd host/build
-#make test
+%check
+cd host/build
+make test

 %install
 # fix python shebangs (run again for generated scripts)
@ -236,6 +226,7 @@ exit 0
 %dir %{_libdir}/uhd
 %{_bindir}/uhd_*
 %{_bindir}/usrp2_*
+%{_bindir}/rfnoc_image_builder
 %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
 %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
 %{_libdir}/lib*.so.*
@ -269,6 +260,10 @@ exit 0
 %endif

 %changelog
+* Mon Jan 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0.0-1
+- New version
+  Resolves: rhbz#1918161
+
 * Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 3.15.0.0-0.10.rc2
 - Rebuilt for Boost 1.75