From nobody Wed Apr 02 18:19:59 2025 X-Original-To: dev-commits-ports-all@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 4ZSY7N2rXnz5rPFs; Wed, 02 Apr 2025 18:20:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSY7N1wBrz462S; Wed, 02 Apr 2025 18:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743618000; 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=6sCcqsvC8o3ta7ZDqG8Jht8kbnwDQcetlx5477wmneI=; b=UzBBcMR7LmMiIyYfYnjE1wto8NkOG1KubeReUeVu1c0ACdjJ0rkvM+TyyN6xNCNT8WRYYS kxCJNhsg9qqrRbR2kitcLJppD1ujrdQqxVJbKhQZpasyWwEX5247mXOdERjKeWVBDzSJqL y84sgndX4j0mSNKAvUoj0pYPqMP++spWfd1W76NmrcnXaFm000gPSYaA+P4WzT7JvITbb9 FeFLMayYYq//ENpPrLDOxWXDkT1quiv99Oxdlw9lUj48RrKCi2lKyAwQNc3RK/2Q/y4VCj 2rCdKQCxvmFNZvN9bgtDMQYsnwV/8wtIsUYPbUmlP0RUI940QVnf2l0fV5YPNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743618000; a=rsa-sha256; cv=none; b=he6rch1qM1KdAGpC6Zzu4J5cksiEpqEhH/mnFO0SfsQmfLUumDQxIAnjl4Z1yuQqeYRNub FnXi8C/JBlVEDB5PvEssEwNdtKhAPIHL/ucL+kEg7IszGBqtxXfMupmqcElFw226EaKARj QyaJNP9wr5o4ZAungbwYlffOnIm8qDIShoTC5aozTsmXbOBg2OiBAL2vfWuO9D3+0W1JeO nkS6JDB8F/UeKnh0qkzcwvZBmomn16NaSbAUHKaKmesmjbBwCcZku04bEA9MWw7BPQXNTX 46DKqFU/1H8wQC2mNGUnJ0TXhA9E29TBWAyk3ILgjg4r8u1fzhqW/Fxcqza19w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743618000; 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=6sCcqsvC8o3ta7ZDqG8Jht8kbnwDQcetlx5477wmneI=; b=O1ZcJ9yBsnfspLtfwhfqf9kLKKfMaAjL6iVaWunergAVrTlez1SBhooSiIJkj1UDvOawGt RtbeOJPsuzOdiZsVX7oy9EsJ2B99+o1j5vszlTu8m8DihIiAfmUFiuQGmJJcDFQkUw11gm 0vPBHkEMoVp72RnXvOcrSXF9DuJPr3wHS2w6BRfW2cvZab62xmeY9RAFyEC+S0T8cT+lv+ vlAiguZyfCxBDj1RYws5UB0y0pLKv8aUKlIONYrhW5pZ7JceB2cs2/zBddcBZuuwv8e0hN Rpxz+RabslodWroM5+JYLM+OmKXmZPf/+/1vpqIjZZP1bOrKQcpLiXuQA+IThw== 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 4ZSY7N0mP7zBkt; Wed, 02 Apr 2025 18:20:00 +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 532IJxsC000368; Wed, 2 Apr 2025 18:19:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532IJxrd000365; Wed, 2 Apr 2025 18:19:59 GMT (envelope-from git) Date: Wed, 2 Apr 2025 18:19:59 GMT Message-Id: <202504021819.532IJxrd000365@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Lev A. Serebryakov" Subject: git: e090c46bafec - main - devel/msp430-debug-stack: Fix build with latest Boost List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lev X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e090c46bafecd7ad5478c08935ce93bd4c8bac1a Auto-Submitted: auto-generated The branch main has been updated by lev: URL: https://cgit.FreeBSD.org/ports/commit/?id=e090c46bafecd7ad5478c08935ce93bd4c8bac1a commit e090c46bafecd7ad5478c08935ce93bd4c8bac1a Author: Lev A. Serebryakov AuthorDate: 2025-04-02 18:18:30 +0000 Commit: Lev A. Serebryakov CommitDate: 2025-04-02 18:18:30 +0000 devel/msp430-debug-stack: Fix build with latest Boost Adopt sources to new boost::asio API. PR: 284822 Reported by: ice@extreme.hu --- devel/msp430-debug-stack/Makefile | 4 +- ...ch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp | 55 +++++++++++++++++++++- ...atch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.h | 20 ++++++++ ...erfaces_MSPBSL__PhysicalInterfaceSerialUART.cpp | 11 +++++ ...nterfaces_MSPBSL__PhysicalInterfaceSerialUART.h | 10 ++++ 5 files changed, 96 insertions(+), 4 deletions(-) diff --git a/devel/msp430-debug-stack/Makefile b/devel/msp430-debug-stack/Makefile index 51c02b9dd83d..77b05bcbcc86 100644 --- a/devel/msp430-debug-stack/Makefile +++ b/devel/msp430-debug-stack/Makefile @@ -1,6 +1,6 @@ PORTNAME= msp430-debug-stack PORTVERSION= 3.15.1.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel MASTER_SITES= https://dr-download.ti.com/software-development/driver-or-library/MD-4vnqcP1Wk4/${PORTVERSION}/ \ LOCAL/lev:doc1 \ @@ -16,8 +16,6 @@ WWW= http://www.ti.com/tool/mspds LICENSE= BSD3CLAUSE -BROKEN= fails to build with Boost>=1.87 - LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libhidapi.so:comms/hidapi diff --git a/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp b/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp index e65c70898d70..3bb02c53d7a1 100644 --- a/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp +++ b/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp @@ -1,5 +1,23 @@ ---- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig 2020-02-14 09:38:32 UTC +--- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig 2025-02-14 17:38:09 UTC +++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp +@@ -42,7 +42,7 @@ + + #include + #include +-#include ++#include + + #if defined(_WIN32) || defined(_WIN64) + +@@ -181,7 +181,7 @@ void UsbCdcIoChannel::createCdcPortList(const uint16_t + + for (;;) + { +- io_service_t device = IOIteratorNext(iterator); ++ io_context_t device = IOIteratorNext(iterator); + if (device == 0) + { + if (!IOIteratorIsValid(iterator)) @@ -310,6 +310,22 @@ void UsbCdcIoChannel::createCdcPortList(const uint16_t } #else @@ -31,3 +49,38 @@ const string filename = it->path().filename().string(); const string portPath = string("/dev/") + filename; +@@ -376,7 +393,7 @@ bool UsbCdcIoChannel::openPort() + + bool UsbCdcIoChannel::openPort() + { +- ioService = new boost::asio::io_service; ++ ioService = new boost::asio::io_context; + port = new boost::asio::serial_port(*ioService); + timer = new boost::asio::deadline_timer(*ioService); + +@@ -542,7 +559,7 @@ size_t UsbCdcIoChannel::read(HalResponse& resp) + + boost::system::error_code ec; + +- while (ioService->run_one(ec)) ++ while (ioService->run_one()) + { + if (readEvent) + { +@@ -577,13 +594,13 @@ size_t UsbCdcIoChannel::read(HalResponse& resp) + + if (ioService->stopped()) + { +- ioService->reset(); ++ ioService->restart(); + } + } + + //Let cancelled tasks finish +- ioService->run(ec); +- ioService->reset(); ++ ioService->run(); ++ ioService->restart(); + + + if (actSize == expSize) diff --git a/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.h b/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.h new file mode 100644 index 000000000000..7d5a7f5dfe50 --- /dev/null +++ b/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.h @@ -0,0 +1,20 @@ +--- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h.orig 2025-04-02 18:10:46 UTC ++++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h +@@ -45,7 +45,7 @@ + + #include + #include +-#include ++#include + + namespace TI + { +@@ -74,7 +74,7 @@ namespace TI + + private: + std::vector inputBuffer; +- boost::asio::io_service* ioService; ++ boost::asio::io_context* ioService; + boost::asio::serial_port* port; + boost::asio::deadline_timer* timer; + ComState comState; diff --git a/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceSerialUART.cpp b/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceSerialUART.cpp new file mode 100644 index 000000000000..8e2381a91f25 --- /dev/null +++ b/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceSerialUART.cpp @@ -0,0 +1,11 @@ +--- ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.cpp.orig 2025-04-02 18:13:20 UTC ++++ ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.cpp +@@ -129,7 +129,7 @@ MSPBSL_PhysicalInterfaceSerialUART::MSPBSL_PhysicalInt + + + //TODO: Catch exception forunknown ports +- io_service io; ++ io_context io; + port = new serial_port( io, PORT ); + port->set_option( serial_port_base::character_size( 8 ) ); + port->set_option( serial_port_base::flow_control( serial_port_base::flow_control::none ) ); diff --git a/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceSerialUART.h b/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceSerialUART.h new file mode 100644 index 000000000000..898f1e9cf840 --- /dev/null +++ b/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceSerialUART.h @@ -0,0 +1,10 @@ +--- ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.h.orig 2025-04-02 18:10:22 UTC ++++ ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.h +@@ -72,6 +72,6 @@ class MSPBSL_PhysicalInterfaceSerialUART : public MSPB + virtual std::string getErrorInformation( uint16_t err ); + + private: +- boost::asio::io_service io; ++ boost::asio::io_context io; + boost::asio::serial_port* port; + };