gnuradio-osmosdr: update to 0.1.5.

[skip ci]
This commit is contained in:
bra1nwave 2020-02-01 22:12:38 +01:00 committed by Piraty
parent 8086e1f2fa
commit ddfbc8f69e
4 changed files with 15358 additions and 9 deletions

View File

@ -3181,7 +3181,7 @@ libgnuradio-video-sdl.so.3.8.0 gnuradio-3.8.0.0_1
libgnuradio-vocoder.so.3.8.0 gnuradio-3.8.0.0_1
libgnuradio-wavelet.so.3.8.0 gnuradio-3.8.0.0_1
libgnuradio-uhd.so.3.8.0 gnuradio-3.8.0.0_1
libgnuradio-osmosdr-0.1.4.so.0.0.0 gnuradio-osmosdr-0.1.4_1
libgnuradio-osmosdr-0.1.5.so.0.0.0 gnuradio-osmosdr-0.1.5_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
libvtkChartsCore-8.2.so.1 vtk-8.2.0_1

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,65 @@
From f054c63bd56704b5dd6b144622be9de95ba2ed72 Mon Sep 17 00:00:00 2001
From: "A. Maitland Bottoms" <bottoms@debian.org>
Date: Sun, 1 Dec 2019 17:23:43 -0500
Subject: [PATCH 2/2] find gr38 blocks
---
CMakeLists.txt | 8 ++++----
lib/CMakeLists.txt | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76375dc..0cb94d5 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -112,7 +112,7 @@ ENDIF()
########################################################################
# Install directories
########################################################################
-find_package(Gnuradio REQUIRED) # Side effect of MODULE_PATH getting prepended with system components
+find_package(Gnuradio REQUIRED COMPONENTS blocks) # Side effect of MODULE_PATH getting prepended with system components
list(REVERSE CMAKE_MODULE_PATH)
set(MIN_GR_VERSION "3.8")
if("${Gnuradio_VERSION}" VERSION_LESS MIN_GR_VERSION)
@@ -167,13 +167,13 @@ endif(APPLE)
########################################################################
set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS)
-find_package(gnuradio-blocks PATHS ${GR_PREFIX}/lib/cmake/gnuradio/)
+find_package(gnuradio-blocks PATHS ${Gnuradio_DIR})
message(STATUS "Found Block Block: ${gnuradio-blocks_FOUND}")
-#[[find_package(gnuradio-pmt PATHS ${GR_PREFIX}/lib/cmake/gnuradio/)
+#[[find_package(gnuradio-pmt PATHS ${Gnuradio_DIR})
message(STATUS "Found PMT Block: ${gnuradio-pmt_FOUND}")
-find_package(gnuradio-runtime PATHS ${GR_PREFIX}/lib/cmake/gnuradio/)
+find_package(gnuradio-runtime PATHS ${Gnuradio_DIR})
message(STATUS "Found Runtime Block: ${gnuradio-runtime_FOUND}")
# Software Components part of GNU Radio - These should all be present for a default install
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2171df2..5e3098d 100644
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -137,7 +137,7 @@ endif(ENABLE_OSMOSDR)
########################################################################
# Setup File component
########################################################################
-GR_REGISTER_COMPONENT("IQ File Source & Sink" ENABLE_FILE GNURADIO_BLOCKS_FOUND)
+GR_REGISTER_COMPONENT("IQ File Source & Sink" ENABLE_FILE gnuradio-blocks_FOUND)
if(ENABLE_FILE)
GR_INCLUDE_SUBDIRECTORY(file)
endif(ENABLE_FILE)
@@ -153,7 +153,7 @@ endif(ENABLE_RTL)
########################################################################
# Setup RTL_TCP component
########################################################################
-GR_REGISTER_COMPONENT("RTLSDR TCP Client" ENABLE_RTL_TCP GNURADIO_BLOCKS_FOUND)
+GR_REGISTER_COMPONENT("RTLSDR TCP Client" ENABLE_RTL_TCP gnuradio-blocks_FOUND)
if(ENABLE_RTL_TCP)
GR_INCLUDE_SUBDIRECTORY(rtl_tcp)
endif(ENABLE_RTL_TCP)
--
2.20.1

View File

@ -1,19 +1,19 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.1.4
revision=7
version=0.1.5
revision=1
wrksrc="gr-osmosdr-${version}"
build_style=cmake
pycompile_module="osmosdr"
hostmakedepends="pkg-config python-cheetah swig"
makedepends="boost-devel gnuradio-devel libairspy-devel libhackrf-devel librtlsdr-devel
python-devel uhd-devel"
hostmakedepends="pkg-config swig"
makedepends="boost-devel gnuradio-devel libairspy-devel libhackrf-devel
librtlsdr-devel python3-devel uhd-devel log4cpp-devel mpir-devel
SoapySDR-devel volk-devel"
short_desc="GNU Radio source block for rtlsdr, hackrf and airspy"
maintainer="bra1nwave <brainwave@openmailbox.org>"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://sdr.osmocom.org/trac/"
distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz"
checksum=bcf9a9b1760e667c41a354e8cd41ef911d0929d5e4a18e0594ccb3320d735066
checksum=a5820e80465d895a9b4b73e0ff01924d6b612a9a390bbd3488177379a9539d00
gnuradio-osmosdr-devel_package() {
short_desc+=" - development files"
@ -21,6 +21,7 @@ gnuradio-osmosdr-devel_package() {
pkg_install() {
vmove usr/include
vmove "usr/lib/*.so"
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
}
}