commit: 3eb8a2c0b0c68c812b1941e94e4eddbdf67cc0ce Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> AuthorDate: Tue Feb 25 12:28:38 2025 +0000 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> CommitDate: Tue Feb 25 12:29:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb8a2c0
net-wireless/soapyuhd: Adapt to >=uhd-4.8 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> .../soapyuhd/files/soapyuhd-0.4.1-uhd-4.8.patch | 43 ++++++++++++++++++++++ ...apyuhd-9999.ebuild => soapyuhd-0.4.1-r1.ebuild} | 8 ++-- net-wireless/soapyuhd/soapyuhd-9999.ebuild | 8 ++-- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/net-wireless/soapyuhd/files/soapyuhd-0.4.1-uhd-4.8.patch b/net-wireless/soapyuhd/files/soapyuhd-0.4.1-uhd-4.8.patch new file mode 100644 index 000000000000..94356817204b --- /dev/null +++ b/net-wireless/soapyuhd/files/soapyuhd-0.4.1-uhd-4.8.patch @@ -0,0 +1,43 @@ +From 6eeee4fd3217166199068bbe05c555c2bccb2a7b Mon Sep 17 00:00:00 2001 +From: Ryan Volz <[email protected]> +Date: Fri, 7 Feb 2025 11:09:35 -0500 +Subject: [PATCH] Define post_input_action/post_output_action for UHD 4.8+ + +--- + UHDSoapyDevice.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/UHDSoapyDevice.cpp b/UHDSoapyDevice.cpp +index 3ce66f3..88641c5 100644 +--- a/UHDSoapyDevice.cpp ++++ b/UHDSoapyDevice.cpp +@@ -707,6 +707,14 @@ class UHDSoapyRxStream : public uhd::rx_streamer + if (ret != 0) throw std::runtime_error(str(boost::format("UHDSoapyRxStream::issue_stream_cmd() = %d") % ret)); + } + ++ #if UHD_VERSION >= 4080000 ++ void post_input_action( ++ const std::shared_ptr<uhd::rfnoc::action_info>&, const size_t) override ++ { ++ throw uhd::not_implemented_error("post_input_action is not implemented here!"); ++ } ++ #endif ++ + private: + SoapySDR::Device *_device; + SoapySDR::Stream *_stream; +@@ -851,6 +859,14 @@ class UHDSoapyTxStream : public uhd::tx_streamer + return true; + } + ++ #if UHD_VERSION >= 4080000 ++ void post_output_action( ++ const std::shared_ptr<uhd::rfnoc::action_info>&, const size_t) override ++ { ++ throw uhd::not_implemented_error("post_output_action is not implemented here!"); ++ } ++ #endif ++ + private: + bool _active; + SoapySDR::Device *_device; diff --git a/net-wireless/soapyuhd/soapyuhd-9999.ebuild b/net-wireless/soapyuhd/soapyuhd-0.4.1-r1.ebuild similarity index 78% copy from net-wireless/soapyuhd/soapyuhd-9999.ebuild copy to net-wireless/soapyuhd/soapyuhd-0.4.1-r1.ebuild index dba31a72d677..32a1a57cf8c5 100644 --- a/net-wireless/soapyuhd/soapyuhd-9999.ebuild +++ b/net-wireless/soapyuhd/soapyuhd-0.4.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,9 +12,11 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git"; inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyUHD-soapy-uhd-"${PV}" + # picked up from git repo + PATCHES=( "${FILESDIR}"/${P}-uhd-4.8.patch ) fi LICENSE="MIT" diff --git a/net-wireless/soapyuhd/soapyuhd-9999.ebuild b/net-wireless/soapyuhd/soapyuhd-9999.ebuild index dba31a72d677..32a1a57cf8c5 100644 --- a/net-wireless/soapyuhd/soapyuhd-9999.ebuild +++ b/net-wireless/soapyuhd/soapyuhd-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,9 +12,11 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git"; inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyUHD-soapy-uhd-"${PV}" + # picked up from git repo + PATCHES=( "${FILESDIR}"/${P}-uhd-4.8.patch ) fi LICENSE="MIT"
