Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/files/
Date: Fri, 29 Oct 2021 22:01:19
Message-Id: 1635543966.68cf2f52beceb077a9f9dbf33127e16a11e4ed8f.conikost@gentoo
1 commit: 68cf2f52beceb077a9f9dbf33127e16a11e4ed8f
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu Oct 14 18:20:02 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 29 21:46:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cf2f52
7
8 net-wireless/uhd: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/22578
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../uhd/files/uhd-4.0.0.0-boost-1.76.patch | 59 ----------------------
16 1 file changed, 59 deletions(-)
17
18 diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch b/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
19 deleted file mode 100644
20 index 123a01bca56..00000000000
21 --- a/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
22 +++ /dev/null
23 @@ -1,59 +0,0 @@
24 -From b05285b3853493436f71eb4192365b818005b0af Mon Sep 17 00:00:00 2001
25 -From: loqs <loqs@××××××××××××××××××××.com>
26 -Date: Tue, 25 May 2021 22:43:07 +0100
27 -Subject: [PATCH] Fix Boost 1.76.0 incompatibility
28 -
29 -Fixes EttusResearch/uhd/issues/437
30 ----
31 - host/lib/usrp/cores/rx_dsp_core_3000.cpp | 1 +
32 - host/lib/usrp/cores/rx_frontend_core_3000.cpp | 1 +
33 - host/lib/usrp/usrp2/usrp2_impl.cpp | 5 ++---
34 - 3 files changed, 4 insertions(+), 3 deletions(-)
35 -
36 -diff --git a/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
37 -index ff431fd41..53f3fee69 100644
38 ---- a/lib/usrp/cores/rx_dsp_core_3000.cpp
39 -+++ b/lib/usrp/cores/rx_dsp_core_3000.cpp
40 -@@ -14,6 +14,7 @@
41 - #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
42 - #include <boost/assign/list_of.hpp>
43 - #include <boost/math/special_functions/round.hpp>
44 -+#include <boost/math/special_functions/sign.hpp>
45 - #include <algorithm>
46 - #include <cmath>
47 - #include <functional>
48 -diff --git a/lib/usrp/cores/rx_frontend_core_3000.cpp b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
49 -index abbe64b13..d51fea2ca 100644
50 ---- a/lib/usrp/cores/rx_frontend_core_3000.cpp
51 -+++ b/lib/usrp/cores/rx_frontend_core_3000.cpp
52 -@@ -12,6 +12,7 @@
53 - #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
54 - #include <boost/assign/list_of.hpp>
55 - #include <boost/math/special_functions/round.hpp>
56 -+#include <boost/math/special_functions/sign.hpp>
57 - #include <functional>
58 -
59 - using namespace uhd;
60 -diff --git a/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
61 -index c2514ae02..28aa11083 100644
62 ---- a/lib/usrp/usrp2/usrp2_impl.cpp
63 -+++ b/lib/usrp/usrp2/usrp2_impl.cpp
64 -@@ -17,6 +17,8 @@
65 - #include <uhdlib/usrp/common/apply_corrections.hpp>
66 - #include <boost/asio.hpp> //used for htonl and ntohl
67 - #include <boost/asio/ip/address_v4.hpp>
68 -+#include <boost/math/special_functions/round.hpp>
69 -+#include <boost/math/special_functions/sign.hpp>
70 - #include <boost/format.hpp>
71 - #include <boost/thread.hpp>
72 - #include <functional>
73 -@@ -948,9 +950,6 @@ meta_range_t usrp2_impl::get_tx_dsp_freq_range(const std::string& mb)
74 - return meta_range_t(-dac_rate / 2, +dac_rate / 2, dsp_range_step);
75 - }
76 -
77 --#include <boost/math/special_functions/round.hpp>
78 --#include <boost/math/special_functions/sign.hpp>
79 --
80 - void usrp2_impl::update_clock_source(const std::string& mb, const std::string& source)
81 - {
82 - // NOTICE: U2_REG_MISC_CTRL_CLOCK is on the wb clock, and cannot be set from fifo_ctrl