CVS commit: pkgsrc/ham/gr-osmosdr

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug 30 21:35:53 UTC 2020

Modified Files:
        pkgsrc/ham/gr-osmosdr: Makefile PLIST buildlink3.mk distinfo
Removed Files:
        pkgsrc/ham/gr-osmosdr/patches: patch-lib_airspy_airspy__source__c.cc
            patch-lib_hackrf_hackrf__sink__c.cc
            patch-lib_hackrf_hackrf__source__c.cc
            patch-lib_rtl_rtl__source__c.cc

Log Message:
gr-osmosdr: update to 0.2.2

This adds support for gnuradio 3.8 & boost compatibility fixes


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/ham/gr-osmosdr/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/gr-osmosdr/PLIST \
    pkgsrc/ham/gr-osmosdr/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/ham/gr-osmosdr/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/ham/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc \
    pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc \
    pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc \
    pkgsrc/ham/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/ham/gr-osmosdr/Makefile
diff -u pkgsrc/ham/gr-osmosdr/Makefile:1.26 pkgsrc/ham/gr-osmosdr/Makefile:1.27
--- pkgsrc/ham/gr-osmosdr/Makefile:1.26 Thu Aug 20 01:55:06 2020
+++ pkgsrc/ham/gr-osmosdr/Makefile      Sun Aug 30 21:35:53 2020
@@ -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 @@ 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"
@@ -37,14 +38,10 @@ REPLACE_PYTHON+=            apps/osmocom_siggen_ba
 
 .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"
 

Index: pkgsrc/ham/gr-osmosdr/PLIST
diff -u pkgsrc/ham/gr-osmosdr/PLIST:1.1 pkgsrc/ham/gr-osmosdr/PLIST:1.2
--- pkgsrc/ham/gr-osmosdr/PLIST:1.1     Mon Oct 13 13:00:27 2014
+++ pkgsrc/ham/gr-osmosdr/PLIST Sun Aug 30 21:35:53 2020
@@ -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/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.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/osmocom_siggen_base
 ${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
Index: pkgsrc/ham/gr-osmosdr/buildlink3.mk
diff -u pkgsrc/ham/gr-osmosdr/buildlink3.mk:1.1 pkgsrc/ham/gr-osmosdr/buildlink3.mk:1.2
--- pkgsrc/ham/gr-osmosdr/buildlink3.mk:1.1     Mon Jul 25 00:10:43 2016
+++ pkgsrc/ham/gr-osmosdr/buildlink3.mk Sun Aug 30 21:35:53 2020
@@ -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"

Index: pkgsrc/ham/gr-osmosdr/distinfo
diff -u pkgsrc/ham/gr-osmosdr/distinfo:1.4 pkgsrc/ham/gr-osmosdr/distinfo:1.5
--- pkgsrc/ham/gr-osmosdr/distinfo:1.4  Thu May 14 19:21:34 2020
+++ pkgsrc/ham/gr-osmosdr/distinfo      Sun Aug 30 21:35:53 2020
@@ -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