commit: 0018b41224e6f9df2f7d188d95a5510230ee7c38 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> AuthorDate: Wed Jan 22 16:36:21 2025 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Wed Jan 22 16:38:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0018b412
net-wireless/gnuradio: update for one fixed test Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> net-wireless/gnuradio/files/7570.patch | 34 +++++++++++++++++++++++++ net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild | 7 +++-- net-wireless/gnuradio/gnuradio-9999.ebuild | 6 ++--- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/net-wireless/gnuradio/files/7570.patch b/net-wireless/gnuradio/files/7570.patch new file mode 100644 index 000000000000..1adefd1674bb --- /dev/null +++ b/net-wireless/gnuradio/files/7570.patch @@ -0,0 +1,34 @@ +From dc208e8c91a772ea3da462efd16d912cef44316c Mon Sep 17 00:00:00 2001 +From: Clayton Smith <arg...@gmail.com> +Date: Fri, 30 Aug 2024 11:19:19 -0400 +Subject: [PATCH] digital: Fix NumPy 2 compatibility + +Signed-off-by: Clayton Smith <arg...@gmail.com> +--- + 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/gnuradio-3.10.11.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild index 1afef5f54a9e..37cadf28ce7e 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -135,6 +135,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.10.11.0-boost-1.87.patch + "${FILESDIR}"/7570.patch ) src_prepare() { @@ -231,9 +232,7 @@ src_install() { src_test() { # skip test which needs internet (metainfo_test) - # skip test which is currently broken (qa_correlate_access_code_XX_ts) - # https://github.com/gnuradio/gnuradio/issues/7566 - virtx cmake_src_test -E 'metainfo_test|qa_correlate_access_code_XX_ts' --output-on-failure + virtx cmake_src_test -E 'metainfo_test' --output-on-failure } pkg_postinst() { diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index 27cb13c82bc0..a7011ffe6be8 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -227,9 +227,7 @@ src_install() { src_test() { # skip test which needs internet (metainfo_test) - # skip test which is currently broken (qa_correlate_access_code_XX_ts) - # https://github.com/gnuradio/gnuradio/issues/7566 - virtx cmake_src_test -E 'metainfo_test|qa_correlate_access_code_XX_ts' --output-on-failure + virtx cmake_src_test -E 'metainfo_test' --output-on-failure } pkg_postinst() {