From 1c967e69c72573cad21c5ad013821236f92d454a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 18 Dec 2023 11:28:40 -0600
Subject: [PATCH] uhd: update to 4.6.0.0

---
 common/shlibs                         |  2 +-
 srcpkgs/uhd/patches/boost-math.patch  | 31 ---------------------
 srcpkgs/uhd/patches/fix-include.patch | 39 ---------------------------
 srcpkgs/uhd/patches/std-complex.patch | 10 -------
 srcpkgs/uhd/template                  |  6 ++---
 5 files changed, 4 insertions(+), 84 deletions(-)
 delete mode 100644 srcpkgs/uhd/patches/boost-math.patch
 delete mode 100644 srcpkgs/uhd/patches/fix-include.patch
 delete mode 100644 srcpkgs/uhd/patches/std-complex.patch

diff --git a/common/shlibs b/common/shlibs
index 055fd0113d4..27763bf428b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3544,7 +3544,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.15 libpinyin-2.8.1_1
 libzhuyin.so.15 libzhuyin-2.8.1_1
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.6.0 uhd-4.6.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5.so.2.0.0git gnuradio-nrsc5-2.0.0_1
diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch
deleted file mode 100644
index 9ac6dae1df9..00000000000
--- a/srcpkgs/uhd/patches/boost-math.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/host/lib/usrp/usrp2/usrp2_impl.cpp
-+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
-@@ -18,6 +18,8 @@
- #include <boost/asio.hpp> //used for htonl and ntohl
- #include <boost/asio/ip/address_v4.hpp>
- #include <boost/format.hpp>
-+#include <boost/math/special_functions/round.hpp>
-+#include <boost/math/special_functions/sign.hpp>
- #include <boost/thread.hpp>
- #include <functional>
- 
---- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
-+++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
-@@ -12,6 +12,7 @@
- #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
- #include <boost/assign/list_of.hpp>
- #include <boost/math/special_functions/round.hpp>
-+#include <boost/math/special_functions/sign.hpp>
- #include <functional>
- 
- using namespace uhd;
---- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
-+++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
-@@ -14,6 +14,7 @@
- #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
- #include <boost/assign/list_of.hpp>
- #include <boost/math/special_functions/round.hpp>
-+#include <boost/math/special_functions/sign.hpp>
- #include <algorithm>
- #include <cmath>
- #include <functional>
diff --git a/srcpkgs/uhd/patches/fix-include.patch b/srcpkgs/uhd/patches/fix-include.patch
deleted file mode 100644
index 4a30a686490..00000000000
--- a/srcpkgs/uhd/patches/fix-include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: uhd-4.0.0.0/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.cpp
-===================================================================
---- uhd-4.0.0.0.orig/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.cpp
-+++ uhd-4.0.0.0/host/lib/usrp/dboard/e3xx/e3xx_radio_control_impl.cpp
-@@ -17,6 +17,7 @@
- #include <cmath>
- #include <cstdlib>
- #include <sstream>
-+#include <thread>
- 
- using namespace uhd;
- using namespace uhd::usrp;
-Index: uhd-4.0.0.0/host/lib/include/uhdlib/utils/rpc.hpp
-===================================================================
---- uhd-4.0.0.0.orig/host/lib/include/uhdlib/utils/rpc.hpp
-+++ uhd-4.0.0.0/host/lib/include/uhdlib/utils/rpc.hpp
-@@ -12,7 +12,10 @@
- #include <rpc/client.h>
- #include <rpc/rpc_error.h>
- #include <boost/format.hpp>
-+#include <chrono>
- #include <memory>
-+#include <string>
-+#include <thread>
- 
- namespace {
- 
-Index: uhd-4.0.0.0/host/lib/usrp/common/lmx2592.cpp
-===================================================================
---- uhd-4.0.0.0.orig/host/lib/usrp/common/lmx2592.cpp
-+++ uhd-4.0.0.0/host/lib/usrp/common/lmx2592.cpp
-@@ -7,6 +7,7 @@
- #include "lmx2592_regs.hpp"
- #include <uhdlib/usrp/common/lmx2592.hpp>
- #include <uhdlib/utils/narrow.hpp>
-+#include <array>
- #include <chrono>
- #include <iomanip>
- 
diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch
deleted file mode 100644
index c7573bf4ade..00000000000
--- a/srcpkgs/uhd/patches/std-complex.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/host/tests/tx_streamer_test.cpp
-+++ b/host/tests/tx_streamer_test.cpp
-@@ -7,6 +7,7 @@
- #include "../common/mock_link.hpp"
- #include <uhdlib/transport/tx_streamer_impl.hpp>
- #include <boost/test/unit_test.hpp>
-+#include <complex>
- #include <iostream>
- #include <memory>
- 
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 40f3875d0c0..6e41492d155 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
-revision=5
+version=4.6.0.0
+revision=1
 build_wrksrc=host
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=5e6eb05abb4a3973bef8837fb45a5147be04698229e22801369f728fcc6db38d
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in