Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2024-04-26 23:27:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uhd" Fri Apr 26 23:27:33 2024 rev:40 rq:1170286 version:4.6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2023-11-15 21:12:34.653085654 +0100 +++ /work/SRC/openSUSE:Factory/.uhd.new.1880/uhd.changes 2024-04-26 23:27:44.337974598 +0200 @@ -1,0 +2,6 @@ +Fri Apr 26 09:39:29 UTC 2024 - Ana Guerrero <ana.guerr...@suse.com> + +- Fix build with boost 1.85, add patches fix-boost1.85-one.patch + and fix-boost1.85-two.patch + +------------------------------------------------------------------- New: ---- fix-boost1.85-one.patch fix-boost1.85-two.patch BETA DEBUG BEGIN: New: - Fix build with boost 1.85, add patches fix-boost1.85-one.patch and fix-boost1.85-two.patch New:- Fix build with boost 1.85, add patches fix-boost1.85-one.patch and fix-boost1.85-two.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.utgqxP/_old 2024-04-26 23:27:45.642022267 +0200 +++ /var/tmp/diff_new_pack.utgqxP/_new 2024-04-26 23:27:45.646022413 +0200 @@ -1,7 +1,7 @@ # # spec file for package uhd # -# Copyright (c) 2021-2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define libname libuhd4_6_0 Name: uhd Version: 4.6.0.0 @@ -25,6 +26,10 @@ URL: https://files.ettus.com/manual/ Source0: https://github.com/EttusResearch/uhd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://github.com/EttusResearch/uhd/releases/download/v%{version}/uhd-images_%{version}.tar.xz +# PATCH-FIX-UPSTREAM fix-boost1.85-one.patch -- https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755794649ba0 +Patch0: fix-boost1.85-one.patch +# PATCH-FIX-UPSTREAM fix-boost1.85-two.patch -- https://github.com/EttusResearch/uhd/commit/c4863b9b9f8b639260f7797157e8ac4dd81fef93 +Patch1: fix-boost1.85-two.patch BuildRequires: cmake >= 2.6 BuildRequires: docutils BuildRequires: doxygen @@ -34,13 +39,13 @@ BuildRequires: memory-constraints BuildRequires: orc BuildRequires: pkgconfig -BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(udev) -BuildRequires: python3-devel BuildRequires: python3-Mako >= 0.4.2 +BuildRequires: python3-devel BuildRequires: python3-numpy-devel BuildRequires: python3-setuptools +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(udev) Requires: udev BuildRequires: libboost_filesystem-devel BuildRequires: libboost_program_options-devel ++++++ fix-boost1.85-one.patch ++++++ >From ea586168c596d13d05d145832519755794649ba0 Mon Sep 17 00:00:00 2001 From: Martin Braun <martin.br...@ettus.com> Date: Thu, 28 Mar 2024 17:28:57 +0100 Subject: [PATCH] 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/host/lib/usrp/mpmd/mpmd_image_loader.cpp +++ b/host/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/host/lib/usrp/x300/x300_image_loader.cpp +++ b/host/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/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp +++ b/host/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.0 ++++++ fix-boost1.85-two.patch ++++++ >From c4863b9b9f8b639260f7797157e8ac4dd81fef93 Mon Sep 17 00:00:00 2001 From: Joerg Hofrichter <joerg.hofrich...@ni.com> Date: Wed, 17 Apr 2024 13:59:19 +0200 Subject: [PATCH] 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/host/lib/usrp/mpmd/mpmd_image_loader.cpp +++ b/host/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.0
