diff --git a/common/shlibs b/common/shlibs index ba1fcf380c6..ef308994719 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3688,7 +3688,7 @@ libbinpac.so.0 zeek-3.2.4_2 libllhttp.so.9.3 llhttp-9.3.0_1 libpinyin.so.15 libpinyin-2.8.1_1 libzhuyin.so.15 libzhuyin-2.8.1_1 -libuhd.so.4.6.0 uhd-4.6.0.0_1 +libuhd.so.4.8.0 uhd-4.8.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-1.88.patch b/srcpkgs/uhd/patches/boost-1.88.patch new file mode 100644 index 00000000000..9a109666055 --- /dev/null +++ b/srcpkgs/uhd/patches/boost-1.88.patch @@ -0,0 +1,41 @@ +--- a/host/examples/rx_samples_to_file.cpp ++++ b/host/examples/rx_samples_to_file.cpp +@@ -15,7 +15,9 @@ + #include + #ifdef __linux__ + # include +-# include ++# include ++# include ++# include + #endif + #include + #include +@@ -29,6 +31,7 @@ + using namespace std::chrono_literals; + + namespace po = boost::program_options; ++namespace bp = boost::process::v1; + + std::mutex recv_mutex; + +@@ -59,7 +62,7 @@ double disk_rate_check(const size_t samp + { + std::string err_msg = + "Disk benchmark tool 'dd' did not run or returned an unexpected output format"; +- boost::process::ipstream pipe_stream; ++ bp::ipstream pipe_stream; + boost::filesystem::path temp_file = + boost::filesystem::path(file).parent_path() / boost::filesystem::unique_path(); + +@@ -69,8 +72,8 @@ double disk_rate_check(const size_t samp + + " count=100"; + + try { +- boost::process::child c( +- disk_check_proc_str, boost::process::std_err > pipe_stream); ++ bp::child c( ++ disk_check_proc_str, bp::std_err > pipe_stream); + std::this_thread::sleep_for(std::chrono::seconds(1)); + if (c.running()) { + c.terminate(); diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index 6e41492d155..0272a83c2e5 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -1,19 +1,21 @@ # Template file for 'uhd' pkgname=uhd -version=4.6.0.0 +version=4.8.0.0 revision=1 build_wrksrc=host build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" hostmakedepends="doxygen pkg-config python3-Mako python3-numpy python3-requests" -makedepends="libusb-devel boost-devel" +makedepends="libusb-devel boost-devel-minimal libboost_chrono + libboost_program_options libboost_filesystem libboost_serialization + libboost_thread libboost_date_time libboost_unit_test_framework" short_desc="Ettus USRP Hardware driver library" maintainer="Remi Pommarel " 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=5e6eb05abb4a3973bef8837fb45a5147be04698229e22801369f728fcc6db38d +checksum=a2159491949477dca67f5a9b05f5a80d8c2b32e91b95dd7fac8ddd3893e36d09 python_version=3 case "${XBPS_TARGET_MACHINE}" in