diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2020-12-18 15:20:06 -0500 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2020-12-18 15:20:12 -0500 |
| commit | 90142d8be10923b2c1b0c2a055b28fe8027c6f5b (patch) | |
| tree | 90868e0a0a3ca4a448093981c575a25890de6451 /net-wireless | |
| parent | profiles/arch/arm/package.use.mask: mask xtrx for testing (diff) | |
| download | gentoo-90142d8be10923b2c1b0c2a055b28fe8027c6f5b.tar.gz gentoo-90142d8be10923b2c1b0c2a055b28fe8027c6f5b.tar.bz2 gentoo-90142d8be10923b2c1b0c2a055b28fe8027c6f5b.zip | |
net-wireless/gr-osmosdr: fix xtrx support
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch | 23 | ||||
| -rw-r--r-- | net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild | 11 | ||||
| -rw-r--r-- | 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 000000000000..7699c81fed32 --- /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 <code@hacktheinter.net> +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 33c1a0233fa8..127e46a60320 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 39125bb505e6..cc8249dcdf23 100644 --- a/net-wireless/gr-osmosdr/metadata.xml +++ b/net-wireless/gr-osmosdr/metadata.xml @@ -15,5 +15,6 @@ <flag name="sdrplay">Enable support for SDRplay devices through <pkg>net-wireless/sdrplay</pkg></flag> <flag name="soapy">Build with SoapySDR support</flag> <flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag> + <flag name="xtrx">Build with xtrx Hardware Driver support</flag> </use> </pkgmetadata> |