sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

comms/uhd: unbreak build with boost-1.85

Browse source 
With hat:	office
Sponsored by:	Future Crew, LLC
This commit is contained in:
Dima Panov 2024-10-03 02:23:55 +03:00
parent 6e08df7a70
commit 32ef1d3da4
No known key found for this signature in database
GPG key ID: FB8BA09DD5398F29
4 changed files with 62 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
comms/uhd/Makefile
View file

@ -1,7 +1,7 @@
PORTNAME= uhd
DISTVERSIONPREFIX= v
DISTVERSION= 4.6.0.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= comms hamradio
DIST_SUBDIR= ${PORTNAME}
@ -53,10 +53,12 @@ OPTIONS_DEFINE= DOCS DOXYGEN
OPTIONS_DEFAULT= DOCS
OPTIONS_SUB= yes
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_CMAKE_ON= -DENABLE_DOXYGEN:STRING="ON"
DOXYGEN_CMAKE_OFF= -DENABLE_DOXYGEN:STRING="OFF" \
-DENABLE_MANUAL:STRING="OFF"
DOXYGEN_PORTDOCS= doxygen
do-install:
# install host component

11
comms/uhd/files/patch-host_lib_usrp__clock_octoclock_octoclock__image__loader.cpp Normal file
View file

@ -0,0 +1,11 @@
--- host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp.orig 2024-06-10 22:29:18 UTC
+++ host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp
@@ -95,7 +95,7 @@ static void octoclock_validate_firmware_image(octocloc
% session.image_filepath));
}
- std::string extension = fs::extension(session.image_filepath);
+ const std::string extension = fs::path(session.image_filepath).extension().string();
if (extension == ".bin") {
octoclock_read_bin(session);
} else if (extension == ".hex") {

35
comms/uhd/files/patch-host_lib_usrp_mpmd_mpmd__image__loader.cpp Normal file
View file

@ -0,0 +1,35 @@
--- host/lib/usrp/mpmd/mpmd_image_loader.cpp.orig 2024-06-10 22:29:18 UTC
+++ host/lib/usrp/mpmd/mpmd_image_loader.cpp
@@ -21,14 +21,11 @@
#include <boost/algorithm/string.hpp>
#include <boost/archive/iterators/binary_from_base64.hpp>
#include <boost/archive/iterators/transform_width.hpp>
-#include <boost/filesystem/convenience.hpp>
#include <boost/optional.hpp>
#include <boost/property_tree/xml_parser.hpp>
#include <cctype>
#include <fstream>
#include <iterator>
-#include <sstream>
-#include <streambuf>
#include <string>
#include <vector>
@@ -271,7 +268,7 @@ static uhd::usrp::component_files_t bin_dts_to_compone
// DTS component struct
// First, we need to determine the name
const std::string base_name =
- boost::filesystem::change_extension(fpga_path, "").string();
+ boost::filesystem::path(fpga_path).replace_extension("").string();
if (base_name == fpga_path) {
const std::string err_msg(
"Can't cut extension from FPGA filename... " + fpga_path);
@@ -340,7 +337,7 @@ static void mpmd_send_fpga_to_device(
UHD_LOG_TRACE("MPMD IMAGE LOADER", "FPGA path: " << fpga_path);
// If the fpga_path is a lvbitx file, parse it as such
- if (boost::filesystem::extension(fpga_path) == ".lvbitx") {
+ if (boost::filesystem::path(fpga_path).extension() == ".lvbitx") {
all_component_files = lvbitx_to_component_files(fpga_path, delay_reload);
} else {
all_component_files = bin_dts_to_component_files(fpga_path, delay_reload);

13
comms/uhd/files/patch-host_lib_usrp_x300_x300__image__loader.cpp Normal file
View file

@ -0,0 +1,13 @@
--- host/lib/usrp/x300/x300_image_loader.cpp.orig 2024-06-10 22:29:18 UTC
+++ host/lib/usrp/x300/x300_image_loader.cpp
@@ -138,8 +138,8 @@ static void x300_validate_image(x300_session_t& sessio
boost::format("Could not find image at path \"%s\".") % session.filepath));
}
- std::string extension = fs::extension(session.filepath);
- session.lvbitx = (extension == ".lvbitx");
+ const std::string extension = fs::path(session.filepath).extension().string();
+ session.lvbitx = (extension == ".lvbitx");
if (session.lvbitx) {
extract_from_lvbitx(session);