[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/, net-wireless/gr-osmosdr/files/
commit: 3bf04c51cb976faec35dbecdbb99a544b9d2282c
Author: Thomas Beierlein gentoo org>
AuthorDate: Mon Aug 29 12:02:58 2022 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Mon Aug 29 12:03:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf04c51
net-wireless/gr-osmosdr: Fix build without python bindings
Closes: https://bugs.gentoo.org/865807
Signed-off-by: Thomas Beierlein gentoo.org>
.../gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch| 15 +++
net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild | 6 +-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git
a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch
b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch
new file mode 100644
index ..2bf79b1fe20e
--- /dev/null
+++
b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96a2c90..a3836f8 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -187,9 +187,7 @@ find_package(Doxygen)
+
+ # Python
+ ##
+-
+-find_package(PythonLibs 3)
+-find_package(pybind11)
++include(GrPybind)
+
+ GR_REGISTER_COMPONENT("Python support" ENABLE_PYTHON
+ PYTHONLIBS_FOUND
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
index 518b27caa2a1..a481ca03c6f3 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild
@@ -44,6 +44,10 @@ DEPEND="${RDEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-enable-python.patch
+)
+
src_configure() {
local mycmakeargs=(
-DENABLE_DEFAULT=OFF
@@ -69,7 +73,7 @@ src_configure() {
src_install() {
cmake_src_install
if use python; then
- find "${D}" -name '*.py[oc]' -delete || die
+ find "${ED}" -name '*.py[oc]' -delete || die
python_fix_shebang "${ED}"/usr/bin
python_optimize
fi
[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/, net-wireless/gr-osmosdr/files/
commit: 90142d8be10923b2c1b0c2a055b28fe8027c6f5b
Author: Rick Farina gentoo org>
AuthorDate: Fri Dec 18 20:20:06 2020 +
Commit: Rick Farina gentoo org>
CommitDate: Fri Dec 18 20:20:12 2020 +
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 000..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 , 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
[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/, net-wireless/gr-osmosdr/files/
commit: 95d69b572c7e58574d352f7bec3b2f56af485a48
Author: Rick Farina gentoo org>
AuthorDate: Sat May 30 02:51:56 2020 +
Commit: Rick Farina gentoo org>
CommitDate: Mon Jun 1 20:43:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d69b57
net-wireless/gr-osmosdr: bump
prep for gr3.8
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Rick Farina gentoo.org>
net-wireless/gr-osmosdr/Manifest | 2 +-
net-wireless/gr-osmosdr/files/csete-iio.patch | 640 -
...sdr-0.1.5.ebuild => gr-osmosdr-0.1.5-r1.ebuild} | 2 +-
...p20180626-r5.ebuild => gr-osmosdr-0.2.0.ebuild} | 31 +-
net-wireless/gr-osmosdr/gr-osmosdr-.ebuild | 10 +-
net-wireless/gr-osmosdr/metadata.xml | 1 -
6 files changed, 16 insertions(+), 670 deletions(-)
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index f79d0e5e0b5..5a85526c102 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,2 +1,2 @@
-DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B
223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda
SHA512
8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B
f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b
SHA512
5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
+DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B
036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1
SHA512
96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
diff --git a/net-wireless/gr-osmosdr/files/csete-iio.patch
b/net-wireless/gr-osmosdr/files/csete-iio.patch
deleted file mode 100644
index 678a8599d05..000
--- a/net-wireless/gr-osmosdr/files/csete-iio.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-From 0eaf819be8a40896dfc3d810685a609a867a42e9 Mon Sep 17 00:00:00 2001
-From: Alexandru Csete
-Date: Mon, 13 Feb 2017 01:05:50 +0100
-Subject: [PATCH] Add PlutoSDR source through gr-iio
-
- CMakeLists.txt | 1 +
- cmake/Modules/FindGnuradioIIO.cmake | 34
- cmake/Modules/FindIIO.cmake | 28 +++
- lib/CMakeLists.txt | 8 +
- lib/config.h.in | 1 +
- lib/device.cc | 8 +
- lib/plutosdr/CMakeLists.txt | 39 +
- lib/plutosdr/plutosdr_source_c.cc | 262
- lib/plutosdr/plutosdr_source_c.h| 105 +++
- lib/source_impl.cc | 18 ++
- 10 files changed, 504 insertions(+)
- create mode 100644 cmake/Modules/FindGnuradioIIO.cmake
- create mode 100644 cmake/Modules/FindIIO.cmake
- create mode 100644 lib/plutosdr/CMakeLists.txt
- create mode 100644 lib/plutosdr/plutosdr_source_c.cc
- create mode 100644 lib/plutosdr/plutosdr_source_c.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 296456d..7871f39 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -159,6 +159,7 @@ endif()
- find_package(GnuradioIQBalance)
- find_package(UHD)
- find_package(GnuradioUHD)
-+find_package(GnuradioIIO)
- find_package(GnuradioFCD)
- find_package(GnuradioFCDPP)
- find_package(LibOsmoSDR)
-diff --git a/cmake/Modules/FindGnuradioIIO.cmake
b/cmake/Modules/FindGnuradioIIO.cmake
-new file mode 100644
-index 000..d3c011a
/dev/null
-+++ b/cmake/Modules/FindGnuradioIIO.cmake
-@@ -0,0 +1,34 @@
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_GNURADIO_IIO gnuradio-iio)
-+
-+FIND_PATH(
-+GNURADIO_IIO_INCLUDE_DIRS
-+NAMES gnuradio/iio/api.h
-+HINTS $ENV{GNURADIO_IIO_DIR}/include
-+${PC_GNURADIO_IIO_INCLUDEDIR}
-+PATHS /usr/local/include
-+ /usr/include
-+)
-+
-+FIND_LIBRARY(
-+GNURADIO_IIO_LIBRARIES
-+NAMES gnuradio-iio
-+HINTS $ENV{GNURADIO_IIO_DIR}/lib
-+${PC_GNURADIO_IIO_LIBDIR}
-+PATHS /usr/local/lib
-+ /usr/local/lib64
-+ /usr/lib
-+ /usr/lib64
-+)
-+
-+if(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+ set(GNURADIO_IIO_FOUND TRUE CACHE INTERNAL "gnuradio-iio found")
-+ message(STATUS "Found gnuradio-iio: ${GNURADIO_IIO_INCLUDE_DIRS},
${GNURADIO_IIO_LIBRARIES}")
-+else(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+ set(GNURADIO_IIO_FOUND FALSE CACHE INTERNAL "gnuradio-iio found")
-+ message(STATUS "gnuradio-iio not found.")
-+endif(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_IIO DEFAULT_MSG
GNURADIO_IIO_LIBRARIES
[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/, net-wireless/gr-osmosdr/files/
commit: 51b987a494bc696c6c2390f39c530ea61f6f0fcf
Author: Zero_Chaos gentoo org>
AuthorDate: Wed Sep 5 02:38:33 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Wed Sep 5 02:38:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b987a4
net-wireless/gr-osmosdr: adding pluto support
with no keywords for right now, just to see what happens with
https://github.com/csete/gr-osmosdr-gqrx/issues/10
Package-Manager: Portage-2.3.48, Repoman-2.3.10
net-wireless/gr-osmosdr/files/csete-iio.patch | 640 +
.../gr-osmosdr-0.1.4_p20180626-r1.ebuild | 80 +++
net-wireless/gr-osmosdr/metadata.xml | 1 +
3 files changed, 721 insertions(+)
diff --git a/net-wireless/gr-osmosdr/files/csete-iio.patch
b/net-wireless/gr-osmosdr/files/csete-iio.patch
new file mode 100644
index 000..678a8599d05
--- /dev/null
+++ b/net-wireless/gr-osmosdr/files/csete-iio.patch
@@ -0,0 +1,640 @@
+From 0eaf819be8a40896dfc3d810685a609a867a42e9 Mon Sep 17 00:00:00 2001
+From: Alexandru Csete
+Date: Mon, 13 Feb 2017 01:05:50 +0100
+Subject: [PATCH] Add PlutoSDR source through gr-iio
+
+---
+ CMakeLists.txt | 1 +
+ cmake/Modules/FindGnuradioIIO.cmake | 34
+ cmake/Modules/FindIIO.cmake | 28 +++
+ lib/CMakeLists.txt | 8 +
+ lib/config.h.in | 1 +
+ lib/device.cc | 8 +
+ lib/plutosdr/CMakeLists.txt | 39 +
+ lib/plutosdr/plutosdr_source_c.cc | 262
+ lib/plutosdr/plutosdr_source_c.h| 105 +++
+ lib/source_impl.cc | 18 ++
+ 10 files changed, 504 insertions(+)
+ create mode 100644 cmake/Modules/FindGnuradioIIO.cmake
+ create mode 100644 cmake/Modules/FindIIO.cmake
+ create mode 100644 lib/plutosdr/CMakeLists.txt
+ create mode 100644 lib/plutosdr/plutosdr_source_c.cc
+ create mode 100644 lib/plutosdr/plutosdr_source_c.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 296456d..7871f39 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -159,6 +159,7 @@ endif()
+ find_package(GnuradioIQBalance)
+ find_package(UHD)
+ find_package(GnuradioUHD)
++find_package(GnuradioIIO)
+ find_package(GnuradioFCD)
+ find_package(GnuradioFCDPP)
+ find_package(LibOsmoSDR)
+diff --git a/cmake/Modules/FindGnuradioIIO.cmake
b/cmake/Modules/FindGnuradioIIO.cmake
+new file mode 100644
+index 000..d3c011a
+--- /dev/null
b/cmake/Modules/FindGnuradioIIO.cmake
+@@ -0,0 +1,34 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_GNURADIO_IIO gnuradio-iio)
++
++FIND_PATH(
++GNURADIO_IIO_INCLUDE_DIRS
++NAMES gnuradio/iio/api.h
++HINTS $ENV{GNURADIO_IIO_DIR}/include
++${PC_GNURADIO_IIO_INCLUDEDIR}
++PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++GNURADIO_IIO_LIBRARIES
++NAMES gnuradio-iio
++HINTS $ENV{GNURADIO_IIO_DIR}/lib
++${PC_GNURADIO_IIO_LIBDIR}
++PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++if(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
++ set(GNURADIO_IIO_FOUND TRUE CACHE INTERNAL "gnuradio-iio found")
++ message(STATUS "Found gnuradio-iio: ${GNURADIO_IIO_INCLUDE_DIRS},
${GNURADIO_IIO_LIBRARIES}")
++else(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
++ set(GNURADIO_IIO_FOUND FALSE CACHE INTERNAL "gnuradio-iio found")
++ message(STATUS "gnuradio-iio not found.")
++endif(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_IIO DEFAULT_MSG
GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
++MARK_AS_ADVANCED(GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
+diff --git a/cmake/Modules/FindIIO.cmake b/cmake/Modules/FindIIO.cmake
+new file mode 100644
+index 000..bb87a4b
+--- /dev/null
b/cmake/Modules/FindIIO.cmake
+@@ -0,0 +1,28 @@
++
++# Find the IIO userspace library
++
++
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_IIO iio)
++
++FIND_PATH(
++IIO_INCLUDE_DIRS
++NAMES iio.h
++HINTS $ENV{IIO_DIR}/include
++${PC_IIO_INCLUDEDIR}
++PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++IIO_LIBRARIES
++NAMES iio
++HINTS $ENV{IIO_DIR}/lib
++${PC_IIO_LIBDIR}
++PATHS /usr/local/lib
++ /usr/lib
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(IIO DEFAULT_MSG IIO_LIBRARIES
IIO_INCLUDE_DIRS)
++MARK_AS_ADVANCED(IIO_LIBRARIES IIO_INCLUDE_DIRS)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index c05b8d9..936d84b 100644
+--- a/lib/CMakeLists.txt
b/lib/CMakeLists.txt
+@@ -174,6 +174,14 @@ if(ENABLE_UHD)
+ GR_INCLUDE_SUBDIRECTORY(uhd)
+ endif(ENABLE_UHD)
+
