Update gr-osmosdr

Signed-off-by: Daniel Solano <gentoo@sattvik.com>

3 files changed, 103 insertions, 0 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index d18885d..3c12042 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,3 +1,6 @@
+AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0
 DIST gr-osmosdr-0.2.2.tar.gz 251425 BLAKE2B e1e29280b84139bf4b1b25ee35553f48abe7f26f9f240852c25f883ec6df406157d9b734035fd6df87e50b6d6f8ddab679ea91430558716acba05a9a64844c3d SHA512 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
+DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e
 EBUILD gr-osmosdr-0.2.2.ebuild 2284 BLAKE2B cba311447b2e5666576f1d387544b70967cbed843220dcac8b3fa520c093deb20fc7d6dcb385f6619c98373f60f508aa926e1282f8e4f88c3b835755338104d7 SHA512 9c75345155becb12dcf9c3f7bef5adb9ed39106d7b57c27fb21f70a10f4dd68cbcfee9c8abf201bacf57cc0d99a4c05378b1a669ac4bb56ce7b907963b320f18
+EBUILD gr-osmosdr-0.2.3.ebuild 2171 BLAKE2B 11812df348a6467744ed86f3d4b44d2210c8617a0152b19013b3053fc3accb1b85f3b19611a3d6bd65d43e5f82690ff0a242baa169c58170940f4eaedd60c91c SHA512 9eb3b0c8a9a6bb2085d34c9c5992493b050fa12501393f93b5125c82100c224a90e4930f43d90db9c27f9d154c7101635422cfbb625a751564172fcb775a6c3d
 MISC metadata.xml 966 BLAKE2B 595706a67912f5319f6e11af4606b35bd377e7c2c2de9f351a9ba5f26d78356777805ff69afc23d69b3e98702b01a474acd20cdb90a71803773eac4f4374cdf8 SHA512 ed6d21555de8b2569952c338110d1f6b5c7cb9f577c74a8f68eca60f564d4446692785a9f2510d75d17d5a23b288f1a5716a85f31df8793d0305eedb77b574e2
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 0000000..7699c81
--- /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
new file mode 100644
index 0000000..f6de6d7
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
+else
+	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/volk:=
+	airspy? ( net-wireless/airspy )
+	airspyhf? ( net-wireless/airspyhf )
+	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
+	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() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
+		-DENABLE_AIRSPYHF="$(usex airspyhf)"
+		-DENABLE_BLADERF="$(usex bladerf ON OFF)"
+		-DENABLE_HACKRF="$(usex hackrf ON OFF)"
+		-DENABLE_IQBALANCE="$(usex iqbalance ON OFF)"
+		-DENABLE_PYTHON="$(usex python ON OFF)"
+		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
+		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
+		-DENABLE_NONFREE="$(usex sdrplay ON OFF)"
+		-DENABLE_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_UHD="$(usex uhd ON OFF)"
+		-DENABLE_XTRX="$(usex xtrx ON OFF)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+		python_optimize
+	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}