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 AA8E11382C5 for ; Mon, 19 Feb 2018 17:29:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19E1FE0BFD; Mon, 19 Feb 2018 17:29:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D913DE0BFD for ; Mon, 19 Feb 2018 17:29:36 +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 864A1335C30 for ; Mon, 19 Feb 2018 17:29:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80BCC23F for ; Mon, 19 Feb 2018 17:29:32 +0000 (UTC) From: "Richard 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, "Richard Farina" Message-ID: <1519061365.f929c88a71e18663f11ffbf87216016dae32b526.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gr-osmosdr/Manifest net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild net-wireless/gr-osmosdr/metadata.xml X-VCS-Directories: net-wireless/gr-osmosdr/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: f929c88a71e18663f11ffbf87216016dae32b526 X-VCS-Branch: master Date: Mon, 19 Feb 2018 17:29:32 +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-Archives-Salt: a71cd90a-a382-4852-a8c7-61d73fc71bbf X-Archives-Hash: bdc20b0f4c6ec1a535d02eb2b1582743 commit: f929c88a71e18663f11ffbf87216016dae32b526 Author: Zero_Chaos gentoo org> AuthorDate: Mon Feb 19 16:52:08 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Mon Feb 19 17:29:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f929c88a net-wireless/gr-osmosdr: add soapy backend bump, minor updates Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-wireless/gr-osmosdr/Manifest | 2 +- .../gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild | 3 +- ....4.ebuild => gr-osmosdr-0.1.4_p20170612.ebuild} | 40 ++++++++++++---------- net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild | 34 +++++++++--------- net-wireless/gr-osmosdr/metadata.xml | 1 + 5 files changed, 42 insertions(+), 38 deletions(-) diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest index 81784e2b4ec..8ca6ce87462 100644 --- a/net-wireless/gr-osmosdr/Manifest +++ b/net-wireless/gr-osmosdr/Manifest @@ -1,2 +1,2 @@ -DIST gr-osmosdr-0.1.4.tar.xz 141500 BLAKE2B 1e65d59440cd4beadcb54e6c20cb38b2ad222811348475ac9a7109971b64bbdc11991f6b4e7f0de1fba79f6eddba9befedf9a0a3903211cbae7581f99a13bd40 SHA512 930a7f6065fba709fb770fd373f0fe7eba13abf09e49f6e839718d547ce69176d93d89d1b037ee3f0cdffda7060ac6c9ff4023dc835ec50ef456d51d383046ab DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 BLAKE2B ff5f27dc32438c94ac920e77e7722b3a4331c350b0535a8a787b72ad8653f57dc2a434c3dec9499bbe791e12dc863323c8f9f6c750b2c154ab35ed722e8e221f SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9 +DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933 diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild index 417f9cbdcf4..b6d21d3f25c 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -29,6 +29,7 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] + ../gr-osmosdr-${PV}.tar.xz - SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd" +IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] + =net-wireless/rtl-sdr-0.5.3:= ) + soapy? ( net-wireless/soapysdr ) uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} dev-python/cheetah" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -src_prepare() { - epatch_user -} - src_configure() { local mycmakeargs=( -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" -DENABLE_FILE=ON - $(cmake-utils_use_enable bladerf) - $(cmake-utils_use_enable fcd) - $(cmake-utils_use_enable hackrf) - $(cmake-utils_use_enable iqbalance) - $(cmake-utils_use_enable mirisdr MIRI) - $(cmake-utils_use_enable python) - $(cmake-utils_use_enable rtlsdr RTL) - $(cmake-utils_use_enable rtlsdr RTL_TCP) - $(cmake-utils_use_enable uhd) + -DENABLE_BLADERF="$(usex bladerf)" + -DENABLE_FCD="$(usex fcd)" + -DENABLE_HACKRF="$(usex hackrf)" + -DENABLE_IQBALANCE="$(usex iqbalance)" + -DENABLE_MIRI="$(usex mirisdr)" + -DENABLE_PYTHON="$(usex python)" + -DENABLE_RTL="$(usex rtlsdr)" + -DENABLE_RTL_TCP="$(usex rtlsdr)" + -DENABLE_SOAPY="$(usex soapy)" + -DENABLE_UHD="$(usex uhd)" ) cmake-utils_src_configure @@ -65,5 +65,7 @@ src_configure() { src_install() { cmake-utils_src_install - python_fix_shebang "${ED}"/usr/bin + if use python; then + python_fix_shebang "${ED}"/usr/bin + fi } diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild index 8c05c70733f..86677af90ca 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) inherit cmake-utils python-single-r1 @@ -15,49 +15,49 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" KEYWORDS="" else + #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz" #git clone git://git.osmocom.org/gr-osmosdr.git #cd gr-osmosdr #git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz - SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz" + SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd" +IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}] + =net-wireless/rtl-sdr-0.5.3:= ) + soapy? ( net-wireless/soapysdr ) uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} dev-python/cheetah" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -src_prepare() { - epatch_user -} - src_configure() { local mycmakeargs=( -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" -DENABLE_FILE=ON - $(cmake-utils_use_enable bladerf) - $(cmake-utils_use_enable fcd) - $(cmake-utils_use_enable hackrf) - $(cmake-utils_use_enable iqbalance) - $(cmake-utils_use_enable mirisdr MIRI) - $(cmake-utils_use_enable python) - $(cmake-utils_use_enable rtlsdr RTL) - $(cmake-utils_use_enable rtlsdr RTL_TCP) - $(cmake-utils_use_enable uhd) + -DENABLE_BLADERF="$(usex bladerf)" + -DENABLE_FCD="$(usex fcd)" + -DENABLE_HACKRF="$(usex hackrf)" + -DENABLE_IQBALANCE="$(usex iqbalance)" + -DENABLE_MIRI="$(usex mirisdr)" + -DENABLE_PYTHON="$(usex python)" + -DENABLE_RTL="$(usex rtlsdr)" + -DENABLE_RTL_TCP="$(usex rtlsdr)" + -DENABLE_SOAPY="$(usex soapy)" + -DENABLE_UHD="$(usex uhd)" ) cmake-utils_src_configure diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml index e8e448711ac..9dc2a893a65 100644 --- a/net-wireless/gr-osmosdr/metadata.xml +++ b/net-wireless/gr-osmosdr/metadata.xml @@ -12,6 +12,7 @@ Enable support for I/Q balancing using gr-iqbal Build with Mirics MSi2500 + MSi001 SDR support Build with Realtek RTL2832U (rtlsdr) support + Build with SoapySDR support Build with Ettus Research USRP Hardware Driver support