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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86AAD158021 for ; Mon, 19 Dec 2022 18:56:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FBCCE0ACD; Mon, 19 Dec 2022 18:56:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74A35E0ACD for ; Mon, 19 Dec 2022 18:56:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D8123416C1 for ; Mon, 19 Dec 2022 18:56:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 021F07D3 for ; Mon, 19 Dec 2022 18:56:45 +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: <1671476204.e05c5263476cef38314fbc701bcfba562b7a18cc.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.10.5.0.ebuild net-wireless/gnuradio/gnuradio-9999.ebuild X-VCS-Directories: net-wireless/gnuradio/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: e05c5263476cef38314fbc701bcfba562b7a18cc X-VCS-Branch: master Date: Mon, 19 Dec 2022 18:56:45 +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: 3dbf17dc-4479-4b23-bf3a-2ae84afea44c X-Archives-Hash: e33acf379fb4a982f28be7ed6d504ea7 commit: e05c5263476cef38314fbc701bcfba562b7a18cc Author: Rick Farina gentoo org> AuthorDate: Mon Dec 19 18:40:43 2022 +0000 Commit: Rick Farina gentoo org> CommitDate: Mon Dec 19 18:56:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e05c5263 net-wireless/gnuradio: bump to 3.10.5.0 Additionally harmonize 3.10.5.0 and 9999 Signed-off-by: Rick Farina gentoo.org> net-wireless/gnuradio/Manifest | 1 + .../{gnuradio-9999.ebuild => gnuradio-3.10.5.0.ebuild} | 15 ++++++++++----- net-wireless/gnuradio/gnuradio-9999.ebuild | 11 ++++++----- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 67c617a80990..458c3a73b80a 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,2 +1,3 @@ DIST gnuradio-3.10.3.0.tar.gz 4376594 BLAKE2B 676c16dda6c4b01ca922fe942e1572653c57dd8f6240ad74af2b10351470ad53ecc5c4a7347e04cb1c898388c48f561f7871c39140f77c50f9217963355793a6 SHA512 fe4cd2204257b65129f148bbdd6a1c192559b8824a131bd99cc2ac854e1880ee4fa07b702170452b3b6070df34d99db27ef0fe064c50e6e5a6335e61e38e6645 DIST gnuradio-3.10.4.0.tar.gz 4392284 BLAKE2B 2a5766708534966bcea1e1ab57ae703b0b453278da5042c65ddcf5bda39dee084ee8f77d414e2c8ab3eae2397680f7591c456404a6cefc08b28a7d1f5d25534d SHA512 a8690016513df3928cb2f63eef190c7306bc3cc452dfeafab2e47b43aa1dd3f61515df49832e99530535f94deabfb614388a27212b09e1c816782f3fdd4915eb +DIST gnuradio-3.10.5.0.tar.gz 4368231 BLAKE2B c21e310d4cc50112e7d2085be5a82f4eb633305936004cc60cabbac340a0cbd0016bb5f24229380c36281c4e52e6763c5152ceb6ad0f2efc43bd28b2b55c4df8 SHA512 82f3028cbcb0175f9f354b19613ee59b052881b894c6d668d04235acda2e3be0ca2713642141a917264e70039f23795c647c47364af9ffad63f108da517d77c5 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-3.10.5.0.ebuild similarity index 97% copy from net-wireless/gnuradio/gnuradio-9999.ebuild copy to net-wireless/gnuradio/gnuradio-3.10.5.0.ebuild index c52a5e2a707c..373ea59a99f5 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.5.0.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} =~ "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + 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" @@ -48,8 +48,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') dev-libs/log4cpp:= - $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') $(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:= @@ -119,7 +120,6 @@ DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.2 $(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 @@ -131,6 +131,10 @@ DEPEND="${RDEPEND} zeromq? ( net-libs/cppzmq ) " +PATCHES=( + "${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659 +) + src_prepare() { xdg_environment_reset #534582 @@ -161,12 +165,13 @@ src_configure() { -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_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)" diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index c52a5e2a707c..9ebe5272423a 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} =~ "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + 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" @@ -48,8 +48,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') dev-libs/log4cpp:= - $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') $(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:= @@ -119,7 +120,6 @@ DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.2 $(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 @@ -161,12 +161,13 @@ src_configure() { -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_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)"