Sat Apr 24 16:34:54 2021 UTC ()
uhd: fix boost fallout


(tnn)
diff -r1.25 -r1.26 pkgsrc/ham/uhd/distinfo
diff -r1.1 -r1.2 pkgsrc/ham/uhd/patches/patch-lib_usrp_cores_rx__dsp__core__3000.cpp
diff -r0 -r1.1 pkgsrc/ham/uhd/patches/patch-lib_usrp_cores_rx__frontend__core__3000.cpp
diff -r0 -r1.1 pkgsrc/ham/uhd/patches/patch-lib_usrp_usrp2_usrp2__impl.cpp
cvs diff -r1.25 -r1.26 pkgsrc/ham/uhd/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/uhd/distinfo 2020/05/14 19:21:04 1.25
+++ pkgsrc/ham/uhd/distinfo 2021/04/24 16:34:54 1.26
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1$NetBSD: distinfo,v 1.25 2020/05/14 19:21:04 joerg Exp $ 1$NetBSD: distinfo,v 1.26 2021/04/24 16:34:54 tnn Exp $
2 2
3SHA1 (uhd-3.15.0.0.tar.gz) = 17286a52a591038af16e870962c1767c5935ec2f 3SHA1 (uhd-3.15.0.0.tar.gz) = 17286a52a591038af16e870962c1767c5935ec2f
4RMD160 (uhd-3.15.0.0.tar.gz) = b05282c4b3f25bd201e9b91b3652fba9b150c7ae 4RMD160 (uhd-3.15.0.0.tar.gz) = b05282c4b3f25bd201e9b91b3652fba9b150c7ae
5SHA512 (uhd-3.15.0.0.tar.gz) = ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0 5SHA512 (uhd-3.15.0.0.tar.gz) = ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
6Size (uhd-3.15.0.0.tar.gz) = 12895934 bytes 6Size (uhd-3.15.0.0.tar.gz) = 12895934 bytes
7SHA1 (patch-CMakeLists.txt) = 5691ddd6a98f92e649a184cfc092a4eb721c6fe7 7SHA1 (patch-CMakeLists.txt) = 5691ddd6a98f92e649a184cfc092a4eb721c6fe7
8SHA1 (patch-lib_rfnoc_dma__fifo__block__ctrl__impl.cpp) = 0dcc0ddc231f3f1c2a6a3a57ef88df5467170fc6 8SHA1 (patch-lib_rfnoc_dma__fifo__block__ctrl__impl.cpp) = 0dcc0ddc231f3f1c2a6a3a57ef88df5467170fc6
9SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7 9SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7
10SHA1 (patch-lib_usrp__clock_octoclock_octoclock__impl.cpp) = b77c91c7a202e3c93707dba67bedc9704f77ab56 10SHA1 (patch-lib_usrp__clock_octoclock_octoclock__impl.cpp) = b77c91c7a202e3c93707dba67bedc9704f77ab56
11SHA1 (patch-lib_usrp_b100_b100__impl.cpp) = 9a53e41b45fdebaf0b56e3030f1c8f9790185046 11SHA1 (patch-lib_usrp_b100_b100__impl.cpp) = 9a53e41b45fdebaf0b56e3030f1c8f9790185046
12SHA1 (patch-lib_usrp_cores_rx__dsp__core__3000.cpp) = d63fd1ab1d48da7e9eb8a7deb33a3803fb6c219d 12SHA1 (patch-lib_usrp_cores_rx__dsp__core__3000.cpp) = 7cb2910d13368e5dbb19bfa4a1d01a325383bd79
 13SHA1 (patch-lib_usrp_cores_rx__frontend__core__3000.cpp) = db294105298e598c94525d639f1c2de7e7b22663
13SHA1 (patch-lib_usrp_cores_tx__dsp__core__3000.cpp) = 3812d190f830128046ab39b21ba63b6775f8c764 14SHA1 (patch-lib_usrp_cores_tx__dsp__core__3000.cpp) = 3812d190f830128046ab39b21ba63b6775f8c764
14SHA1 (patch-lib_usrp_dboard_db__cbx.cpp) = 3b8864f060acaeb262c91433f0dc0fd229f8c458 15SHA1 (patch-lib_usrp_dboard_db__cbx.cpp) = 3b8864f060acaeb262c91433f0dc0fd229f8c458
15SHA1 (patch-lib_usrp_dboard_db__dbsrx.cpp) = 55de5be387fbe59015c4e1c0861313740b9b3088 16SHA1 (patch-lib_usrp_dboard_db__dbsrx.cpp) = 55de5be387fbe59015c4e1c0861313740b9b3088
16SHA1 (patch-lib_usrp_dboard_db__dbsrx2.cpp) = a7b905d154ecfcfa72df8561b6ae98cd3f97fb08 17SHA1 (patch-lib_usrp_dboard_db__dbsrx2.cpp) = a7b905d154ecfcfa72df8561b6ae98cd3f97fb08
17SHA1 (patch-lib_usrp_dboard_db__rfx.cpp) = c01c17ee5ba2ad877c1bdf4c940af529adeab8d6 18SHA1 (patch-lib_usrp_dboard_db__rfx.cpp) = c01c17ee5ba2ad877c1bdf4c940af529adeab8d6
18SHA1 (patch-lib_usrp_dboard_db__sbx__common.cpp) = 35345e22a714b67a35055f303aaa074ff3b637fa 19SHA1 (patch-lib_usrp_dboard_db__sbx__common.cpp) = 35345e22a714b67a35055f303aaa074ff3b637fa
19SHA1 (patch-lib_usrp_dboard_db__sbx__version3.cpp) = 8e243093fae46256dde8f8c531715dd2d88f2c9d 20SHA1 (patch-lib_usrp_dboard_db__sbx__version3.cpp) = 8e243093fae46256dde8f8c531715dd2d88f2c9d
20SHA1 (patch-lib_usrp_dboard_db__sbx__version4.cpp) = 8ed4d05a98438a852f352c6db003d20b5886bd49 21SHA1 (patch-lib_usrp_dboard_db__sbx__version4.cpp) = 8ed4d05a98438a852f352c6db003d20b5886bd49
21SHA1 (patch-lib_usrp_dboard_db__tvrx.cpp) = 6b94d0a89558198340b75cd2d9b77c1fe0f04c5d 22SHA1 (patch-lib_usrp_dboard_db__tvrx.cpp) = 6b94d0a89558198340b75cd2d9b77c1fe0f04c5d
22SHA1 (patch-lib_usrp_dboard_db__tvrx2.cpp) = 5d3618a80d5ece89c2a4488b12613ca824ba7a19 23SHA1 (patch-lib_usrp_dboard_db__tvrx2.cpp) = 5d3618a80d5ece89c2a4488b12613ca824ba7a19
23SHA1 (patch-lib_usrp_dboard_db__ubx.cpp) = c8bdfbe6b4494fc50f6b8229a5ee796cd9d85af5 24SHA1 (patch-lib_usrp_dboard_db__ubx.cpp) = c8bdfbe6b4494fc50f6b8229a5ee796cd9d85af5
24SHA1 (patch-lib_usrp_dboard_db__wbx__common.cpp) = 190619aaf7a93314e4d13cac28497b9af0011bf4 25SHA1 (patch-lib_usrp_dboard_db__wbx__common.cpp) = 190619aaf7a93314e4d13cac28497b9af0011bf4
25SHA1 (patch-lib_usrp_dboard_db__wbx__simple.cpp) = e889a9fd77f610bf672b0e95ab6ab9178c14d7da 26SHA1 (patch-lib_usrp_dboard_db__wbx__simple.cpp) = e889a9fd77f610bf672b0e95ab6ab9178c14d7da
26SHA1 (patch-lib_usrp_dboard_db__wbx__version2.cpp) = 4285b334b32e246d54c53715da7a07f126ef6533 27SHA1 (patch-lib_usrp_dboard_db__wbx__version2.cpp) = 4285b334b32e246d54c53715da7a07f126ef6533
27SHA1 (patch-lib_usrp_dboard_db__wbx__version3.cpp) = e1d69f09f9f134a0c5aa2bbf772d8dd995cda681 28SHA1 (patch-lib_usrp_dboard_db__wbx__version3.cpp) = e1d69f09f9f134a0c5aa2bbf772d8dd995cda681
28SHA1 (patch-lib_usrp_dboard_db__wbx__version4.cpp) = dbbe24a2a755031c06ff74045e2502d2ee646f59 29SHA1 (patch-lib_usrp_dboard_db__wbx__version4.cpp) = dbbe24a2a755031c06ff74045e2502d2ee646f59
29SHA1 (patch-lib_usrp_dboard_db__xcvr2450.cpp) = 90d2e4bfe072e84e20c35c256af036da696425c1 30SHA1 (patch-lib_usrp_dboard_db__xcvr2450.cpp) = 90d2e4bfe072e84e20c35c256af036da696425c1
30SHA1 (patch-lib_usrp_dboard_eiscat_eiscat__radio__ctrl__impl.cpp) = 54e9e06fd37dd7cc5a9767519148266dd915f4a0 31SHA1 (patch-lib_usrp_dboard_eiscat_eiscat__radio__ctrl__impl.cpp) = 54e9e06fd37dd7cc5a9767519148266dd915f4a0
31SHA1 (patch-lib_usrp_multi__usrp.cpp) = ff711af0232cbe92dfe822411ab228b35fa63389 32SHA1 (patch-lib_usrp_multi__usrp.cpp) = ff711af0232cbe92dfe822411ab228b35fa63389
 33SHA1 (patch-lib_usrp_usrp2_usrp2__impl.cpp) = 339feabd4ac7af60e6b7b5be28e386e7ca48f11c
32SHA1 (patch-lib_usrp_x300_x300__radio__ctrl__impl.cpp) = 2f0c10f2443b6d2f361ee8a9f339b39c9498d2bb 34SHA1 (patch-lib_usrp_x300_x300__radio__ctrl__impl.cpp) = 2f0c10f2443b6d2f361ee8a9f339b39c9498d2bb
cvs diff -r1.1 -r1.2 pkgsrc/ham/uhd/patches/Attic/patch-lib_usrp_cores_rx__dsp__core__3000.cpp (expand / switch to unified diff)

--- pkgsrc/ham/uhd/patches/Attic/patch-lib_usrp_cores_rx__dsp__core__3000.cpp 2020/05/14 19:21:04 1.1
+++ pkgsrc/ham/uhd/patches/Attic/patch-lib_usrp_cores_rx__dsp__core__3000.cpp 2021/04/24 16:34:54 1.2
@@ -1,17 +1,27 @@ @@ -1,17 +1,27 @@
1$NetBSD: patch-lib_usrp_cores_rx__dsp__core__3000.cpp,v 1.1 2020/05/14 19:21:04 joerg Exp $ 1$NetBSD: patch-lib_usrp_cores_rx__dsp__core__3000.cpp,v 1.2 2021/04/24 16:34:54 tnn Exp $
2 2
3--- lib/usrp/cores/rx_dsp_core_3000.cpp.orig 2020-05-09 15:26:15.563064777 +0000 3libuhd.so.3.15.0: undefined reference to `int boost::math::sign<double>(double const&)'
 4
 5--- lib/usrp/cores/rx_dsp_core_3000.cpp.orig 2020-01-01 04:21:49.000000000 +0000
4+++ lib/usrp/cores/rx_dsp_core_3000.cpp 6+++ lib/usrp/cores/rx_dsp_core_3000.cpp
5@@ -300,10 +300,10 @@ public: 7@@ -14,6 +14,7 @@
 8 #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
 9 #include <boost/assign/list_of.hpp>
 10 #include <boost/math/special_functions/round.hpp>
 11+#include <boost/math/special_functions/sign.hpp>
 12 #include <boost/thread/thread.hpp> //thread sleep
 13 #include <algorithm>
 14 #include <cmath>
 15@@ -300,10 +301,10 @@ public:
6 .set_publisher(boost::bind(&rx_dsp_core_3000::get_host_rates, this)); 16 .set_publisher(boost::bind(&rx_dsp_core_3000::get_host_rates, this));
7 subtree->create<double>("rate/value") 17 subtree->create<double>("rate/value")
8 .set(DEFAULT_RATE) 18 .set(DEFAULT_RATE)
9- .set_coercer(boost::bind(&rx_dsp_core_3000::set_host_rate, this, _1)); 19- .set_coercer(boost::bind(&rx_dsp_core_3000::set_host_rate, this, _1));
10+ .set_coercer(boost::bind(&rx_dsp_core_3000::set_host_rate, this, boost::placeholders::_1)); 20+ .set_coercer(boost::bind(&rx_dsp_core_3000::set_host_rate, this, boost::placeholders::_1));
11 subtree->create<double>("freq/value") 21 subtree->create<double>("freq/value")
12 .set(DEFAULT_CORDIC_FREQ) 22 .set(DEFAULT_CORDIC_FREQ)
13- .set_coercer(boost::bind(&rx_dsp_core_3000::set_freq, this, _1)) 23- .set_coercer(boost::bind(&rx_dsp_core_3000::set_freq, this, _1))
14+ .set_coercer(boost::bind(&rx_dsp_core_3000::set_freq, this, boost::placeholders::_1)) 24+ .set_coercer(boost::bind(&rx_dsp_core_3000::set_freq, this, boost::placeholders::_1))
15 .set_publisher([this]() { return this->get_freq(); }); 25 .set_publisher([this]() { return this->get_freq(); });
16 subtree->create<meta_range_t>("freq/range") 26 subtree->create<meta_range_t>("freq/range")
17 .set_publisher(boost::bind(&rx_dsp_core_3000::get_freq_range, this)); 27 .set_publisher(boost::bind(&rx_dsp_core_3000::get_freq_range, this));
File Added: pkgsrc/ham/uhd/patches/Attic/patch-lib_usrp_cores_rx__frontend__core__3000.cpp
$NetBSD: patch-lib_usrp_cores_rx__frontend__core__3000.cpp,v 1.1 2021/04/24 16:34:54 tnn Exp $

libuhd.so.3.15.0: undefined reference to `int boost::math::sign<double>(double const&)'

--- lib/usrp/cores/rx_frontend_core_3000.cpp.orig	2020-01-01 04:21:49.000000000 +0000
+++ lib/usrp/cores/rx_frontend_core_3000.cpp
@@ -13,6 +13,7 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/bind.hpp>
 #include <boost/math/special_functions/round.hpp>
+#include <boost/math/special_functions/sign.hpp>
 
 using namespace uhd;
File Added: pkgsrc/ham/uhd/patches/Attic/patch-lib_usrp_usrp2_usrp2__impl.cpp
$NetBSD: patch-lib_usrp_usrp2_usrp2__impl.cpp,v 1.1 2021/04/24 16:34:54 tnn Exp $

libuhd.so.3.15.0: undefined reference to `int boost::math::sign<double>(double const&)'

--- lib/usrp/usrp2/usrp2_impl.cpp.orig	2020-01-01 04:21:49.000000000 +0000
+++ lib/usrp/usrp2/usrp2_impl.cpp
@@ -835,6 +835,9 @@ void usrp2_impl::set_tx_fe_corrections(c
     }
 }
 
+#include <boost/math/special_functions/round.hpp>
+#include <boost/math/special_functions/sign.hpp>
+
 double usrp2_impl::set_tx_dsp_freq(
     const std::string &mb,
     const double freq_
@@ -878,8 +881,6 @@ meta_range_t usrp2_impl::get_tx_dsp_freq
     );
 }
 
-#include <boost/math/special_functions/round.hpp>
-#include <boost/math/special_functions/sign.hpp>
 
 void usrp2_impl::update_clock_source(const std::string &mb, const std::string &source){
     //NOTICE: U2_REG_MISC_CTRL_CLOCK is on the wb clock, and cannot be set from fifo_ctrl