gr-osmosdr: update to 0.2.0 for gnuradio-3.8

This commit is contained in:
Tobias Nygren 2020-08-02 13:24:54 +02:00
parent b2a1610957
commit cd5e456f7b
7 changed files with 82 additions and 22 deletions

View File

@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:57 adam Exp $
# $NetBSD: Makefile,v 1.24 2020/05/06 14:04:43 adam Exp $
DISTNAME= gr-osmosdr-0.1.4
PKGREVISION= 15
DISTNAME= gr-osmosdr-0.2.0
CATEGORIES= ham
MASTER_SITES+= http://git.osmocom.org/gr-osmosdr/snapshot/
# main git repo doesn't allow snapshots to be downloaded
#MASTER_SITES= https://git.osmocom.org/gr-osmosdr/snapshot/
MASTER_SITES= ${MASTER_SITE_GITHUB:=osmocom/}
GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://git.osmocom.org/gr-osmosdr
@ -19,11 +21,12 @@ CMAKE_ARGS+= -Wno-dev
# -- * Ettus USRP Devices
CMAKE_ARGS+= -DGNURADIO_UHD_INCLUDE_DIRS=${PREFIX}/include/uhd
CMAKE_ARGS+= -DGNURADIO_BLOCKS_INCLUDE_DIRS=${PREFIX}/include
# TODO: make it PKG_OPTION
CMAKE_ARGS+= -DENABLE_DOXYGEN=OFF
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
# Python 36 and 37 result in build errors; 27 builds ok.
PYTHON_VERSIONS_ACCEPTED= 27
PYTHON_VERSIONS_ACCEPTED= 37
REPLACE_PYTHON+= apps/osmocom_siggen_base.py
.include "../../devel/boost-headers/buildlink3.mk"
@ -44,9 +47,10 @@ REPLACE_PYTHON+= apps/osmocom_siggen_base.py
# gr-fcdproplus does not build at the moment
#.include "../../ham/gr-fcdproplus/buildlink3.mk"
.include "../../ham/hackrf/buildlink3.mk"
.include "../../ham/soapy-sdr/buildlink3.mk"
.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../ham/gnuradio-fcd/buildlink3.mk"
.include "../../ham/gnuradio-uhd/buildlink3.mk"
BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.8
.include "../../wip/gnuradio-core/buildlink3.mk"
.include "../../wip/gnuradio-uhd/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View File

@ -1,6 +1,5 @@
@comment $NetBSD: PLIST,v 1.1 2014/10/13 13:00:27 mef Exp $
@comment $NetBSD$
bin/osmocom_fft
bin/osmocom_siggen
bin/osmocom_siggen_nogui
bin/osmocom_spectrum_sense
include/osmosdr/api.h
@ -11,9 +10,13 @@ include/osmosdr/sink.h
include/osmosdr/source.h
include/osmosdr/swig/osmosdr_swig.i
include/osmosdr/swig/osmosdr_swig_doc.i
include/osmosdr/time_spec.h
lib/cmake/osmosdr/gnuradio-osmosdrConfig.cmake
lib/cmake/osmosdr/gnuradio-osmosdrTargets-release.cmake
lib/cmake/osmosdr/gnuradio-osmosdrTargets.cmake
lib/libgnuradio-osmosdr.so
lib/libgnuradio-osmosdr.so.${PKGVERSION}
lib/pkgconfig/gnuradio-osmosdr.pc
lib/libgnuradio-osmosdr.so.${PKGVERSION}.0
${PYSITELIB}/osmosdr/__init__.py
${PYSITELIB}/osmosdr/__init__.pyc
${PYSITELIB}/osmosdr/__init__.pyo
@ -24,6 +27,6 @@ ${PYSITELIB}/osmosdr/osmocom_siggen_base.pyo
${PYSITELIB}/osmosdr/osmosdr_swig.py
${PYSITELIB}/osmosdr/osmosdr_swig.pyc
${PYSITELIB}/osmosdr/osmosdr_swig.pyo
share/gnuradio/grc/blocks/osmosdr_sink.xml
share/gnuradio/grc/blocks/osmosdr_source.xml
share/gnuradio/grc/blocks/rtlsdr_source.xml
share/gnuradio/grc/blocks/osmosdr_sink.block.yml
share/gnuradio/grc/blocks/osmosdr_source.block.yml
share/gnuradio/grc/blocks/rtlsdr_source.block.yml

View File

@ -6,10 +6,10 @@ BUILDLINK_TREE+= gr-osmosdr
GR_OSMOSDR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gr-osmosdr+= gr-osmosdr>=0.1.4nb2
BUILDLINK_PKGSRCDIR.gr-osmosdr?= ../../ham/gr-osmosdr
BUILDLINK_PKGSRCDIR.gr-osmosdr?= ../../wip/gr-osmosdr
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../wip/gnuradio-core/buildlink3.mk"
.endif # GR_OSMOSDR_BUILDLINK3_MK
BUILDLINK_TREE+= -gr-osmosdr

View File

@ -1,6 +1,9 @@
$NetBSD: distinfo,v 1.3 2015/11/02 23:57:23 agc Exp $
$NetBSD: distinfo,v 1.4 2020/05/14 19:21:34 joerg Exp $
SHA1 (gr-osmosdr-0.1.4.tar.gz) = 672041a6ffa767d39ffad2432e2a13c11e3ec984
RMD160 (gr-osmosdr-0.1.4.tar.gz) = 30f97d10655e5a88fdf2bf43a323ea9d9aba0479
SHA512 (gr-osmosdr-0.1.4.tar.gz) = b364f95c140ba61ab1fc51c49fd01cf4d0db4ce3c3a7680f34ea13bc646820d9b2b860bc0438df83df942249fa959cb90f83c5d117737cd0818db35c27253e65
Size (gr-osmosdr-0.1.4.tar.gz) = 222961 bytes
SHA1 (gr-osmosdr-0.2.0.tar.gz) = 299df78837446a53562fcd64ca99f28b763bdeb8
RMD160 (gr-osmosdr-0.2.0.tar.gz) = e4f67b972d81b155419eef383712d53767289bb7
SHA512 (gr-osmosdr-0.2.0.tar.gz) = 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
Size (gr-osmosdr-0.2.0.tar.gz) = 251163 bytes
SHA1 (patch-lib_airspy_airspy__source__c.cc) = 40e6aedace7fb1754c9dd0096d463c8c8a2799da
SHA1 (patch-lib_hackrf_hackrf__source__c.cc) = f37b11c5ad7c25a5a04be1373fecafc5d25041cd
SHA1 (patch-lib_rtl_rtl__source__c.cc) = 900aa235c4a21de40f53928408e11968afbad650

View File

@ -0,0 +1,12 @@
$NetBSD: patch-lib_airspy_airspy__source__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
--- lib/airspy/airspy_source_c.cc.orig 2020-05-10 20:51:56.395303506 +0000
+++ lib/airspy/airspy_source_c.cc
@@ -32,7 +32,6 @@
#include <boost/assign.hpp>
#include <boost/format.hpp>
-#include <boost/detail/endian.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/thread/thread.hpp>

View File

@ -0,0 +1,26 @@
$NetBSD: patch-lib_hackrf_hackrf__source__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
--- lib/hackrf/hackrf_source_c.cc.orig 2020-02-16 08:52:00.000000000 +0000
+++ lib/hackrf/hackrf_source_c.cc
@@ -31,7 +31,7 @@
#include <stdexcept>
#include <iostream>
-#include <boost/detail/endian.hpp>
+#include <boost/predef/other/endian.h>
#include <gnuradio/io_signature.h>
@@ -90,10 +90,10 @@ hackrf_source_c::hackrf_source_c (const
// create a lookup table for gr_complex values
for (unsigned int i = 0; i <= 0xffff; i++) {
-#ifdef BOOST_LITTLE_ENDIAN
+#if BOOST_ENDIAN_BIG_BYTE
_lut.push_back( gr_complex( (float(int8_t(i & 0xff))) * (1.0f/128.0f),
(float(int8_t(i >> 8))) * (1.0f/128.0f) ) );
-#else // BOOST_BIG_ENDIAN
+#else // BOOST_ENDIAN_BIG_BYTE
_lut.push_back( gr_complex( (float(int8_t(i >> 8))) * (1.0f/128.0f),
(float(int8_t(i & 0xff))) * (1.0f/128.0f) ) );
#endif

View File

@ -0,0 +1,12 @@
$NetBSD: patch-lib_rtl_rtl__source__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
--- lib/rtl/rtl_source_c.cc.orig 2020-02-16 08:52:00.000000000 +0000
+++ lib/rtl/rtl_source_c.cc
@@ -32,7 +32,6 @@
#include <boost/assign.hpp>
#include <boost/format.hpp>
-#include <boost/detail/endian.hpp>
#include <boost/algorithm/string.hpp>
#include <stdexcept>