Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171404775965590"
MIME-Version: 1.0
Date: Thu, 25 Apr 2024 12:22:39 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/ham/uhd
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20240425122239.E71FBFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171404775965590
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Thu Apr 25 12:22:39 UTC 2024

Modified Files:
	pkgsrc/ham/uhd: distinfo
Added Files:
	pkgsrc/ham/uhd/patches:
	    patch-lib_usrp__clock_octoclock_octoclock__image__loader.cpp
	    patch-lib_usrp_mpmd_mpmd__image__loader.cpp
	    patch-lib_usrp_x300_x300__image__loader.cpp

Log Message:
uhd: fix boost fallout. From upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/ham/uhd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/ham/uhd/patches/patch-lib_usrp__clock_octoclock_octoclock__image__loader.cpp \
    pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__image__loader.cpp \
    pkgsrc/ham/uhd/patches/patch-lib_usrp_x300_x300__image__loader.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171404775965590
Content-Disposition: inline
Content-Length: 6172
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/ham/uhd/distinfo
diff -u pkgsrc/ham/uhd/distinfo:1.38 pkgsrc/ham/uhd/distinfo:1.39
--- pkgsrc/ham/uhd/distinfo:1.38	Mon Dec 18 22:44:41 2023
+++ pkgsrc/ham/uhd/distinfo	Thu Apr 25 12:22:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2023/12/18 22:44:41 mef Exp $
+$NetBSD: distinfo,v 1.39 2024/04/25 12:22:39 tnn Exp $
 
 BLAKE2s (uhd-4.6.0.0.tar.gz) = 190a494d8214eebc93092af93953dbcb002cd1f8f6786f28673a19ee360a9c93
 SHA512 (uhd-4.6.0.0.tar.gz) = de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30
@@ -9,7 +9,10 @@ SHA1 (patch-examples_getopt_getopt.h) = 
 SHA1 (patch-examples_rfnoc-example_cmake_Modules_run__testbench.sh.in) = f3c5c350abc82e0821eff45f00f4d1a0a1c7472b
 SHA1 (patch-lib_rfnoc_vector__iir__block__control.cpp) = d0bc32f888a6cfc30f1eb57d7f2d71bb86cdc284
 SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 5117c7593c4e92ed6bfb86388cc366c41a1dead7
+SHA1 (patch-lib_usrp__clock_octoclock_octoclock__image__loader.cpp) = fe43841f07d0a04bc8bc6ae72338799a1e1c4652
 SHA1 (patch-lib_usrp_common_lmx2592.cpp) = 2828dcf989f1fc43c70e10b8de1e34485066842d
+SHA1 (patch-lib_usrp_mpmd_mpmd__image__loader.cpp) = 9e786317c4b60ab6fc9bd529db60c8da65199b0c
 SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.cpp) = a471808217b56d2175d33c5ca5e4bfc3f8f9f995
 SHA1 (patch-lib_usrp_mpmd_mpmd__link__if__ctrl__udp.hpp) = 3106d28c4ddc38fd304eb94de5773ff56fed0fd8
+SHA1 (patch-lib_usrp_x300_x300__image__loader.cpp) = 8eb279e3e65ed44c16d5410d62663f781644a1fe
 SHA1 (patch-tests_rfnoc__block__tests_vector__iir__block__test.cpp) = 5d9594ce208acd8668589b117dd58d6b1a09de3a

Added files:

Index: pkgsrc/ham/uhd/patches/patch-lib_usrp__clock_octoclock_octoclock__image__loader.cpp
diff -u /dev/null pkgsrc/ham/uhd/patches/patch-lib_usrp__clock_octoclock_octoclock__image__loader.cpp:1.1
--- /dev/null	Thu Apr 25 12:22:39 2024
+++ pkgsrc/ham/uhd/patches/patch-lib_usrp__clock_octoclock_octoclock__image__loader.cpp	Thu Apr 25 12:22:39 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_usrp__clock_octoclock_octoclock__image__loader.cpp,v 1.1 2024/04/25 12:22:39 tnn Exp $
+
+Fix boost fallout
+https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755794649ba0
+
+--- lib/usrp_clock/octoclock/octoclock_image_loader.cpp.orig	2023-11-13 15:22:00.000000000 +0000
++++ lib/usrp_clock/octoclock/octoclock_image_loader.cpp
+@@ -95,7 +95,7 @@ static void octoclock_validate_firmware_
+                                      % 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") {
Index: pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__image__loader.cpp
diff -u /dev/null pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__image__loader.cpp:1.1
--- /dev/null	Thu Apr 25 12:22:39 2024
+++ pkgsrc/ham/uhd/patches/patch-lib_usrp_mpmd_mpmd__image__loader.cpp	Thu Apr 25 12:22:39 2024
@@ -0,0 +1,41 @@
+$NetBSD: patch-lib_usrp_mpmd_mpmd__image__loader.cpp,v 1.1 2024/04/25 12:22:39 tnn Exp $
+
+Fix boost fallout
+https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755794649ba0
+https://github.com/EttusResearch/uhd/commit/c4863b9b9f8b639260f7797157e8ac4dd81f
+
+--- lib/usrp/mpmd/mpmd_image_loader.cpp.orig	2023-11-13 15:22:00.000000000 +0000
++++ 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 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);
Index: pkgsrc/ham/uhd/patches/patch-lib_usrp_x300_x300__image__loader.cpp
diff -u /dev/null pkgsrc/ham/uhd/patches/patch-lib_usrp_x300_x300__image__loader.cpp:1.1
--- /dev/null	Thu Apr 25 12:22:39 2024
+++ pkgsrc/ham/uhd/patches/patch-lib_usrp_x300_x300__image__loader.cpp	Thu Apr 25 12:22:39 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_usrp_x300_x300__image__loader.cpp,v 1.1 2024/04/25 12:22:39 tnn Exp $
+
+Fix boost fallout
+https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755794649ba0
+
+--- lib/usrp/x300/x300_image_loader.cpp.orig	2023-11-13 15:22:00.000000000 +0000
++++ lib/usrp/x300/x300_image_loader.cpp
+@@ -138,8 +138,8 @@ static void x300_validate_image(x300_ses
+             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);


--_----------=_171404775965590--