From a4a19f78acc305106f3b54bec9af212e38bfe7be Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 25 Jan 2024 04:44:48 +0000 Subject: gentoo auto-resync : 25:01:2024 - 04:44:48 --- net-wireless/gnuradio/Manifest | 5 +- net-wireless/gnuradio/files/PR7093.patch | 76 +++++++ net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild | 245 ++++++++++++++++++++++ net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild | 245 ---------------------- net-wireless/gnuradio/gnuradio-9999.ebuild | 6 +- 5 files changed, 326 insertions(+), 251 deletions(-) create mode 100644 net-wireless/gnuradio/files/PR7093.patch create mode 100644 net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild delete mode 100644 net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild (limited to 'net-wireless/gnuradio') diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index f4aa692136ba..3209d7262026 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,4 +1,5 @@ +AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd -EBUILD gnuradio-3.10.9.2.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e -EBUILD gnuradio-9999.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e +EBUILD gnuradio-3.10.9.2-r1.ebuild 6776 BLAKE2B 1b0ced533f958d87767fbe38ed1836d221d9488e04bb6651778feeb1c13a1fcf8d5350dc8ecaa3df132ec0cdd5c84b6a0c0b2c50a813f68d0f6c7186f8cd3d66 SHA512 2dd06676aded58cb1f98662ae29d8842af037885fa5ac36b42091da42247a0d0e31570d82c3c144f80300f441d9e503758e4a6228dad9ea675ec209586986397 +EBUILD gnuradio-9999.ebuild 6736 BLAKE2B 1071027c522c8141e0ffe2028ebb0ee9e02f19ea94f17ee74a36787eb2682098128e464f6cdf170853410580e8bbc5954a26eabe75aec24531d197f73fa6cad4 SHA512 3cd7f489acc64fda572541d04334123364d8993824b0f9e6dd189f28a7a72276e25e3dbd7cbe6b75eeb6a16fa0082db60c1fdc5a9440e40f4254c56744ad16fc MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0 diff --git a/net-wireless/gnuradio/files/PR7093.patch b/net-wireless/gnuradio/files/PR7093.patch new file mode 100644 index 000000000000..98581054d49d --- /dev/null +++ b/net-wireless/gnuradio/files/PR7093.patch @@ -0,0 +1,76 @@ +From 677d22b5226a3edb274c252cc3aa727a16de3c68 Mon Sep 17 00:00:00 2001 +From: Clayton Smith +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 +--- + 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& 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& 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& 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 f1_taps(&taps[0], &taps[n]); ++ vector 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 f1_taps(&taps[0], &taps[n]); ++ vector 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 f1_taps(&taps[0], &taps[n]); ++ vector 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/gnuradio-3.10.9.2-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild new file mode 100644 index 000000000000..bbbc55d8c42e --- /dev/null +++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) + +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 ) + 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/log4cpp:= + $(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]') + dev-libs/spdlog:= + dev-libs/libfmt:= + 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 + $(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:= + !net-wireless/gr-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? ( + $(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]') + ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + trellis? ( dev-python/scipy ) + uhd? ( + $(python_gen_cond_dep '>=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:= + dev-libs/gmp:= + 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-util/cppunit-1.9.14 ) + zeromq? ( net-libs/cppzmq ) +" + +PATCHES=( "${FILESDIR}/PR7093.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)" + -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 +} diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild deleted file mode 100644 index 68eff59630d3..000000000000 --- a/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) - -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 )" -# https://github.com/gnuradio/gnuradio/issues/7085 -RESTRICT="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 ) - 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/log4cpp:= - $(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]') - dev-libs/spdlog:= - dev-libs/libfmt:= - 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 - $(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:= - !net-wireless/gr-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? ( - $(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]') - ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - trellis? ( dev-python/scipy ) - uhd? ( - $(python_gen_cond_dep '>=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:= - dev-libs/gmp:= - 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-util/cppunit-1.9.14 ) - zeromq? ( net-libs/cppzmq ) -" - -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)" - -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 -} - -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 -} diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index 68eff59630d3..6270b80fb9f0 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -23,9 +23,7 @@ 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 )" -# https://github.com/gnuradio/gnuradio/issues/7085 -RESTRICT="test" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) @@ -225,7 +223,7 @@ src_install() { src_test() { # skip test which needs internet - virtx cmake_src_test -E metainfo_test + virtx cmake_src_test -E metainfo_test --output-on-failure } pkg_postinst() { -- cgit v1.2.3