mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-31 09:08:08 -07:00
net-wireless/gnuradio: drop 3.10.9.2-r6
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user