diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
commit | 70b82ae359a5538711e103b0e8dfb92654296644 (patch) | |
tree | 8412b84ff9ce02a22be5251052b00feefe1d5b70 /net-wireless/gnuradio | |
parent | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff) |
gentoo resync : 27.10.2018
Diffstat (limited to 'net-wireless/gnuradio')
-rw-r--r-- | net-wireless/gnuradio/Manifest | 7 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild (renamed from net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild) | 27 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 41 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-3.8.9999.ebuild | 240 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-9999.ebuild | 66 |
5 files changed, 70 insertions, 311 deletions
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index f065c35c08e9..dc7e794e9167 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -7,8 +7,7 @@ DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c81 DIST gnuradio-3.7.13.4.tar.gz 4546663 BLAKE2B 82ac5fcf0318825dbdb78be3e5a11a8372b0d2f8e12b955a7e13f6f7e885fda8ac31acbc8cb0b81159b124bcda955e4b7b2cb141c8c0d780122abf7dd33b5aa3 SHA512 85c265851b43d4b62590869c91a9b7b262601dce233515096f1a1e68a14ea2710f08cc07859326efdfde29a2f156477d3bbd42e3bdd9b8ac13f6769637bf794b EBUILD gnuradio-3.6.5.1-r2.ebuild 5127 BLAKE2B ad5cb9725f4a3adfc90deac129121d3b17d9db03dea210e9d9bc04b5279eec5276cb216110e88cab5b6cfeb12c1d213198dc9d50b032a21bc88b16a9945a52d0 SHA512 b36955101eee2a2e92388980c470941d2c6aeb7eb58f23158b21da16174e49640fd9332e5e05626307fccc1233fc6149a9baf8211ba1866ec2dbedc85c24831b EBUILD gnuradio-3.7.11-r3.ebuild 6816 BLAKE2B 6232c919c9605dd1e210d5671d754596929015af1ab2d177b5fb562420732648293a39c4810febbafde56306f601c8bf937764f7afeaedc9f18ac7e02765825e SHA512 a1602c8645fa6b1d8789d52197dac54b2899ed9544a8010fb7fa3d5d5ff7c4885fa4f650eda6e2372e90e0546b8c4dd83ebd4e9d7db3afb190b39f918373c133 -EBUILD gnuradio-3.7.13.4.ebuild 7093 BLAKE2B 75240f63afb6e8256621656d218fd72bf4a1d4a8fc57aaff363acdc0e126178f47e5f6478f432aeff7f33ce340c4586460c1f6ca1290bc4f599a6bdb559d9b25 SHA512 9c7e5906de9ff3828f7d9f6a9f396b33b9221a70889874e8e307e0562aee40ed016af605b12eea7edcbf3eee723cc09ec871316b8e980e70ef568cf70fdc25cf -EBUILD gnuradio-3.7.9999.ebuild 6892 BLAKE2B d483025e62de7f2a76e8fd1ac255059d355752e9af67f4067fa6d9e348178ca4ab717c0bf1c679a74a9b62c640abb1087b6277c125270e8a983ab8b5e41a211c SHA512 f414f389868f70a6fc74cdad5b4c1fbc1527a5f6038b93e6b0113dbebeb3de17bb8fec949d9cacfc87a1c94fac26f08e836d60d60462c48ee0f1198969f0adc6 -EBUILD gnuradio-3.8.9999.ebuild 6654 BLAKE2B 2ecf927d0469ecd721e929ba77db619949cac4e11f2a4ee62e292cbcc6ac5c0969d8eae1d01b52f67756e6cc5165cadde94b7907658c950e181dff0107d893d6 SHA512 3a839947f80f483dc6e78b9b453c1f455c4be58a7a67cbf2b116bba7f2364c53485c6695bb236704ff5286fc28310fa8324b6a428b7d55105b393087069e340e -EBUILD gnuradio-9999.ebuild 6927 BLAKE2B 2084fe3db89e86cd65e41714881153a6d03091d0f107e315800768781716adea15518d7ae3eec4a51561dd9e1f8b8992151340a7e1c30cd706b4546d5ae550eb SHA512 d6d8c6f752055e56f7e433636588df5592c4816f38bc1f4f9d626980fa97957a229bfcc8c8b21ead1df6aa434699e6ea4a752cc0fda34f08810df95ddcc98779 +EBUILD gnuradio-3.7.13.4-r2.ebuild 7350 BLAKE2B d94bd0325471ca53108365194b669451383227de44c71de05df10b9d30e7e98e8a31aa1dd70bd6bb8f72f7428a729cd053902c07cda347ac7b344bbc2aa44374 SHA512 0ae1c7d20f253f2eeefad3b1ec79fbe47d9bf3bdd47c611a1979c09786a1a723ef3566cc63401e26d8b699192e52ab607932e4b5448f173ac65b16036d7a7d77 +EBUILD gnuradio-3.7.9999.ebuild 6917 BLAKE2B ad74825e50483a3950aab15788b467e834379e38cd6bab913f67e3a05e9abd4533df01f7878782a06c29be196b7357f52952359b1beeb878f41193f866b2c33c SHA512 1ca495b9bb543bf7879c079e1668155fa805b6fbeef0f6940e9748bb5540453402a770df9c2510cac2b71ad63ff8119234ed54dcb87896d90c819c93d06c83aa +EBUILD gnuradio-9999.ebuild 6955 BLAKE2B 727f4f890202932f02a1c9136b6fbbbf417380cd9ea477d7485f98411656b25ee798b930caf8f65cd0d8f193b69d54dd0811cedd27247617bc663e75606988fa SHA512 e961f10a77bc407eb6be40424f146852ab7a17ac87ead37a45305bcd6aa66038d74550ea4f25795ebaef800111926f7260e94902fd637876154d7fe8557fa0d6 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699 diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild index eb3fe3b2645d..eab46b2eca50 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,9 +23,7 @@ else KEYWORDS="~amd64 ~arm ~x86" fi if [[ ${PV} == "3.7.9999" ]]; then - EGIT_BRANCH="maint" -elif [[ ${PV} == "3.8.9999" ]]; then - EGIT_BRANCH="next" + EGIT_BRANCH="maint-3.7" fi IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" @@ -53,7 +51,7 @@ RDEPEND="${PYTHON_DEPS} >=dev-lang/orc-0.4.12 dev-libs/boost:0=[${PYTHON_USEDEP}] !<=dev-libs/boost-1.52.0-r6:0/1.52 - dev-python/numpy[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] sci-libs/fftw:3.0= alsa? ( @@ -62,9 +60,10 @@ RDEPEND="${PYTHON_DEPS} fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( - dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] + dev-python/cheetah[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] ) jack? ( media-sound/jack-audio-connection-kit @@ -84,12 +83,13 @@ RDEPEND="${PYTHON_DEPS} uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) vocoder? ( media-sound/gsm - >=media-libs/codec2-0.8.1 ) + >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) " @@ -111,7 +111,7 @@ DEPEND="${RDEPEND} src_prepare() { gnome2_environment_reset #534582 - if [[ ${PV} == "3.8.9999" ]]; then + if [[ ${PV} == "9999" ]]; then true else epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch @@ -121,10 +121,15 @@ src_prepare() { epatch "${WORKDIR}"/qt5-maint-00*.patch epatch "${WORKDIR}"/codec2-next-00*.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 + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + cmake-utils_src_prepare } src_configure() { + #zeromq missing deps isn't fatal python_export PYTHON_SITEDIR mycmakeargs=( -DENABLE_DEFAULT=OFF @@ -220,7 +225,6 @@ pkg_postinst() if use grc ; then xdg_desktop_database_update xdg_mimeinfo_database_update - xdg_mime_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ @@ -240,7 +244,6 @@ pkg_postrm() if use grc ; then xdg_desktop_database_update xdg_mimeinfo_database_update - xdg_mime_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ application-gnuradio-grc || ewarn "icon uninstall failed" diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild index ad674115e294..d9ecae20f231 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) CMAKE_BUILD_TYPE="None" -inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils +inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" HOMEPAGE="https://www.gnuradio.org/" @@ -21,9 +21,7 @@ else KEYWORDS="~amd64 ~arm ~x86" fi if [[ ${PV} == "3.7.9999" ]]; then - EGIT_BRANCH="maint" -elif [[ ${PV} == "3.8.9999" ]]; then - EGIT_BRANCH="next" + EGIT_BRANCH="maint-3.7" fi IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" @@ -50,7 +48,8 @@ RDEPEND="${PYTHON_DEPS} >=dev-lang/orc-0.4.12 dev-libs/boost:0=[${PYTHON_USEDEP}] !<=dev-libs/boost-1.52.0-r6:0/1.52 - dev-python/numpy[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= @@ -61,6 +60,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/cheetah[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] ) jack? ( media-sound/jack-audio-connection-kit @@ -72,14 +72,14 @@ RDEPEND="${PYTHON_DEPS} sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - vocoder? ( media-sound/gsm ) + vocoder? ( media-sound/gsm + >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] dev-python/wxpython:3.0[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] ) zeromq? ( >=net-libs/zeromq-2.1.11 ) " @@ -87,7 +87,6 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 - dev-python/cheetah[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 @@ -102,27 +101,24 @@ DEPEND="${RDEPEND} src_prepare() { gnome2_environment_reset #534582 - if [[ ${PV} == "3.8.9999" ]]; then + if [[ ${PV} == "9999" ]]; then true else epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die + + 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 + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + cmake-utils_src_prepare } src_configure() { - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX - #audio provider is still automagic #zeromq missing deps isn't fatal - #remaining QA issues, these appear broken: - #ENABLE_ENABLE_PERFORMANCE_COUNTERS - #ENABLE_GR_AUDIO_ALSA - #ENABLE_GR_AUDIO_JACK - #ENABLE_GR_AUDIO_OSS - #ENABLE_GR_AUDIO_PORTAUDIO - #ENABLE_GR_CORE + python_export PYTHON_SITEDIR mycmakeargs=( -DENABLE_DEFAULT=OFF -DENABLE_GNURADIO_RUNTIME=ON @@ -163,6 +159,7 @@ src_configure() { -DENABLE_GR_CORE=ON -DSYSCONFDIR="${EPREFIX}"/etc -DPYTHON_EXECUTABLE="${PYTHON}" + -DGR_PYTHON_DIR="${PYTHON_SITEDIR}" -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" ) use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) @@ -214,7 +211,7 @@ pkg_postinst() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ @@ -233,7 +230,7 @@ pkg_postrm() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ application-gnuradio-grc || ewarn "icon uninstall failed" diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild deleted file mode 100644 index 8096356bfba8..000000000000 --- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -CMAKE_BUILD_TYPE="None" -inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 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://www.gnuradio.org/cgit/gnuradio.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi -if [[ ${PV} == "3.7.9999" ]]; then - EGIT_BRANCH="maint" -elif [[ ${PV} == "3.8.9999" ]]; then - EGIT_BRANCH="next" -fi - -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - audio? ( || ( alsa oss jack portaudio ) ) - alsa? ( audio ) - oss? ( audio ) - jack? ( audio ) - portaudio? ( audio ) - analog? ( filter ) - digital? ( filter analog ) - dtv? ( fec ) - pager? ( filter analog ) - qt5? ( filter ) - uhd? ( filter analog ) - fcd? ( || ( alsa oss ) ) - wavelet? ( analog ) - wxwidgets? ( filter analog )" - -# bug #348206 -# comedi? ( >=sci-electronics/comedilib-0.8 ) -# 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-1.52.0-r6:0/1.52 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - sci-libs/fftw:3.0= - alsa? ( - media-libs/alsa-lib:= - ) - fcd? ( virtual/libusb:1 ) - filter? ( sci-libs/scipy ) - grc? ( - dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - ) - jack? ( - media-sound/jack-audio-connection-kit - ) - log? ( dev-libs/log4cpp ) - portaudio? ( - >=media-libs/portaudio-19_pre - ) - qt5? ( - dev-python/PyQt5[opengl,${PYTHON_USEDEP}] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - x11-libs/qwt:6[qt5(+)] - ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - vocoder? ( media-sound/gsm ) - wavelet? ( - >=sci-libs/gsl-1.10 - ) - zeromq? ( >=net-libs/zeromq-2.1.11 ) - " - -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - >=dev-lang/swig-3.0.5 - virtual/pkgconfig - doc? ( - >=app-doc/doxygen-1.5.7.1 - dev-python/sphinx[${PYTHON_USEDEP}] - ) - grc? ( x11-misc/xdg-utils ) - oss? ( virtual/os-headers ) - test? ( >=dev-util/cppunit-1.9.14 ) - zeromq? ( net-libs/cppzmq ) -" - -src_prepare() { - gnome2_environment_reset #534582 - - if [[ ${PV} == "3.8.9999" ]]; then - true - else - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch - fi - # Useless UI element would require qt3support, bug #365019 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die - cmake-utils_src_prepare -} - -src_configure() { - python_export PYTHON_SITEDIR - mycmakeargs=( - -DENABLE_DEFAULT=OFF - -DENABLE_GNURADIO_RUNTIME=ON - -DENABLE_VOLK=ON - -DENABLE_PYTHON=ON - -DENABLE_GR_BLOCKS=ON - -DENABLE_GR_FFT=ON - -DENABLE_GR_AUDIO=ON - -DENABLE_GR_AUDIO_ALSA="$(usex alsa)" - -DENABLE_GR_ANALOG="$(usex analog)" - -DENABLE_GR_ATSC="$(usex atsc)" - -DENABLE_GR_CHANNELS="$(usex channels)" - -DENABLE_GR_DIGITAL="$(usex digital)" - -DENABLE_DOXYGEN="$(usex doc)" - -DENABLE_SPHINX="$(usex doc)" - -DENABLE_GR_DTV="$(usex dtv)" - -DENABLE_GR_FCD="$(usex fcd)" - -DENABLE_GR_FEC="$(usex fec)" - -DENABLE_GR_FILTER="$(usex filter)" - -DENABLE_GRC="$(usex grc)" - -DENABLE_GR_AUDIO_JACK="$(usex jack)" - -DENABLE_GR_LOG="$(usex log)" - -DENABLE_GR_NOAA="$(usex noaa)" - -DENABLE_GR_AUDIO_OSS="$(usex oss)" - -DENABLE_GR_PAGER="$(usex pager)" - -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" - -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)" - -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)" - -DDESIRED_QT_VERSION="$(usex qt5 5)" - -DENABLE_GR_VIDEO_SDL="$(usex sdl)" - -DENABLE_GR_ZEROMQ="$(usex zeromq)" - -DENABLE_GR_CORE=ON - -DSYSCONFDIR="${EPREFIX}"/etc - -DPYTHON_EXECUTABLE="${PYTHON}" - -DGR_PYTHON_DIR="${PYTHON_SITEDIR}" - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - ) - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) - 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 - - # We install the mimetypes to the correct locations from the ebuild - 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}/"*.desktop - doicon "${fd_path}/"*.png - fi - - python_fix_shebang "${ED}" -} - -src_test() -{ - ctest -E qtgui -} - -pkg_postinst() -{ - local GRC_ICON_SIZES="32 48 64 128 256" - - if use grc ; then - xdg_desktop_database_update - xdg_mime_database_update - for size in ${GRC_ICON_SIZES} ; do - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ - || die "icon resource installation failed" - xdg-icon-resource install --noupdate --context apps --size ${size} \ - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \ - || die "icon resource installation failed" - done - xdg-icon-resource forceupdate - fi -} - -pkg_postrm() -{ - local GRC_ICON_SIZES="32 48 64 128 256" - - if use grc ; then - xdg_desktop_database_update - xdg_mime_database_update - for size in ${GRC_ICON_SIZES} ; do - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ - application-gnuradio-grc || ewarn "icon uninstall failed" - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \ - gnuradio-grc || ewarn "icon uninstall failed" - - done - xdg-icon-resource forceupdate - fi -} diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index e2920f5cc5fd..d5a75330aee0 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) CMAKE_BUILD_TYPE="None" -inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils +inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" HOMEPAGE="https://www.gnuradio.org/" @@ -22,11 +22,9 @@ else fi if [[ ${PV} == "3.7.9999" ]]; then EGIT_BRANCH="maint" -elif [[ ${PV} == "3.8.9999" ]]; then - EGIT_BRANCH="next" fi -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" +IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) @@ -38,6 +36,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) + qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) @@ -50,8 +49,8 @@ RDEPEND="${PYTHON_DEPS} >=dev-lang/orc-0.4.12 dev-libs/boost:0=[${PYTHON_USEDEP}] !<=dev-libs/boost-1.52.0-r6:0/1.52 - dev-python/mako[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= @@ -59,9 +58,9 @@ RDEPEND="${PYTHON_DEPS} fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( - dev-python/cheetah[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] + dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] ) jack? ( media-sound/jack-audio-connection-kit @@ -70,25 +69,29 @@ RDEPEND="${PYTHON_DEPS} portaudio? ( >=media-libs/portaudio-19_pre ) + qt5? ( + dev-python/PyQt5[opengl,${PYTHON_USEDEP}] + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + x11-libs/qwt:6[qt5(+)] + ) sdl? ( >=media-libs/libsdl-1.2.0 ) - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] ) + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] + dev-libs/log4cpp ) utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - vocoder? ( media-sound/gsm ) + vocoder? ( media-sound/gsm + >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) - wxwidgets? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/wxpython:3.0[${PYTHON_USEDEP}] - ) - zeromq? ( >=net-libs/zeromq-2.1.11 ) + zeromq? ( >=net-libs/zeromq-2.1.11 + dev-libs/gmp:= ) " DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 - dev-python/cheetah[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 @@ -103,27 +106,23 @@ DEPEND="${RDEPEND} src_prepare() { gnome2_environment_reset #534582 - if [[ ${PV} == "3.8.9999" ]]; then + if [[ ${PV} == "9999" ]]; then true else epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch fi # Useless UI element would require qt3support, bug #365019 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die + + 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 + use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake + cmake-utils_src_prepare } src_configure() { - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX - #audio provider is still automagic - #zeromq missing deps isn't fatal - #remaining QA issues, these appear broken: - #ENABLE_ENABLE_PERFORMANCE_COUNTERS - #ENABLE_GR_AUDIO_ALSA - #ENABLE_GR_AUDIO_JACK - #ENABLE_GR_AUDIO_OSS - #ENABLE_GR_AUDIO_PORTAUDIO - #ENABLE_GR_CORE + python_export PYTHON_SITEDIR mycmakeargs=( -DENABLE_DEFAULT=OFF -DENABLE_GNURADIO_RUNTIME=ON @@ -157,13 +156,14 @@ src_configure() { -DENABLE_GR_UTILS="$(usex utils)" -DENABLE_GR_VOCODER="$(usex vocoder)" -DENABLE_GR_WAVELET="$(usex wavelet)" - -DENABLE_GR_WXGUI="$(usex wxwidgets)" - -DENABLE_GR_QTGUI=OFF + -DENABLE_GR_QTGUI="$(usex qt5)" + -DDESIRED_QT_VERSION="$(usex qt5 5)" -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_ZEROMQ="$(usex zeromq)" -DENABLE_GR_CORE=ON -DSYSCONFDIR="${EPREFIX}"/etc -DPYTHON_EXECUTABLE="${PYTHON}" + -DGR_PYTHON_DIR="${PYTHON_SITEDIR}" -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" ) use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE ) @@ -215,7 +215,7 @@ pkg_postinst() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ @@ -234,7 +234,7 @@ pkg_postrm() if use grc ; then xdg_desktop_database_update - xdg_mime_database_update + xdg_mimeinfo_database_update for size in ${GRC_ICON_SIZES} ; do xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ application-gnuradio-grc || ewarn "icon uninstall failed" |