commit: d508606e0c28379c3afb248d37c558d6a954e55a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Aug 18 18:06:27 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Aug 19 03:57:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d508606e
net-wireless/gnuradio: drop 3.10.11.0 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-wireless/gnuradio/Manifest | 1 - net-wireless/gnuradio/files/7570.patch | 34 --- .../files/gnuradio-3.10.11.0-boost-1.87.patch | 151 ------------ net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild | 252 --------------------- 4 files changed, 438 deletions(-) diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 3bd6eee3df92..52ad6646b96c 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,2 +1 @@ -DIST gnuradio-3.10.11.0.tar.gz 4659646 BLAKE2B 21d523030e578ac335dc1497da27a957026206b36323473d5e96d9bc3832a06765d26684c46c03017e23c0bc6302429c366befac40113f9987840d5c22f978af SHA512 faf47956924832b04c66469ba3bdf174876d25c41e0f1c1dde3755596d232e2d18f5dab7aa848463f2d23ec8bcda0283ee8ede34fd57b079fe3cdb62c6470a82 DIST gnuradio-3.10.12.0.tar.gz 4978802 BLAKE2B 9dd2a0b410e9f42b1f1447242b13223bb7e9b11f6343496e77d7681de4ecfa514e3838e21db5fb0ce45b5589c136902f13a1e9efb42bc206fc8ee7fbf5a8e0a3 SHA512 6d94d5f755a12d79ea38b84ac869dbce86b66813ac40f7204afb24d6f70f867a258e9efde0cc24fcb1ab814129da6b941970b0c736870f99139ee65a7a8effa7 diff --git a/net-wireless/gnuradio/files/7570.patch b/net-wireless/gnuradio/files/7570.patch deleted file mode 100644 index 1adefd1674bb..000000000000 --- a/net-wireless/gnuradio/files/7570.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dc208e8c91a772ea3da462efd16d912cef44316c Mon Sep 17 00:00:00 2001 -From: Clayton Smith <[email protected]> -Date: Fri, 30 Aug 2024 11:19:19 -0400 -Subject: [PATCH] digital: Fix NumPy 2 compatibility - -Signed-off-by: Clayton Smith <[email protected]> ---- - gr-digital/python/digital/qa_correlate_access_code_XX_ts.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py b/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py -index c0fdc9dc246..8c242f2f792 100644 ---- a/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py -+++ b/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py -@@ -12,6 +12,7 @@ - from gnuradio import gr, gr_unittest, digital, blocks - import pmt - import numpy -+import struct - - default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC' - -@@ -74,8 +75,9 @@ def _variable_payload_t(self, payload_len=2**15 + 3): - # header contains packet length, twice (bit-swapped) - header = numpy.array([(payload_len & 0xFF00) >> 8, payload_len & 0xFF] * 2, dtype=numpy.uint8) - # make sure we've built the length header correctly -- self.assertEqual(header[0] * 256 + header[1], header[2] * 256 + header[3]) -- self.assertEqual(header[0] * 256 + header[1], len(payload)) -+ length1, length2 = struct.unpack(">HH", header) -+ self.assertEqual(length1, length2) -+ self.assertEqual(length1, len(payload)) - - packet = numpy.concatenate((header, payload)) - pad = (0,) * PADDING_LEN diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.11.0-boost-1.87.patch b/net-wireless/gnuradio/files/gnuradio-3.10.11.0-boost-1.87.patch deleted file mode 100644 index 3a935c47058c..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.10.11.0-boost-1.87.patch +++ /dev/null @@ -1,151 +0,0 @@ -https://bugs.gentoo.org/946914 -https://github.com/gnuradio/gnuradio/issues/7564 -https://github.com/gnuradio/gnuradio/pull/7554 - -From b30b5feb130a1997c53bce61a85885858d4c9a0d Mon Sep 17 00:00:00 2001 -From: Landry Breuil <[email protected]> -Date: Wed, 27 Nov 2024 14:16:08 +0100 -Subject: [PATCH] gr-network: fix build with boost 1.87 - -- stop using asio..query -- replace deprecated io_context.reset() by restart() -- drop unneeded io_context.reset() calls -- stop using asio::buffer_cast - -Signed-off-by: Landry Breuil <[email protected]> ---- - gr-network/lib/socket_pdu_impl.cc | 25 ++++++++++++++++++------- - gr-network/lib/tcp_sink_impl.cc | 9 +++------ - gr-network/lib/udp_sink_impl.cc | 8 +++----- - gr-network/lib/udp_source_impl.cc | 3 +-- - 4 files changed, 25 insertions(+), 20 deletions(-) - -diff --git a/gr-network/lib/socket_pdu_impl.cc b/gr-network/lib/socket_pdu_impl.cc -index ef2ce6b4828..7cfef6812eb 100644 ---- a/gr-network/lib/socket_pdu_impl.cc -+++ b/gr-network/lib/socket_pdu_impl.cc -@@ -54,9 +54,12 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - d_tcp_endpoint = asio::ip::tcp::endpoint(asio::ip::tcp::v4(), port_num); - } else if ((type == "TCP_SERVER") || (type == "TCP_CLIENT")) { - asio::ip::tcp::resolver resolver(d_io_context); -- asio::ip::tcp::resolver::query query( -- asio::ip::tcp::v4(), addr, port, asio::ip::resolver_query_base::passive); -- d_tcp_endpoint = *resolver.resolve(query); -+ d_tcp_endpoint = *(resolver -+ .resolve(asio::ip::tcp::v4(), -+ addr, -+ port, -+ asio::ip::resolver_query_base::passive) -+ .cbegin()); - } else if ((type == "UDP_SERVER") && - ((addr.empty()) || (addr == "0.0.0.0"))) { // Bind on all interfaces - int port_num = atoi(port.c_str()); -@@ -66,13 +69,21 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - d_udp_endpoint = asio::ip::udp::endpoint(asio::ip::udp::v4(), port_num); - } else if ((type == "UDP_SERVER") || (type == "UDP_CLIENT")) { - asio::ip::udp::resolver resolver(d_io_context); -- asio::ip::udp::resolver::query query( -- asio::ip::udp::v4(), addr, port, asio::ip::resolver_query_base::passive); - - if (type == "UDP_SERVER") -- d_udp_endpoint = *resolver.resolve(query); -+ d_udp_endpoint = *(resolver -+ .resolve(asio::ip::udp::v4(), -+ addr, -+ port, -+ asio::ip::resolver_query_base::passive) -+ .cbegin()); - else -- d_udp_endpoint_other = *resolver.resolve(query); -+ d_udp_endpoint_other = *(resolver -+ .resolve(asio::ip::udp::v4(), -+ addr, -+ port, -+ asio::ip::resolver_query_base::passive) -+ .cbegin()); - } - - if (type == "TCP_SERVER") { -diff --git a/gr-network/lib/tcp_sink_impl.cc b/gr-network/lib/tcp_sink_impl.cc -index bbbc053db20..b7120ad87e4 100644 ---- a/gr-network/lib/tcp_sink_impl.cc -+++ b/gr-network/lib/tcp_sink_impl.cc -@@ -63,10 +63,8 @@ bool tcp_sink_impl::start() - - std::string s_port = std::to_string(d_port); - asio::ip::tcp::resolver resolver(d_io_context); -- asio::ip::tcp::resolver::query query( -- d_host, s_port, asio::ip::resolver_query_base::passive); -- -- d_endpoint = *resolver.resolve(query, err); -+ d_endpoint = *( -+ resolver.resolve(d_host, s_port, asio::ip::tcp::resolver::passive).cbegin()); - - if (err) { - throw std::runtime_error( -@@ -159,7 +157,7 @@ void tcp_sink_impl::connect(bool initial_connection) - d_acceptor = new asio::ip::tcp::acceptor( - d_io_context, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), d_port)); - } else { -- d_io_context.reset(); -+ d_io_context.restart(); - } - - if (d_tcpsocket) { -@@ -194,7 +192,6 @@ bool tcp_sink_impl::stop() - d_tcpsocket = NULL; - } - -- d_io_context.reset(); - d_io_context.stop(); - - if (d_acceptor) { -diff --git a/gr-network/lib/udp_sink_impl.cc b/gr-network/lib/udp_sink_impl.cc -index bbdb96f8bb5..3e2462a5e9b 100644 ---- a/gr-network/lib/udp_sink_impl.cc -+++ b/gr-network/lib/udp_sink_impl.cc -@@ -125,11 +125,10 @@ bool udp_sink_impl::start() - std::string str_port = std::to_string(d_port); - std::string str_host = d_host.empty() ? std::string("localhost") : d_host; - asio::ip::udp::resolver resolver(d_io_context); -- asio::ip::udp::resolver::query query( -- str_host, str_port, asio::ip::resolver_query_base::passive); -- - asio::error_code err; -- d_endpoint = *resolver.resolve(query, err); -+ d_endpoint = -+ *(resolver.resolve(str_host, str_port, asio::ip::tcp::resolver::passive, err) -+ .cbegin()); - - if (err) { - throw std::runtime_error(std::string("[UDP Sink] Unable to resolve host/IP: ") + -@@ -177,7 +176,6 @@ bool udp_sink_impl::stop() - delete d_udpsocket; - d_udpsocket = nullptr; - -- d_io_context.reset(); - d_io_context.stop(); - } - -diff --git a/gr-network/lib/udp_source_impl.cc b/gr-network/lib/udp_source_impl.cc -index 37f38a9b72d..774f348b90c 100644 ---- a/gr-network/lib/udp_source_impl.cc -+++ b/gr-network/lib/udp_source_impl.cc -@@ -163,7 +163,6 @@ bool udp_source_impl::stop() - delete d_udpsocket; - d_udpsocket = nullptr; - -- d_io_context.reset(); - d_io_context.stop(); - } - -@@ -275,7 +274,7 @@ int udp_source_impl::work(int noutput_items, - // Get the data and add it to our local queue. We have to maintain a - // local queue in case we read more bytes than noutput_items is asking - // for. In that case we'll only return noutput_items bytes -- const char* read_data = asio::buffer_cast<const char*>(d_read_buffer.data()); -+ const char* read_data = static_cast<const char*>(d_read_buffer.data().data()); - - // Discard bytes if the input is longer than the buffer - if (bytes_read > d_localqueue_writer->bufsize()) { - diff --git a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild deleted file mode 100644 index fc5205048127..000000000000 --- a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) - -inherit cmake desktop python-single-r1 virtualx xdg-utils - -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" -HOMEPAGE="https://www.gnuradio.org/"; -LICENSE="GPL-3" -SLOT="0/${PV}" - -if [[ ${PV} =~ "9999" ]]; then - EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"; - EGIT_BRANCH="maint-3.10" - inherit git-r3 -else - SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~riscv ~x86" -fi - -IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq" - -#RESTRICT="!test? ( test )" -# Tests are pulling in the installed python libs and breaking -# https://github.com/gnuradio/gnuradio/issues/7568 -RESTRICT="test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alsa? ( audio ) - analog? ( filter ) - audio? ( || ( alsa oss jack portaudio ) ) - channels? ( filter analog qt5 ) - digital? ( filter analog ) - dtv? ( filter analog fec ) - jack? ( audio ) - modtool? ( utils ) - oss? ( audio ) - portaudio? ( audio ) - qt5? ( filter ) - test? ( channels ) - trellis? ( analog digital ) - uhd? ( filter analog ) - vocoder? ( filter analog ) - wavelet? ( analog ) -" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') - dev-libs/gmp:= - dev-libs/log4cpp:= - $(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]') - dev-libs/spdlog:= - dev-libs/libfmt:= - sci-libs/fftw:3.0= - sci-libs/volk:= - media-libs/libsndfile - sys-libs/libunwind - alsa? ( media-libs/alsa-lib:= ) - ctrlport? ( - $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') - ) - fec? ( - sci-libs/gsl:= - dev-python/scipy - ) - filter? ( - dev-python/scipy - $(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]') - ) - grc? ( - $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]') - x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] - ) - iio? ( - net-libs/libiio:= - net-libs/libad9361-iio:= - ) - jack? ( virtual/jack ) - portaudio? ( >=media-libs/portaudio-19_pre ) - qt5? ( - $(python_gen_cond_dep 'dev-python/pyqt5[opengl,${PYTHON_USEDEP}]') - dev-qt/qtcore:5 - dev-qt/qtgui:5 - x11-libs/qwt:6=[qt5(+)] - dev-qt/qtwidgets:5 - ) - soapy? ( - net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}] - ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - trellis? ( dev-python/scipy ) - uhd? ( - >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] - ) - utils? ( - $(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}] - dev-python/click-plugins[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}]') - ) - vocoder? ( - media-sound/gsm - >=media-libs/codec2-0.8.1:= - ) - wavelet? ( - sci-libs/gsl:= - sci-libs/lapack - ) - zeromq? ( >=net-libs/zeromq-2.1.11:= ) -" - -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') - virtual/pkgconfig - doc? ( - >=app-text/doxygen-1.5.7.1 - <dev-libs/mathjax-3 - ) - grc? ( x11-misc/xdg-utils ) - modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') ) - oss? ( virtual/os-headers ) - test? ( - >=dev-util/cppunit-1.9.14 - dev-python/pyzmq - ) - zeromq? ( net-libs/cppzmq ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.10.11.0-boost-1.87.patch - "${FILESDIR}"/7570.patch -) - -src_prepare() { - xdg_environment_reset #534582 - - use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake - use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake - use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake - use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DEFAULT=OFF - -DENABLE_GNURADIO_RUNTIME=ON - -DENABLE_PYTHON=ON - -DENABLE_GR_BLOCKS=ON - -DENABLE_GR_ANALOG="$(usex analog ON OFF)" - -DENABLE_GR_AUDIO=ON - -DENABLE_GR_CHANNELS="$(usex channels ON OFF)" - -DENABLE_GR_CTRLPORT="$(usex ctrlport ON OFF)" - -DENABLE_GR_DIGITAL="$(usex digital ON OFF)" - -DENABLE_DOXYGEN="$(usex doc ON OFF)" - -DENABLE_GR_DTV="$(usex dtv ON OFF)" - -DENABLE_GR_FEC="$(usex fec ON OFF)" - -DENABLE_GR_FFT=ON - -DENABLE_GR_FILTER="$(usex filter ON OFF)" - -DENABLE_GRC="$(usex grc ON OFF)" - -DENABLE_GR_IIO="$(usex iio ON OFF)" - -DENABLE_GR_MODTOOL="$(usex modtool ON OFF)" - -DENABLE_GR_BLOCKTOOL="$(usex modtool ON OFF)" - -DENABLE_GR_NETWORK="$(usex network ON OFF)" - -DENABLE_GR_PDU=ON - -DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters ON OFF)" - -DENABLE_TESTING="$(usex test ON OFF)" - -DENABLE_GR_QTGUI="$(usex qt5 ON OFF)" - -DENABLE_GR_SOAPY="$(usex soapy ON OFF)" - -DENABLE_GR_TRELLIS="$(usex trellis ON OFF)" - -DENABLE_GR_UHD="$(usex uhd ON OFF)" - -DENABLE_GR_UTILS="$(usex utils ON OFF)" - -DENABLE_GR_VIDEO_SDL="$(usex sdl ON OFF)" - -DENABLE_GR_VOCODER="$(usex vocoder ON OFF)" - -DENABLE_GR_WAVELET="$(usex wavelet ON OFF)" - -DENABLE_GR_ZEROMQ="$(usex zeromq ON OFF)" - -DSYSCONFDIR="${EPREFIX}"/etc - -DPYTHON_EXECUTABLE="${PYTHON}" - -DGR_PYTHON_DIR="$(python_get_sitedir)" - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use examples ; then - dodir /usr/share/doc/${PF}/ - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die - docompress -x /usr/share/doc/${PF}/examples - else - # It seems that the examples are always installed - rm -rf "${ED}"/usr/share/${PN}/examples || die - fi - - if use doc || use examples; then - #this doesn't appear useful - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die - fi - - # Remove duplicated icons, MIME and desktop files and installation script - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die - - # Install icons, menu items and mime-types for GRC - if use grc ; then - local fd_path="${S}/grc/scripts/freedesktop" - insinto /usr/share/mime/packages - doins "${fd_path}/${PN}-grc.xml" - - domenu "${fd_path}/${PN}-grc.desktop" - for size in 16 24 32 48 64 128 256; do - newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png - done - fi - - python_fix_shebang "${ED}" - # Remove incorrectly byte-compiled Python files and replace - find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die - python_optimize -} - -src_test() { - # skip test which needs internet (metainfo_test) - virtx cmake_src_test -E 'metainfo_test' --output-on-failure -} - -pkg_postinst() { - if use grc ; then - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - if use grc ; then - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - fi -}
