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 BB9C513835A for ; Fri, 18 Dec 2020 20:20:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BEB8E0936; Fri, 18 Dec 2020 20:20:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D9A4BE092B for ; Fri, 18 Dec 2020 20:20:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A6B3C340CC3 for ; Fri, 18 Dec 2020 20:20:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13880BF for ; Fri, 18 Dec 2020 20:20:14 +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: <1608322812.90142d8be10923b2c1b0c2a055b28fe8027c6f5b.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/, net-wireless/gr-osmosdr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild net-wireless/gr-osmosdr/metadata.xml X-VCS-Directories: net-wireless/gr-osmosdr/files/ net-wireless/gr-osmosdr/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 90142d8be10923b2c1b0c2a055b28fe8027c6f5b X-VCS-Branch: master Date: Fri, 18 Dec 2020 20:20:14 +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: 9349a146-f099-4249-891b-e23fee652a8c X-Archives-Hash: 85a410a3e01727e7b78e6b2c8c83f031 commit: 90142d8be10923b2c1b0c2a055b28fe8027c6f5b Author: Rick Farina gentoo org> AuthorDate: Fri Dec 18 20:20:06 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Fri Dec 18 20:20:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90142d8b net-wireless/gr-osmosdr: fix xtrx support Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Rick Farina gentoo.org> .../gr-osmosdr-0.2.3-use_xtrx_open_string.patch | 23 ++++++++++++++++++++++ net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild | 11 +++++++---- net-wireless/gr-osmosdr/metadata.xml | 1 + 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch new file mode 100644 index 00000000000..7699c81fed3 --- /dev/null +++ b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch @@ -0,0 +1,23 @@ +From ecca19615c588f771a131432f7161156efc274c2 Mon Sep 17 00:00:00 2001 +From: lain +Date: Tue, 30 Jul 2019 15:59:38 -0700 +Subject: [PATCH] Quick patch to use xtrx_open_string() instead of the removed + xtrx_open_list(). + +--- + lib/xtrx/xtrx_obj.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/xtrx/xtrx_obj.cc b/lib/xtrx/xtrx_obj.cc +index 1d58de5..5c73259 100644 +--- a/lib/xtrx/xtrx_obj.cc ++++ b/lib/xtrx/xtrx_obj.cc +@@ -68,7 +68,7 @@ xtrx_obj::xtrx_obj(const std::string &path, unsigned loglevel, bool lmsreset) + unsigned xtrxflag = (loglevel & XTRX_O_LOGLVL_MASK) | ((lmsreset) ? XTRX_O_RESET : 0); + std::cerr << "xtrx_obj::xtrx_obj = " << xtrxflag << std::endl; + +- int res = xtrx_open_list(path.c_str(), NULL, &_obj); ++ int res = xtrx_open_string(path.c_str(), &_obj); + if (res < 0) { + std::stringstream message; + message << "Couldn't open " ": Error: " << -res; diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild index 33c1a0233fa..127e46a6032 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild @@ -19,9 +19,8 @@ fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd" +IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx" -#xtrx? ( net-wireless/libxtrx ) RDEPEND="${PYTHON_DEPS} dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] @@ -34,13 +33,17 @@ RDEPEND="${PYTHON_DEPS} sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) + xtrx? ( net-wireless/libxtrx ) " DEPEND="${RDEPEND}" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +PATCHES=( + "${FILESDIR}/${P}-use_xtrx_open_string.patch" +) + src_configure() { - #-DENABLE_XTRX="$(usex xtrx ON OFF)" local mycmakeargs=( -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" @@ -56,7 +59,7 @@ src_configure() { -DENABLE_NONFREE="$(usex sdrplay ON OFF)" -DENABLE_SOAPY="$(usex soapy ON OFF)" -DENABLE_UHD="$(usex uhd ON OFF)" - -DENABLE_XTRX=OFF + -DENABLE_XTRX="$(usex xtrx ON OFF)" ) cmake_src_configure diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml index 39125bb505e..cc8249dcdf2 100644 --- a/net-wireless/gr-osmosdr/metadata.xml +++ b/net-wireless/gr-osmosdr/metadata.xml @@ -15,5 +15,6 @@ Enable support for SDRplay devices through net-wireless/sdrplay Build with SoapySDR support Build with Ettus Research USRP Hardware Driver support + Build with xtrx Hardware Driver support