From nobody Thu Oct 03 10:27:22 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK7Cb2xXcz5Y6XB; Thu, 03 Oct 2024 10:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK7CZ6SKFz4CZv; Thu, 3 Oct 2024 10:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3OKZkI7CZRieiPFpSHw9UoCimyFjy6S6LtMdjBOOkA=; b=MaB1lzZl2RlKj4TzwnPce1AvnEXZrtAiHPX0HlpescNuY0Pi3CByFITqR+F7nFAIit/otv zqSMh+z9eNpfdNaW2DzFMGhGEpa6Ym8+SNvZ2xcAe8rTEV/RW6ZtDXOZ7CDIk9/lHBXw+r EsQQps5c/Mgphj5N47u3W/V+bmGN2/5/OLQ9vOQr0POjmzgPI2lvUHTKHmczaVL8AVC/Kr U75VPcrEYTqUQlrfFxIyjq4waicLscG+AqlwGY6Bp3lfTBvH8b4QIdz6aDrNBdMjcvR0HD m57jqaO1J2fDGKG6KZq5DqMgMjn6fYgqPHkeEP/n6L2miyV7ruL3xJMJPjjBHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3OKZkI7CZRieiPFpSHw9UoCimyFjy6S6LtMdjBOOkA=; b=BwSNcPNu+9bHj7RKUpXb0ODzGmzeUIIhWKY2//bW07PtDqWnAoTM/vlBGxohHvRVAJ1SBG bxCLXkNtuPp6sjWeRq1L3S3BQvY8R9FJVmwqebGkgLjhTngcSyeCs1rkAiPNSRc+4+ybpw nky4PHiVRl8XAndN3dfw+FfjeDcN41nlSY36q0p4IzBvXNbQ3fgMe+i39zYmVpuHZAezPO hrvPQd8f72isDw2gMiUuhlAWeSdNyPBUrMLgFc+wyk2J6KZi01AUBbsgTaFUAMoF4Vyx/p /LmELUEnrNmz5EZJ4u/eYp5A0xJZNPID1xCM3i9i3suUH7AdcbdNrIOcj2POSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951242; a=rsa-sha256; cv=none; b=MSIb6zLS7PSGpFzEpLTNUOikpHBc0bwyfqIuvYwdE0w2E+f3WHmJFs6REOY499i64Fz5i4 hfa8vrXULWLWwaiNgCEo5UbiNIo4UBQGxXP6oDS6YtAFWizLEkHkY87ZheUw2p4aOPZcqW M5xhI6xs2ciPydv24MvEvTzXaZ9OwxooizL7+DLMxJm6ReI+hmUumqdpjyqj7ZK6j9G6Oq hV5h5NqwYNoiKMUtfKTphoVVnfu/Tdg5OQlpIL4rYLUCrgBA6QdeZ6Wk7RPjCWbcIk0yUe zBIfvAeCtuKUo5szCynxcgJ5DaJIbGSOWZzKuGAtQcQ2TmfkSiLMzkHcWnVlkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XK7CZ64lXzmjT; Thu, 3 Oct 2024 10:27:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493ARMKY041829; Thu, 3 Oct 2024 10:27:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARMP9041826; Thu, 3 Oct 2024 10:27:22 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:22 GMT Message-Id: <202410031027.493ARMP9041826@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 32ef1d3da473 - main - comms/uhd: unbreak build with boost-1.85 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32ef1d3da4730fed0763c0ecee35f28a5f360144 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=32ef1d3da4730fed0763c0ecee35f28a5f360144 commit 32ef1d3da4730fed0763c0ecee35f28a5f360144 Author: Dima Panov AuthorDate: 2024-10-02 23:23:55 +0000 Commit: Dima Panov CommitDate: 2024-10-03 10:24:52 +0000 comms/uhd: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- comms/uhd/Makefile | 4 ++- ...p__clock_octoclock_octoclock__image__loader.cpp | 11 +++++++ ...atch-host_lib_usrp_mpmd_mpmd__image__loader.cpp | 35 ++++++++++++++++++++++ ...atch-host_lib_usrp_x300_x300__image__loader.cpp | 13 ++++++++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index 55c5592138e3..d66529807ab6 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -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 diff --git a/comms/uhd/files/patch-host_lib_usrp__clock_octoclock_octoclock__image__loader.cpp b/comms/uhd/files/patch-host_lib_usrp__clock_octoclock_octoclock__image__loader.cpp new file mode 100644 index 000000000000..00a812518ac3 --- /dev/null +++ b/comms/uhd/files/patch-host_lib_usrp__clock_octoclock_octoclock__image__loader.cpp @@ -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") { diff --git a/comms/uhd/files/patch-host_lib_usrp_mpmd_mpmd__image__loader.cpp b/comms/uhd/files/patch-host_lib_usrp_mpmd_mpmd__image__loader.cpp new file mode 100644 index 000000000000..632806091c8e --- /dev/null +++ b/comms/uhd/files/patch-host_lib_usrp_mpmd_mpmd__image__loader.cpp @@ -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 + #include + #include +-#include + #include + #include + #include + #include + #include +-#include +-#include + #include + #include + +@@ -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); diff --git a/comms/uhd/files/patch-host_lib_usrp_x300_x300__image__loader.cpp b/comms/uhd/files/patch-host_lib_usrp_x300_x300__image__loader.cpp new file mode 100644 index 000000000000..1824c11eb4af --- /dev/null +++ b/comms/uhd/files/patch-host_lib_usrp_x300_x300__image__loader.cpp @@ -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);