gentoo auto-resync : 29:05:2024 - 00:07:15

4 files changed, 119 insertions, 1 deletions

diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 0c356b7feb0b..90cf65259780 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,7 +1,9 @@
+AUX uhd-4.6.0.0-boost-1.85-1.patch 3665 BLAKE2B 1fe78699d1e3c6e2359733ca8ca46ed11cc159f7975a339b7ffc7a3bf91f0b91d031fcaa0c523ae3313c806c8398583ef7b1ec73c41df33bd0fa56c158fd16bf SHA512 db66bfc5af671546d8d7ad2fe0c2d1515846d466d564864e2f9ca9bc4140094944ce997efd03d667d41e5a6e059041b727ff2fc1def7f38fe756a614c346cf29
+AUX uhd-4.6.0.0-boost-1.85-2.patch 1155 BLAKE2B 84002da36d755899d3921a68d5748f80cf12a65f289001843bfdc04d6e69e3a3003c75099564d13cc8e8b6e7f8069c677f033d5fdc74469cb2d9de4c9129430c SHA512 0705b4102b3e73a2dd046f2b00d1d8f08f4324c7c9a5c41a9ce1a998c7439b8532cc77d97eeea23b191e5a0bb6c831e9a0d68659bb03f158c2fb8913c4bbaf8e
 DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a
 DIST EttusResearch-UHD-4.6.0.0.tar.gz 41235519 BLAKE2B 4a9c9d0064bf52edd4a4a93ee8602eaa61029b5350728431e4e2e17d9f4a06de21c2598a6ffde0832ecfd5a499344d190ba113f1c5d96ffea0a029186f95de87 SHA512 de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30
 DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463
 DIST uhd-images_4.6.0.0.tar.xz 180745328 BLAKE2B f698c68c66e706146cd2163abca10bc2d3660827e2425f395b9096b1ccecdadaf563730912e930e29b6f286dd77a83dc2ab0280e0d55ceb550496de03c208917 SHA512 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3
 EBUILD uhd-4.4.0.0.ebuild 3707 BLAKE2B 0bef82e613b6f7fdfc89487382d5358db8787d53c308431697170c204deb57986e00578bd6a3c648aa57df9449af6e26a362d812c033d334d32273bdba8f2209 SHA512 e55d9be83e3262c094a3087ac77b5db2afff622be05df27a728d4e95affcc3d4a60e25dbf39de8a523d5f4b98e4ac4335e1d841d3744075ef4df82e5da3b500f
-EBUILD uhd-4.6.0.0.ebuild 3679 BLAKE2B aaf5d858bd06f803d148353a71bdcfa508f16d1d571f1b05d39add1840b3f1acabb4e88f41b05f2020deedff4cc9cb97e90004d69ec78abf22e3f2376736d591 SHA512 a8544e04c5b59b6cb93fbff0508a30e51d211203b558dbc6ef4e3ee2ad1b1c0d9e258ac57e434ddef1256274e9a9a73460fcac499eedf8b269e7410f15af7137
+EBUILD uhd-4.6.0.0.ebuild 3784 BLAKE2B 74494031bef5c65e5487f9b03a37e68d2c1f7854bc207f2c41999e75067369fbd2b34a9ea719c476ccb8f95d5e6ebd6f047c2560413be7f5c4ebecdd2c6bfced SHA512 55d4a8dfd5883db9841dc251a3b86b5bc70505f5cb0e55377b1e9825f5384f2651e02608a0bd5db98a1582cfbaea71a99a31b02aa37a90bf0354dfcca42cf6fe
 MISC metadata.xml 1112 BLAKE2B 7bf2e25d7618581200731789b4c5ee05c6cd6b33c21a7912b3904ffd53e6948d4d2e36bb071d3f966febb5b3da1523c2316558f66d4297341264d534e08d122f SHA512 ac48857213ada598edec618d0c39fc8faaa2b405444b37958e47dc23068fdd61d80bffb8033b20428f2fa63caf8ca322eb4bb765c59389d4a070fee260dee66d
diff --git a/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-1.patch b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-1.patch
new file mode 100644
index 000000000000..5861b93b6676
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-1.patch
@@ -0,0 +1,80 @@
+https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755794649ba0
+https://bugs.gentoo.org/932239#c10
+
+From ea586168c596d13d05d145832519755794649ba0 Mon Sep 17 00:00:00 2001
+From: Martin Braun <martin.braun@ettus.com>
+Date: Thu, 28 Mar 2024 17:28:57 +0100
+Subject: [PATCH 08/30] lib: Replace deprecated boost::filesystem usage
+
+Recent versions of Boost were throwing compiler warnings due to usage of
+deprecated functions. Our minimum version of Boost (1.65) already
+provides the replacements, so this commit simply updates these
+deprecated use cases.
+---
+ host/lib/usrp/mpmd/mpmd_image_loader.cpp                 | 6 ++----
+ host/lib/usrp/x300/x300_image_loader.cpp                 | 4 ++--
+ host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp | 2 +-
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp
+index 31b6387ab..ba0f45fad 100644
+--- a/lib/usrp/mpmd/mpmd_image_loader.cpp
++++ b/lib/usrp/mpmd/mpmd_image_loader.cpp
+@@ -27,8 +27,6 @@
+ #include <cctype>
+ #include <fstream>
+ #include <iterator>
+-#include <sstream>
+-#include <streambuf>
+ #include <string>
+ #include <vector>
+ 
+@@ -271,7 +269,7 @@ static uhd::usrp::component_files_t bin_dts_to_component_files(
+     // 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 +338,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);
+diff --git a/host/lib/usrp/x300/x300_image_loader.cpp b/host/lib/usrp/x300/x300_image_loader.cpp
+index d7a64d4d0..a84dba420 100644
+--- a/lib/usrp/x300/x300_image_loader.cpp
++++ b/lib/usrp/x300/x300_image_loader.cpp
+@@ -138,8 +138,8 @@ static void x300_validate_image(x300_session_t& session)
+             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);
+diff --git a/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp b/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp
+index 930c5d758..4c39790c7 100644
+--- a/lib/usrp_clock/octoclock/octoclock_image_loader.cpp
++++ b/lib/usrp_clock/octoclock/octoclock_image_loader.cpp
+@@ -95,7 +95,7 @@ static void octoclock_validate_firmware_image(octoclock_session_t& session)
+                                      % 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") {
+-- 
+2.44.1
+
diff --git a/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-2.patch b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-2.patch
new file mode 100644
index 000000000000..fab224782ccc
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-2.patch
@@ -0,0 +1,31 @@
+https://github.com/EttusResearch/uhd/commit/c4863b9b9f8b639260f7797157e8ac4dd81fef93
+https://bugs.gentoo.org/932239#c11
+
+From c4863b9b9f8b639260f7797157e8ac4dd81fef93 Mon Sep 17 00:00:00 2001
+From: Joerg Hofrichter <joerg.hofrichter@ni.com>
+Date: Wed, 17 Apr 2024 13:59:19 +0200
+Subject: [PATCH 26/30] fix compilation with boost 1.85.0
+
+The header boost/filesystem/convenience.hpp was removed with boost 1.85.0
+
+The deprecated extension-related functions were already replaced with
+commit ea586168c596d13d05d145832519755794649ba0
+---
+ host/lib/usrp/mpmd/mpmd_image_loader.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp
+index ba0f45fad..9824bbf4d 100644
+--- a/lib/usrp/mpmd/mpmd_image_loader.cpp
++++ b/lib/usrp/mpmd/mpmd_image_loader.cpp
+@@ -21,7 +21,6 @@
+ #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>
+-- 
+2.44.1
+
diff --git a/net-wireless/uhd/uhd-4.6.0.0.ebuild b/net-wireless/uhd/uhd-4.6.0.0.ebuild
index 9872c06071f8..bfe690bb44c8 100644
--- a/net-wireless/uhd/uhd-4.6.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.6.0.0.ebuild
@@ -50,6 +50,11 @@ BDEPEND="
 
 S="${WORKDIR}/${P}/host"
 
+PATCHES=(
+	"${FILESDIR}"/uhd-4.6.0.0-boost-1.85-1.patch
+	"${FILESDIR}"/uhd-4.6.0.0-boost-1.85-2.patch
+)
+
 src_unpack() {
 	default
 	mv "uhd-images_${PV}" images || die