[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/

[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/

[David Seifert]

commit:     4bf1cf8bdb1743d1c4797ad132d6fbde526b54a9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 09:27:58 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May 26 09:27:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf1cf8b

net-wireless/gnuradio: Fix building against boost 1.70

* Patch adapted from FreeBSD with whitespace cleanup

Closes: https://bugs.gentoo.org/683380
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/gnuradio-3.7.13.5-boost-1.70-asio.patch      | 18 ++++++++++++++++++
 net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild         |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch
new file mode 100644
index 00000000000..d4925e674ea
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/683380
+Patch adapted from FreeBSD:
+https://svnweb.freebsd.org/ports/head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc?view=markup&pathrev=499093
+
+--- a/gr-blocks/lib/socket_pdu_impl.cc
++++ b/gr-blocks/lib/socket_pdu_impl.cc
+@@ -165,7 +165,11 @@
+     void
+     socket_pdu_impl::start_tcp_accept()
+     {
++#if (BOOST_VERSION >= 107000)
++      tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
++#else
+       tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
++#endif
+ 
+       d_acceptor_tcp->async_accept(new_connection->socket(),
+         boost::bind(&socket_pdu_impl::handle_tcp_accept, this,

diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
index 354d6e7b959..68792650946 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
@@ -49,7 +49,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
+	dev-libs/boost:0=[python,${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
@@ -120,6 +120,7 @@ src_prepare() {
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
 	epatch "${WORKDIR}"/qt5-maint-00*.patch
 	epatch "${WORKDIR}"/codec2-next-00*.patch
+	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
 
 	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
 	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake

[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/

[Rick Farina]

commit:     6c3860ee42cf5094869af7344f729f3e1c3d9a16
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 16:20:29 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 16:20:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3860ee

net-wireless/gnuradio: bug #751259

I had hoped that upstream would make a release for this, but they
haven't yet and I'm tired of waiting.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../gnuradio/files/gnuradio-3.8.2.0-3967.patch     | 58 ++++++++++++++++++++++
 net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild      |  1 +
 2 files changed, 59 insertions(+)

diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch
new file mode 100644
index 00000000000..bee81049e24
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch
@@ -0,0 +1,58 @@
+From cbcb968358fad56f3646619b258f18b0e6693a07 Mon Sep 17 00:00:00 2001
+From: Jeff Long <willcode4@gmail.com>
+Date: Wed, 25 Nov 2020 09:44:55 -0500
+Subject: [PATCH 1/2] Boost placeholder scope required (using
+ boost::placeholders)
+
+---
+ gnuradio-runtime/include/gnuradio/basic_block.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
+index 1d31e2e9b8..0aace8f38d 100644
+--- a/gnuradio-runtime/include/gnuradio/basic_block.h
++++ b/gnuradio-runtime/include/gnuradio/basic_block.h
+@@ -41,7 +41,7 @@
+ #include <gnuradio/rpcregisterhelpers.h>
+ 
+ namespace gr {
+-
++using namespace boost::placeholders;
+ /*!
+  * \brief The abstract base class for all signal processing blocks.
+  * \ingroup internal
+
+From 951b16756934f28bc3da4b3c442651b2fbe79b05 Mon Sep 17 00:00:00 2001
+From: Jeff Long <willcode4@gmail.com>
+Date: Wed, 25 Nov 2020 11:05:56 -0500
+Subject: [PATCH 2/2] boost bind: make placeholder namespace conditional on
+ boost version
+
+---
+ gnuradio-runtime/include/gnuradio/basic_block.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
+index 0aace8f38d..c57c1cf553 100644
+--- a/gnuradio-runtime/include/gnuradio/basic_block.h
++++ b/gnuradio-runtime/include/gnuradio/basic_block.h
+@@ -33,6 +33,9 @@
+ #include <boost/foreach.hpp>
+ #include <boost/function.hpp>
+ #include <boost/thread/condition_variable.hpp>
++#if (BOOST_VERSION >= 106000)
++#include <boost/bind/bind.hpp>
++#endif
+ #include <deque>
+ #include <iostream>
+ #include <map>
+@@ -41,7 +44,9 @@
+ #include <gnuradio/rpcregisterhelpers.h>
+ 
+ namespace gr {
++#if (BOOST_VERSION >= 106000)
+ using namespace boost::placeholders;
++#endif
+ /*!
+  * \brief The abstract base class for all signal processing blocks.
+  * \ingroup internal

diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
index 601ceea4ed9..81a61888d72 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
 	"${FILESDIR}/gnuradio-3.8.2.0-lamda-gr-uhd.patch"
 	"${FILESDIR}/gnuradio-3.8.2.0-lamda-most-components.patch"
 	"${FILESDIR}/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch"
+	"${FILESDIR}/gnuradio-3.8.2.0-3967.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/

[Sam James]

commit:     3eeb1d9a9121ddc0d03565f5cef46b0decee7f8c
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Jun 15 21:18:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 21:32:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eeb1d9a

net-wireless/gnuradio: fixes build with GCC-13

Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31472
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gnuradio-3.10.6.0-fix-stdint.patch         | 20 ++++++++++++++++++++
 net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild    |  1 +
 net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild       |  1 +
 net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild       |  1 +
 4 files changed, 23 insertions(+)

diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch b/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch
new file mode 100644
index 000000000000..6252d96fd8b5
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch
@@ -0,0 +1,20 @@
+Author: Christian Inci <chris.gh@broke-the-inter.net>
+Date:   Mon May 15 21:26:05 2023 +0200
+Upstream: https://github.com/gnuradio/gnuradio/pull/6667
+
+    Include cstdint in gr-fec's alist.h
+    
+    GCC 13 will error out otherwise.
+    
+    Signed-off-by: Christian Inci <chris.gh@broke-the-inter.net>
+
+--- a/gr-fec/include/gnuradio/fec/alist.h
++++ b/gr-fec/include/gnuradio/fec/alist.h
+@@ -23,6 +23,7 @@
+ #define ALIST_H
+ 
+ #include <gnuradio/fec/api.h>
++#include <cstdint>
+ #include <cstdlib>
+ #include <fstream>
+ #include <sstream>

diff --git a/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
index cb4db21dfed5..32e79d5f8f58 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
@@ -134,6 +134,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
 	"${FILESDIR}/${PN}-3.10.4.0-fix-blockinterleaving.patch"
+	"${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch"
 )
 
 src_prepare() {

diff --git a/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild
index b9ce9c0ab979..6a703292b5ab 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.5.1.ebuild
@@ -133,6 +133,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
+	"${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch"
 )
 
 src_prepare() {

diff --git a/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild
index b9ce9c0ab979..6a703292b5ab 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.6.0.ebuild
@@ -133,6 +133,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
+	"${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/

[Rick Farina]

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 <argilo@gmail.com>
+Date: Fri, 30 Aug 2024 11:19:19 -0400
+Subject: [PATCH] digital: Fix NumPy 2 compatibility
+
+Signed-off-by: Clayton Smith <argilo@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() {