From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7C121382C5 for ; Mon, 1 Jun 2020 20:46:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EDD0E0897; Mon, 1 Jun 2020 20:46:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E125FE0897 for ; Mon, 1 Jun 2020 20:46:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4AA934E5C3 for ; Mon, 1 Jun 2020 20:46:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67C1827D for ; Mon, 1 Jun 2020 20:45:57 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1591044187.822521109c99d9d88db6d9f201dd1369fc90d92b.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gnuradio/Manifest net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild net-wireless/gnuradio/metadata.xml X-VCS-Directories: net-wireless/gnuradio/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 822521109c99d9d88db6d9f201dd1369fc90d92b X-VCS-Branch: master Date: Mon, 1 Jun 2020 20:45:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 878a7b16-3ba5-4bbc-babc-b080c7b0984a X-Archives-Hash: 2e434633e86327341675ca0f276464e0 commit: 822521109c99d9d88db6d9f201dd1369fc90d92b Author: Rick Farina gentoo org> AuthorDate: Sat May 30 01:45:13 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Mon Jun 1 20:43:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82252110 net-wireless/gnuradio: bump Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Rick Farina gentoo.org> net-wireless/gnuradio/Manifest | 1 + net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild | 212 +++++++++++++++++++++++++ net-wireless/gnuradio/gnuradio-9999.ebuild | 213 ++++++++++++++++++++++++++ net-wireless/gnuradio/metadata.xml | 1 + 4 files changed, 427 insertions(+) diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 7a0272d9397..0c14569032c 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,3 +1,4 @@ DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15 +DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479 SHA512 81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild new file mode 100644 index 00000000000..876a00b18cf --- /dev/null +++ b/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +CMAKE_BUILD_TYPE="None" +inherit cmake-utils 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.8" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~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" + +#RESTRICT="!test? ( test )" +#Tests are known broken right now +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} + >=dev-lang/orc-0.4.12 + $(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]') + dev-libs/log4cpp + $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') + sci-libs/fftw:3.0= + sci-libs/mpir + sci-libs/volk + alsa? ( media-libs/alsa-lib:= ) + fec? ( + sci-libs/gsl + sci-libs/scipy + ) + filter? ( sci-libs/scipy ) + 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] + ) + jack? ( media-sound/jack-audio-connection-kit ) + 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 + ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + trellis? ( sci-libs/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 ) +" + +#That's right, it can't build if gnuradio 3.7 is installed +#Both due to build failure, and then file collision due to bundled volk +DEPEND="${RDEPEND} + !=dev-lang/swig-3.0.5 + virtual/pkgconfig + doc? ( + >=app-doc/doxygen-1.5.7.1 + ) + grc? ( x11-misc/xdg-utils ) + oss? ( virtual/os-headers ) + test? ( >=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-utils_src_prepare +} + +src_configure() { + mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_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_CHANNELS="$(usex channels)" + -DENABLE_GR_DIGITAL="$(usex digital)" + -DENABLE_DOXYGEN="$(usex doc)" + -DENABLE_GR_DTV="$(usex dtv)" + -DENABLE_GR_FEC="$(usex fec)" + -DENABLE_GR_FILTER="$(usex filter)" + -DENABLE_GRC="$(usex grc)" + -DENABLE_GR_MODTOOL="$(usex modtool)" + -DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" + -DENABLE_TESTING="$(usex test)" + -DENABLE_GR_TRELLIS="$(usex trellis)" + -DENABLE_GR_UHD="$(usex uhd)" + -DENABLE_GR_UTILS="$(usex utils)" + -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}" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_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 + + # Remove incorrectly byte-compiled Python files and replace + find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die + python_optimize +} + +src_test() +{ + virtx cmake-utils_src_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 new file mode 100644 index 00000000000..445acb55d95 --- /dev/null +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +CMAKE_BUILD_TYPE="None" +inherit cmake-utils 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="pybind" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~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" + +#RESTRICT="!test? ( test )" +#Tests are known broken right now +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-python/pybind11[${PYTHON_USEDEP}]') + >=dev-lang/orc-0.4.12 + $(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]') + dev-libs/log4cpp + $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') + sci-libs/fftw:3.0= + sci-libs/mpir + sci-libs/volk + alsa? ( media-libs/alsa-lib:= ) + fec? ( + sci-libs/gsl + sci-libs/scipy + ) + filter? ( sci-libs/scipy ) + 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] + ) + jack? ( media-sound/jack-audio-connection-kit ) + 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 + ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + trellis? ( sci-libs/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 ) +" + +#That's right, it can't build if gnuradio 3.7 is installed +#Both due to build failure, and then file collision due to bundled volk +DEPEND="${RDEPEND} + !=dev-lang/swig-3.0.5 + virtual/pkgconfig + doc? ( + >=app-doc/doxygen-1.5.7.1 + ) + grc? ( x11-misc/xdg-utils ) + oss? ( virtual/os-headers ) + test? ( >=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-utils_src_prepare +} + +src_configure() { + mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_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_CHANNELS="$(usex channels)" + -DENABLE_GR_DIGITAL="$(usex digital)" + -DENABLE_DOXYGEN="$(usex doc)" + -DENABLE_GR_DTV="$(usex dtv)" + -DENABLE_GR_FEC="$(usex fec)" + -DENABLE_GR_FILTER="$(usex filter)" + -DENABLE_GRC="$(usex grc)" + -DENABLE_GR_MODTOOL="$(usex modtool)" + -DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" + -DENABLE_TESTING="$(usex test)" + -DENABLE_GR_TRELLIS="$(usex trellis)" + -DENABLE_GR_UHD="$(usex uhd)" + -DENABLE_GR_UTILS="$(usex utils)" + -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}" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_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 + + # Remove incorrectly byte-compiled Python files and replace + find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die + python_optimize +} + +src_test() +{ + virtx cmake-utils_src_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/metadata.xml b/net-wireless/gnuradio/metadata.xml index c1685236ff6..5d03b8a37db 100644 --- a/net-wireless/gnuradio/metadata.xml +++ b/net-wireless/gnuradio/metadata.xml @@ -17,6 +17,7 @@ enable filter signal processing blocks enable GNU Radio Companion graphical tool to design signal processing flow graphs enable logging to console and files + enable modtool for editing GNU Radio modules and components enable NOAA POES HRPT receiver blocks enable pager signal processing blocks enable block performance counters