commit: 3f068228890e081880b0045af5fa7ee9c7f09d4f
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 15:20:22 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 15:21:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f068228
net-wireless/gnuradio: Major version bump to 3.10.3.0
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
net-wireless/gnuradio/Manifest | 1 +
...uradio-9999.ebuild => gnuradio-3.10.3.0.ebuild} | 73 ++++++++++++++--------
net-wireless/gnuradio/gnuradio-9999.ebuild | 73 ++++++++++++++--------
net-wireless/gnuradio/metadata.xml | 3 +
4 files changed, 100 insertions(+), 50 deletions(-)
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index a7d9384ebcdd..8c0e375821c2 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1 +1,2 @@
+DIST gnuradio-3.10.3.0.tar.gz 4376594 BLAKE2B
676c16dda6c4b01ca922fe942e1572653c57dd8f6240ad74af2b10351470ad53ecc5c4a7347e04cb1c898388c48f561f7871c39140f77c50f9217963355793a6
SHA512
fe4cd2204257b65129f148bbdd6a1c192559b8824a131bd99cc2ac854e1880ee4fa07b702170452b3b6070df34d99db27ef0fe064c50e6e5a6335e61e38e6645
DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B
19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880
SHA512
9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild
b/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
similarity index 75%
copy from net-wireless/gnuradio/gnuradio-9999.ebuild
copy to net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
index 78f7c917fedf..5e21cefe2fdd 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils desktop
+inherit cmake python-single-r1 virtualx xdg-utils
DESCRIPTION="Toolkit that provides signal processing blocks to implement
software radios"
HOMEPAGE="https://www.gnuradio.org/";
@@ -14,14 +14,14 @@ SLOT="0/${PV}"
if [[ ${PV} =~ "9999" ]]; then
EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git";
- EGIT_BRANCH="maint-3.8"
+ EGIT_BRANCH="maint-3.10"
inherit git-r3
else
-
SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
fi
-IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc
jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd
vocoder +utils wavelet zeromq"
+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 known broken right now
@@ -49,15 +49,24 @@ RDEPEND="${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
dev-libs/log4cpp:=
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
sci-libs/fftw:3.0=
sci-libs/mpir:=
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 )
+ 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}]
@@ -66,6 +75,10 @@ RDEPEND="${PYTHON_DEPS}
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? (
@@ -75,6 +88,9 @@ RDEPEND="${PYTHON_DEPS}
x11-libs/qwt:6[qt5(+)]
dev-qt/qtwidgets:5
)
+ soapy? (
+ $(python_gen_cond_dep 'net-wireless/soapysdr[${PYTHON_USEDEP}]')
+ )
sdl? ( >=media-libs/libsdl-1.2.0 )
trellis? ( dev-python/scipy )
uhd? (
@@ -88,7 +104,7 @@ RDEPEND="${PYTHON_DEPS}
)
vocoder? (
media-sound/gsm
- >=media-libs/codec2-0.8.1
+ >=media-libs/codec2-0.8.1:=
)
wavelet? (
sci-libs/gsl:=
@@ -98,15 +114,18 @@ RDEPEND="${PYTHON_DEPS}
zeromq? ( >=net-libs/zeromq-2.1.11:= )
"
-#That's right, it can't build if gnuradio 3.7 is installed
+#That's right, it can't build if gnuradio 3.8 is installed
#Both due to build failure, and then file collision due to bundled volk
DEPEND="${RDEPEND}
- !<net-wireless/gnuradio-3.8
+ !!<net-wireless/gnuradio-3.10
app-text/docbook-xml-dtd:4.2
- >=dev-lang/swig-3.0.5
+ $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
+ dev-libs/spdlog
virtual/pkgconfig
doc? (
>=app-doc/doxygen-1.5.7.1
+ dev-libs/mathjax
)
grc? ( x11-misc/xdg-utils )
oss? ( virtual/os-headers )
@@ -128,36 +147,40 @@ src_prepare() {
src_configure() {
mycmakeargs=(
-DENABLE_DEFAULT=OFF
- -DENABLE_VOLK=OFF
- -DENABLE_INTERNAL_VOLK=OFF
-DENABLE_GNURADIO_RUNTIME=ON
-DENABLE_PYTHON=ON
-DENABLE_GR_BLOCKS=ON
- -DENABLE_GR_FFT=ON
- -DENABLE_GR_AUDIO=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_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-DENABLE_TESTING="$(usex test)"
+ -DENABLE_GR_NETWORK="$(usex network)"
+ -DENABLE_GR_QTGUI="$(usex qt5)"
+ -DENABLE_GR_SOAPY="$(usex soapy)"
+ -DENABLE_GR_BLOCKTOOL=OFF # for now
-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_QTGUI="$(usex qt5)"
- -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-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
}
@@ -184,18 +207,18 @@ src_install() {
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"
+ #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}/"*.desktop
- doicon "${fd_path}/"*.png
- fi
+ # domenu "${fd_path}/"*.desktop
+ # doicon "${fd_path}/"*.png
+ #fi
python_fix_shebang "${ED}"
# Remove incorrectly byte-compiled Python files and replace
- find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+ find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
python_optimize
}
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 78f7c917fedf..5e21cefe2fdd 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils desktop
+inherit cmake python-single-r1 virtualx xdg-utils
DESCRIPTION="Toolkit that provides signal processing blocks to implement
software radios"
HOMEPAGE="https://www.gnuradio.org/";
@@ -14,14 +14,14 @@ SLOT="0/${PV}"
if [[ ${PV} =~ "9999" ]]; then
EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git";
- EGIT_BRANCH="maint-3.8"
+ EGIT_BRANCH="maint-3.10"
inherit git-r3
else
-
SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
fi
-IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc
jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd
vocoder +utils wavelet zeromq"
+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 known broken right now
@@ -49,15 +49,24 @@ RDEPEND="${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
dev-libs/log4cpp:=
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
sci-libs/fftw:3.0=
sci-libs/mpir:=
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 )
+ 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}]
@@ -66,6 +75,10 @@ RDEPEND="${PYTHON_DEPS}
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? (
@@ -75,6 +88,9 @@ RDEPEND="${PYTHON_DEPS}
x11-libs/qwt:6[qt5(+)]
dev-qt/qtwidgets:5
)
+ soapy? (
+ $(python_gen_cond_dep 'net-wireless/soapysdr[${PYTHON_USEDEP}]')
+ )
sdl? ( >=media-libs/libsdl-1.2.0 )
trellis? ( dev-python/scipy )
uhd? (
@@ -88,7 +104,7 @@ RDEPEND="${PYTHON_DEPS}
)
vocoder? (
media-sound/gsm
- >=media-libs/codec2-0.8.1
+ >=media-libs/codec2-0.8.1:=
)
wavelet? (
sci-libs/gsl:=
@@ -98,15 +114,18 @@ RDEPEND="${PYTHON_DEPS}
zeromq? ( >=net-libs/zeromq-2.1.11:= )
"
-#That's right, it can't build if gnuradio 3.7 is installed
+#That's right, it can't build if gnuradio 3.8 is installed
#Both due to build failure, and then file collision due to bundled volk
DEPEND="${RDEPEND}
- !<net-wireless/gnuradio-3.8
+ !!<net-wireless/gnuradio-3.10
app-text/docbook-xml-dtd:4.2
- >=dev-lang/swig-3.0.5
+ $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
+ dev-libs/spdlog
virtual/pkgconfig
doc? (
>=app-doc/doxygen-1.5.7.1
+ dev-libs/mathjax
)
grc? ( x11-misc/xdg-utils )
oss? ( virtual/os-headers )
@@ -128,36 +147,40 @@ src_prepare() {
src_configure() {
mycmakeargs=(
-DENABLE_DEFAULT=OFF
- -DENABLE_VOLK=OFF
- -DENABLE_INTERNAL_VOLK=OFF
-DENABLE_GNURADIO_RUNTIME=ON
-DENABLE_PYTHON=ON
-DENABLE_GR_BLOCKS=ON
- -DENABLE_GR_FFT=ON
- -DENABLE_GR_AUDIO=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_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-DENABLE_TESTING="$(usex test)"
+ -DENABLE_GR_NETWORK="$(usex network)"
+ -DENABLE_GR_QTGUI="$(usex qt5)"
+ -DENABLE_GR_SOAPY="$(usex soapy)"
+ -DENABLE_GR_BLOCKTOOL=OFF # for now
-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_QTGUI="$(usex qt5)"
- -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-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
}
@@ -184,18 +207,18 @@ src_install() {
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"
+ #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}/"*.desktop
- doicon "${fd_path}/"*.png
- fi
+ # domenu "${fd_path}/"*.desktop
+ # doicon "${fd_path}/"*.png
+ #fi
python_fix_shebang "${ED}"
# Remove incorrectly byte-compiled Python files and replace
- find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+ find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
python_optimize
}
diff --git a/net-wireless/gnuradio/metadata.xml
b/net-wireless/gnuradio/metadata.xml
index fdcbd394e398..619ce7994007 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -15,8 +15,11 @@
<flag name="fec">enable block for convolutional encoding using
the CCSDS standard polynomial ("Voyager")</flag>
<flag name="filter">enable filter signal processing
blocks</flag>
<flag name="grc">enable GNU Radio Companion graphical tool to
design signal processing flow graphs</flag>
+ <flag name="iio">enable enable support for IIO devices</flag>
<flag name="modtool">enable modtool for editing GNU Radio
modules and components</flag>
+ <flag name="network">enable block for networking support</flag>
<flag name="performance-counters">enable block performance
counters</flag>
+ <flag name="soapy">enable support for SoapySDR blocks</flag>
<flag name="trellis">enable trellis blocks for FSM</flag>
<flag name="uhd">install UHD source and sink blocks</flag>
<flag name="utils">install scripts to enable viewing and
analysis of files produced by flow graphs</flag>
