* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/
@ 2025-01-22 16:38 Rick Farina
0 siblings, 0 replies; 6+ messages in thread
From: Rick Farina @ 2025-01-22 16:38 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/
@ 2025-08-19 3:59 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-08-19 3:59 UTC (permalink / raw
To: gentoo-commits
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 <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/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 <landry@openbsd.org>
-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 <landry@openbsd.org>
----
- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/
@ 2025-04-20 20:21 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-04-20 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 62537ac9feaeee4d0812844f7ad79dfb35c1b7b0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 18 12:23:02 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 20:20:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62537ac9
net-wireless/gnuradio: drop 3.10.9.2-r6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-wireless/gnuradio/Manifest | 1 -
net-wireless/gnuradio/files/PR7093.patch | 76 ------
.../files/gnuradio-3.10.9.2-libfmt-11.patch | 50 ----
net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild | 257 ---------------------
4 files changed, 384 deletions(-)
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 9bc67178a0db..0a2b770d812b 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.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
diff --git a/net-wireless/gnuradio/files/PR7093.patch b/net-wireless/gnuradio/files/PR7093.patch
deleted file mode 100644
index 98581054d49d..000000000000
--- a/net-wireless/gnuradio/files/PR7093.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 677d22b5226a3edb274c252cc3aa727a16de3c68 Mon Sep 17 00:00:00 2001
-From: Clayton Smith <argilo@gmail.com>
-Date: Tue, 23 Jan 2024 18:28:46 -0500
-Subject: [PATCH] filter: Fix undefined behaviour in fir_filter_with_buffer
-
-Signed-off-by: Clayton Smith <argilo@gmail.com>
----
- gr-filter/lib/fir_filter_with_buffer.cc | 9 ++++++---
- gr-filter/lib/qa_fir_filter_with_buffer.cc | 6 +++---
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc
-index 4fc571ec57d..f6cb3b20854 100644
---- a/gr-filter/lib/fir_filter_with_buffer.cc
-+++ b/gr-filter/lib/fir_filter_with_buffer.cc
-@@ -52,7 +52,8 @@ void fir_filter_with_buffer_fff::set_taps(const std::vector<float>& taps)
- for (int i = 0; i < d_naligned; i++) {
- d_aligned_taps[i].clear();
- d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
-- std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
-+ std::copy(
-+ std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
- }
-
- d_idx = 0;
-@@ -157,7 +158,8 @@ void fir_filter_with_buffer_ccc::set_taps(const std::vector<gr_complex>& taps)
- for (int i = 0; i < d_naligned; i++) {
- d_aligned_taps[i].clear();
- d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
-- std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
-+ std::copy(
-+ std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
- }
-
- d_idx = 0;
-@@ -261,7 +263,8 @@ void fir_filter_with_buffer_ccf::set_taps(const std::vector<float>& taps)
- for (int i = 0; i < d_naligned; i++) {
- d_aligned_taps[i].clear();
- d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
-- std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
-+ std::copy(
-+ std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
- }
-
- d_idx = 0;
-diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc
-index 32f5c6780fc..72cdd9fa1c0 100644
---- a/gr-filter/lib/qa_fir_filter_with_buffer.cc
-+++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc
-@@ -107,7 +107,7 @@ void test_decimate(unsigned int decimate)
- }
-
- // build filter
-- vector<tap_type> f1_taps(&taps[0], &taps[n]);
-+ vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
- kernel::fir_filter_with_buffer_fff f1(f1_taps);
-
- // zero the output, then do the filtering
-@@ -198,7 +198,7 @@ void test_decimate(unsigned int decimate)
- }
-
- // build filter
-- vector<tap_type> f1_taps(&taps[0], &taps[n]);
-+ vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
- kernel::fir_filter_with_buffer_ccc f1(f1_taps);
-
- // zero the output, then do the filtering
-@@ -287,7 +287,7 @@ void test_decimate(unsigned int decimate)
- }
-
- // build filter
-- vector<tap_type> f1_taps(&taps[0], &taps[n]);
-+ vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
- kernel::fir_filter_with_buffer_ccf f1(f1_taps);
-
- // zero the output, then do the filtering
diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch
deleted file mode 100644
index 60304a36ea16..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa Mon Sep 17 00:00:00 2001
-From: Kefu Chai <tchaikov@gmail.com>
-Date: Mon, 15 Jul 2024 09:27:16 +0800
-Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for
- using fmt::join()
-
-fmt::join() was moved into fmt/ranges.h since fmt 11, so let's
-include the corresponding header in spdlog for using it.
-
-Signed-off-by: Kefu Chai <tchaikov@gmail.com>
----
- gnuradio-runtime/lib/io_signature.cc | 5 +++++
- gr-blocks/lib/message_debug_impl.cc | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc
-index 812f444f8..76bb2aba6 100644
---- a/gnuradio-runtime/lib/io_signature.cc
-+++ b/gnuradio-runtime/lib/io_signature.cc
-@@ -16,6 +16,11 @@
- #include <spdlog/tweakme.h>
-
- #include <spdlog/fmt/fmt.h>
-+#if __has_include(<spdlog/fmt/ranges.h>)
-+#include <spdlog/fmt/ranges.h>
-+#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
-+#include <spdlog/fmt/bundled/ranges.h>
-+#endif
- #include <string_view>
- #include <algorithm>
- #include <memory>
-diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc
-index 41d312e43..373287b02 100644
---- a/gr-blocks/lib/message_debug_impl.cc
-+++ b/gr-blocks/lib/message_debug_impl.cc
-@@ -19,6 +19,11 @@
- #include <pmt/pmt.h>
- #include <spdlog/common.h>
- #include <spdlog/fmt/fmt.h>
-+#if __has_include(<spdlog/fmt/ranges.h>)
-+#include <spdlog/fmt/ranges.h>
-+#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
-+#include <spdlog/fmt/bundled/ranges.h>
-+#endif
- #include <functional>
- #include <utility>
- #include <vector>
---
-2.45.2
-
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild
deleted file mode 100644
index e2b0ef2bca50..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild
+++ /dev/null
@@ -1,257 +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} )
-
-CMAKE_BUILD_TYPE="None"
-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 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- audio? ( || ( alsa oss jack portaudio ) )
- alsa? ( audio )
- jack? ( audio )
- oss? ( audio )
- portaudio? ( audio )
- analog? ( filter )
- channels? ( filter analog qt5 )
- digital? ( filter analog )
- dtv? ( filter analog fec )
- modtool? ( utils )
- 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[qt5,${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}/PR7093.patch"
- "${FILESDIR}"/${PN}-3.10.9.2-libfmt-11.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
-
- # remove empty test case (see https://github.com/gnuradio/gnuradio/commit/21df528)
- # fails with Python 3.12
- rm "${S}"/gr-digital/python/digital/qa_digital.py || die
- # fix test failure due to deprecated syntax for numpy
- # see https://github.com/gnuradio/gnuradio/commit/a306e11
- sed -i -e "s/np.alltrue/np.all/g" \
- "${S}"/gnuradio-runtime/python/pmt/qa_pmt_to_python.py || die
- 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)"
- -DENABLE_GR_AUDIO=ON
- -DENABLE_GR_CHANNELS="$(usex channels)"
- -DENABLE_GR_CTRLPORT="$(usex ctrlport)"
- -DENABLE_GR_DIGITAL="$(usex digital)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_GR_DTV="$(usex dtv)"
- -DENABLE_GR_FEC="$(usex fec)"
- -DENABLE_GR_FFT=ON
- -DENABLE_GR_FILTER="$(usex filter)"
- -DENABLE_GRC="$(usex grc)"
- -DENABLE_GR_IIO="$(usex iio)"
- -DENABLE_GR_MODTOOL="$(usex modtool)"
- -DENABLE_GR_BLOCKTOOL="$(usex modtool)"
- -DENABLE_GR_NETWORK="$(usex network)"
- -DENABLE_GR_PDU=ON
- -DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
- -DENABLE_TESTING="$(usex test)"
- -DENABLE_GR_QTGUI="$(usex qt5)"
- -DENABLE_GR_SOAPY="$(usex soapy)"
- -DENABLE_GR_TRELLIS="$(usex trellis)"
- -DENABLE_GR_UHD="$(usex uhd)"
- -DENABLE_GR_UTILS="$(usex utils)"
- -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
- -DENABLE_GR_VOCODER="$(usex vocoder)"
- -DENABLE_GR_WAVELET="$(usex wavelet)"
- -DENABLE_GR_ZEROMQ="$(usex zeromq)"
- -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
- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/
@ 2023-06-15 21:45 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-06-15 21:45 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/
@ 2020-12-17 16:20 Rick Farina
0 siblings, 0 replies; 6+ messages in thread
From: Rick Farina @ 2020-12-17 16:20 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/
@ 2019-05-26 9:28 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2019-05-26 9:28 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-08-19 3:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-22 16:38 [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/, net-wireless/gnuradio/files/ Rick Farina
-- strict thread matches above, loose matches on Subject: below --
2025-08-19 3:59 Andreas Sturmlechner
2025-04-20 20:21 Andreas Sturmlechner
2023-06-15 21:45 Sam James
2020-12-17 16:20 Rick Farina
2019-05-26 9:28 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox