[pkgsrc/trunk]: pkgsrc/ham/gr-osmosdr gr-osmosdr: update to 0.2.2

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/ham/gr-osmosdr gr-osmosdr: update to 0.2.2
From: tnn <tnn%pkgsrc.org@localhost>
Date: Sun, 30 Aug 2020 22:59:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a577235f110
branches:  trunk
changeset: 437751:4a577235f110
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Aug 30 21:35:53 2020 +0000

description:
gr-osmosdr: update to 0.2.2

This adds support for gnuradio 3.8 & boost compatibility fixes

diffstat:

 ham/gr-osmosdr/Makefile                                      |  17 +++----
 ham/gr-osmosdr/PLIST                                         |  17 ++++---
 ham/gr-osmosdr/buildlink3.mk                                 |   4 +-
 ham/gr-osmosdr/distinfo                                      |  14 ++----
 ham/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc |  12 -----
 ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc   |  12 -----
 ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc |  26 ------------
 ham/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc       |  26 ------------
 8 files changed, 24 insertions(+), 104 deletions(-)

diffs (209 lines):

diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/Makefile
--- a/ham/gr-osmosdr/Makefile   Sun Aug 30 21:33:38 2020 +0000
+++ b/ham/gr-osmosdr/Makefile   Sun Aug 30 21:35:53 2020 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2020/08/20 01:55:06 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2020/08/30 21:35:53 tnn Exp $
 
-DISTNAME=              gr-osmosdr-0.1.4
-PKGREVISION=           18
+DISTNAME=              gr-osmosdr-0.2.2
 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@localhost
 HOMEPAGE=              https://git.osmocom.org/gr-osmosdr
@@ -24,8 +26,7 @@
 
 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"
@@ -37,14 +38,10 @@
 
 .include       "../../ham/uhd/buildlink3.mk"
 .include       "../../lang/python/application.mk"
-.include       "../../lang/python/extension.mk"
 
 .include       "../../ham/rtl-sdr/buildlink3.mk"
 .include       "../../ham/libmirisdr/buildlink3.mk"
 .include       "../../ham/osmo-sdr/buildlink3.mk"
-# \todo Re-enable gr-fcdproplus when it works, or optionize it.
-# 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"
 
diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/PLIST
--- a/ham/gr-osmosdr/PLIST      Sun Aug 30 21:33:38 2020 +0000
+++ b/ham/gr-osmosdr/PLIST      Sun Aug 30 21:35:53 2020 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/13 13:00:27 mef Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/08/30 21:35:53 tnn Exp $
 bin/osmocom_fft
-bin/osmocom_siggen
 bin/osmocom_siggen_nogui
 bin/osmocom_spectrum_sense
 include/osmosdr/api.h
@@ -11,9 +10,13 @@
 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.0.2.0
+lib/libgnuradio-osmosdr.so.0.2.0.0
 ${PYSITELIB}/osmosdr/__init__.py
 ${PYSITELIB}/osmosdr/__init__.pyc
 ${PYSITELIB}/osmosdr/__init__.pyo
@@ -24,6 +27,6 @@
 ${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
diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/buildlink3.mk
--- a/ham/gr-osmosdr/buildlink3.mk      Sun Aug 30 21:33:38 2020 +0000
+++ b/ham/gr-osmosdr/buildlink3.mk      Sun Aug 30 21:35:53 2020 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/07/25 00:10:43 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/08/30 21:35:53 tnn Exp $
 
 BUILDLINK_TREE+=       gr-osmosdr
 
 .if !defined(GR_OSMOSDR_BUILDLINK3_MK)
 GR_OSMOSDR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gr-osmosdr+=     gr-osmosdr>=0.1.4nb2
+BUILDLINK_API_DEPENDS.gr-osmosdr+=     gr-osmosdr>=0.2.2
 BUILDLINK_PKGSRCDIR.gr-osmosdr?=       ../../ham/gr-osmosdr
 
 .include       "../../devel/boost-headers/buildlink3.mk"
diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/distinfo
--- a/ham/gr-osmosdr/distinfo   Sun Aug 30 21:33:38 2020 +0000
+++ b/ham/gr-osmosdr/distinfo   Sun Aug 30 21:35:53 2020 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/05/14 19:21:34 joerg Exp $
+$NetBSD: distinfo,v 1.5 2020/08/30 21:35:53 tnn 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 (patch-lib_airspy_airspy__source__c.cc) = 40e6aedace7fb1754c9dd0096d463c8c8a2799da
-SHA1 (patch-lib_hackrf_hackrf__sink__c.cc) = 659d8a5746babf23f8b08504c4584375ef38d5e4
-SHA1 (patch-lib_hackrf_hackrf__source__c.cc) = f67d6e4ff2de59e2131d39415a337e19f836135d
-SHA1 (patch-lib_rtl_rtl__source__c.cc) = 927868f6320a94cc94a7134d20913644acfc356d
+SHA1 (gr-osmosdr-0.2.2.tar.gz) = c0efb6d33735d2a2b4c71cb2575d97d0c6343365
+RMD160 (gr-osmosdr-0.2.2.tar.gz) = 7adbc7ac56eb013bde8236599e0ae2ee797837e7
+SHA512 (gr-osmosdr-0.2.2.tar.gz) = 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
+Size (gr-osmosdr-0.2.2.tar.gz) = 251425 bytes
diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc
--- a/ham/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc      Sun Aug 30 21:33:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$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>
- 
diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc
--- a/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc        Sun Aug 30 21:33:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-lib_hackrf_hackrf__sink__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
-
---- lib/hackrf/hackrf_sink_c.cc.orig   2020-05-10 20:51:58.688391524 +0000
-+++ lib/hackrf/hackrf_sink_c.cc
-@@ -39,7 +39,6 @@
- 
- #include <boost/assign.hpp>
- #include <boost/format.hpp>
--#include <boost/detail/endian.hpp>
- #include <boost/algorithm/string.hpp>
- #include <boost/thread/thread.hpp>
- 
diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc
--- a/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc      Sun Aug 30 21:33:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$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-05-10 20:52:00.651452193 +0000
-+++ lib/hackrf/hackrf_source_c.cc
-@@ -32,7 +32,7 @@
- 
- #include <boost/assign.hpp>
- #include <boost/format.hpp>
--#include <boost/detail/endian.hpp>
-+#include <boost/predef/other/endian.h>
- #include <boost/algorithm/string.hpp>
- #include <boost/thread/thread.hpp>
- 
-@@ -119,10 +119,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(char(i & 0xff))) * (1.0f/128.0f),
-                                 (float(char(i >> 8))) * (1.0f/128.0f) ) );
--#else // BOOST_BIG_ENDIAN
-+#else // BOOST_ENDIAN_BIG_BYTE
-     _lut.push_back( gr_complex( (float(char(i >> 8))) * (1.0f/128.0f),
-                                 (float(char(i & 0xff))) * (1.0f/128.0f) ) );
- #endif
diff -r 2178a6491da4 -r 4a577235f110 ham/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc
--- a/ham/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc    Sun Aug 30 21:33:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$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-05-10 20:52:02.745101595 +0000
-+++ lib/rtl/rtl_source_c.cc
-@@ -32,7 +32,7 @@
- 
- #include <boost/assign.hpp>
- #include <boost/format.hpp>
--#include <boost/detail/endian.hpp>
-+#include <boost/predef/other/endian.h>
- #include <boost/algorithm/string.hpp>
- 
- #include <stdexcept>
-@@ -173,10 +173,10 @@ rtl_source_c::rtl_source_c (const std::s
- 
-   // create a lookup table for gr_complex values
-   for (unsigned int i = 0; i <= 0xffff; i++) {
--#ifdef BOOST_LITTLE_ENDIAN
-+#if BOOST_ENDIAN_LITTLE_BYTE
-     _lut.push_back( gr_complex( (float(i & 0xff) - 127.4f) * (1.0f/128.0f),
-                                 (float(i >> 8) - 127.4f) * (1.0f/128.0f) ) );
--#else // BOOST_BIG_ENDIAN
-+#else // BOOST_ENDIAN_BIG_BYTE
-     _lut.push_back( gr_complex( (float(i >> 8) - 127.4f) * (1.0f/128.0f),
-                                 (float(i & 0xff) - 127.4f) * (1.0f/128.0f) ) );
- #endif
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11 py-qwt-qt4: remove, was only used by the outdated ...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: note gnuradio updates
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11 py-qwt-qt4: remove, was only used by the outdated ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: note gnuradio updates
Indexes:
Home | Main Index | Thread Index | Old Index