gnuradio-*: update to 3.9.1.0

Changed
  C++14
  C11
  VOLK now “regular” dependency, not in-tree submodule
  numpy now also a CMake-checked hard dependency for Python support
  Exception Handling: throw by value, catch by reference (clang-tidy check)
  C++11: Emplace in vectors where you can; brings performance boni, but not included in clang-tidy-checks
  An exception-throwing block will now terminate the flow graph process, configurable through top_block
  gr-utils cleanup, folder restructuring
  config version checks installed CMake file will accept “at least this version” now
  PyBind11 replaces SWIG
  Full tree conversion from SWIG to Pybind11 bindings
  Doxygen now uses MathJax, full LaTeX installation no longer required
GRC
  start flowgraph in folder where it resides
gnuradio-runtime
  When calculating offsets in non-integer rate FEC, lround
  default seed for gr::random now actually as documented time-dependent
  loggers moved from gr::block to gr::basic_block
  PMT serialization
  PMT dicts no longer indistinguishable from pairs
  PMT symbol hashing no longer suffers under oddball own implementations
gr-audio
  Increased ALSA buffer nperiods
gr-blocks
  add, add_const VOLK’ized, templated
      this seems to break things in other places, even if it proves to be mathematically identical
  wavfile infrastructure: libsndfile now dependency
gr-digital
  transcendental block: default to 32 bit float complex, not double
  Linear equalizer: separate adaptive algorithm, allows for using e.g. trained sequences instead of the classical LMS, CMA
  DFE: better structure for decision history
gr-dtv
  LDPC encoder: template functions instead of #defined macros
  LDPC encoder: smaller tables through uint16_t for index tables
gr-fec
  API uint8_t, not char
gr-fft
  FFT blocks/functions templatized
gr-filter
  logging format
  rational_resampler_base -> rational_resampler
gr-uhd
  Required UHD version bumped to 3.9.7
  logging format

Deprecated
  gr-analog
    sig_source: freq port will be removed in the future
  gr-audio
    audio-sink, -source: Windows audio sink/source deprecated, the portaudio
      sink/source works even better under windows anyway
  gr-digital
    In favor of symbol_sync, deprecate:
      clock_recovery_mm
      msk_timing_recovery
      pfb_clock_sync

Added
  C++ Generation all over the place
  PyBind bindings + generator
gnuradio-runtime
  block_gateway: set_max_output_buffer
  GR_PREFS_PATH environment variable sensitivity to configure the path to the
    config file
  gnuradio-config-info --print-all
GRC
  option to toggle ID visibilities globally
  Validation check for QT GUI hints
  Python snippets
block header parsing tool
  block header parsing tool (GSoC 2019)
gr_modtool
  option to convert blacklisted files
gr-analog
  sig_source: cmd port adds support for dicts, setting of frequency, amplitude,
    offset and phase parameters
gr-blocks
  selector now has control message ports
  Rotator-based freq shift convenience wrapper
  Message-to-Variable and vice versa blocks
  DC Spike removal
  IQ Swap
  Complex to interleaved char / short: scaling option
  Delay block: control message port
  Phase Shift block with message port
  wavfile_sink, _source can now deal with a lot of audio formats: uncompressed
    WAV/AIFF, µ- and A-law compressed audio, OGG/Vorbis, FLAC, even octave files
  Stream Demux, which demuxes streams according to lengths vector
  rotator: phase() getter
gr-digital
  OFDM: multiple CP lengths
  ofdm_equalizer_simpledfe: enable_soft_output
  Constellation Encoder
  Constellation: normalization options
gr-fec
  {en,de}code_rs_8, {en,de}code_rs_ccsds: Reed-Solomon en- and decoders
gr-fft
  Windows:
    Gaussian
    Flat Top
    Tukey
  Window build() call now with default beta
gr-filter
  GRC: File taps loader block
  Low pass FFT filter convenience wrapper
  ichar / ishort decimator
  phase continuity for freq_xlating_fir_filter
gr-network
  gr-network: a whole new networking blocks module!
      TCP
      UDP
  Much better lockup/multithreading support than 3.7-era blks2
gr-qtgui
  Azimuth/Elevation plot
  Autocorrelation plot
  Compass visualization
  Dial control
  Gauge: dial, level
  Distance plot
  LED-like indicator
  Message-passing check box
  Message-passing numeric control
  Message-passing push button
  Toggle Button
  Eye sink
  Vertical slider
gr-uhd
  Filter API
  UHD 4.0 support
  Power Reference API
  Bidirectional setting messages on both sink, source
gr-vocoder
  Codec2 dev branch support
  FreeDV: In/output rates can differ
  FreeDV: text message output
gr-zeromq
  C++ GRC templates
  Tag filtering for tag-forwarding blocks

Removed
  VOLK is no longer a submodule
  Sphinx: consolidate into doxygen, or wiki-maintained block list.
  Python 2
  SWIG
  gru python module
gnuradio-runtime
  circular_file.cc
  math/common_factor.hpp
gr-blocks
  bin_statistics_f
  log2_const
gr-digital
  PFB clock sync: set_taps
  deprecated old OFDM infrastructur
    ofdm_frame_acquisition
    ofdm_frame_sink
    ofdm_insert_preamble
    ofdm_sync_fixed
    ofdm_sync_pn
    ofdm_sync_pnac
    ofdm_sync_ml
    ofdm_receiver
  digital_voice
gr-fft
  malloc_float, _double: rely on VOLK
  Goertzel: dtor superfluous
gr-filter
  deprecated window function duplicates (use them from gr-fft!)

Fixed
  CMake: Qwt, Log4Cpp detection
  ctrlport strings unicodified
  Freedesktop install script was not executed
  Redundant icons installed
  Path substitution on Windows was backslash-broken
  YAML definitions: more than I can count
  Cross-building: py interpreter at runtime != build time
gnuradio-runtime
  ctrlport: unholy stored reference to stack-allocated object removed
  Sine table generation for fixed point math
  gr_unittest: floatAlmostEqual had a lot of false passes due abuse of all()
  get_tags_in_range for delay < (end-start)
  Premature tag pruning
  release flattened flowgraph after stopping, fixes restartability/shutdown
    problem
  PMT serialization portability
  latency issue caused by setting block alias on msg block
  Windows logging errors
  ctrlport: Thrift >= 0.13 broke
GRC
  Tab widget ID visibilities
  A lot of YAML templates
  Default setting in qtgui chooser restored
  Boolean parameters no longer switch buttons
  Nested namespace handling
  Don’t rely on set ordering in tests
  configparser import
  input box color theme on dark themes
  Search box typing doesn’t inadvertedly interact with the rest of GRC anymore
gr_modtool
  Empty argument lists allowed
  Boost UTF replaced CppUnit, this needed to be done here, too
gr-analog
  wfm left/right, filters
gr-audio
  portaudio: lock acquisition was improper
gr-blocks
  Throttle now uses monotonic clock
  Tag debug only saved last work call’s tags
  File sink flushes on stop
  gr_read_file_metadata.py used to lose rx_time precision
  File source big file handling under Windows
  file_*: fseek errors used to be ignored
gr-digital
  map_bb: thread safety, buffer overflows
  additive_scrambler: reset was broken
  Constellation scalefactor wasn’t always initialized
  long-standing qa_header_payload_demux bug addressed by waiting for both RX and
    TX, not only either
  false triggers in correlate_access_code
gr-dtv
  rate mismatch in ATSC flowgraphs
gr-fec
  async_decoder Heap corruption
  cc_encoder: constraint length K > 8 led to wrong output
gr-fft
  thread safety of copy assignment/ctor
  log power FFT Python
gr-filter
  variable_band_pass_filter GRC complex taps input
  RRC filter gain for alpha = 1
gr-qtgui
  Remove copies of image data in returns by using move semantics
  Remove bogus overriding in drawing functions of plot_raster, _waterfall
  Edit MSG box: don’t require key to be set
  Don’t check for Python2 libs
  Number Sink ignored averaging setting
gr-uhd
  UHD apps: Py3 fixes
  USRP blocks: multichannel objects not properly populating channels
gr-video-sdl
  YUV formats fixed
gr-zeromq
  Don’t depend on deprecated ZMQ functionality
  Unhandled exceptions now handled, much calmer
  Avoid infinite blocking in tb.stop() by using ZMQ_LINGER

3 files changed, 28 insertions, 37 deletions

diff --git a/ham/gr-osmosdr/Makefile b/ham/gr-osmosdr/Makefile
index 8f732b23763..a9dcde482c4 100644
--- a/ham/gr-osmosdr/Makefile
+++ b/ham/gr-osmosdr/Makefile
@@ -1,50 +1,47 @@
-# $NetBSD: Makefile,v 1.31 2021/01/01 08:24:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2021/04/07 16:14:09 tnn Exp $
 
-DISTNAME=		gr-osmosdr-0.2.2
-PKGREVISION=		1
+DISTNAME=		gr-osmosdr-0.2.3.20210128
 CATEGORIES=		ham
 # 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}
+GITHUB_TAG=		a100eb024c0210b95e4738b6efd836d48225bd03
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://git.osmocom.org/gr-osmosdr
 COMMENT=		SDR Hardware support for OsmoSDR and so many more
 LICENSE=		gnu-gpl-v2
 
+# for docs/doxygen/update_pydoc.py
+BUILD_DEPENDS+=		${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+
 USE_LANGUAGES=		c c++
 USE_TOOLS=		cmake
 USE_CMAKE=		yes
 
 # Suppress warning for developer
 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
+CMAKE_ARGS+=	-Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
 
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 36
 REPLACE_PYTHON+=		apps/osmocom_siggen_base.py
 
-.include	"../../devel/boost-headers/buildlink3.mk"
-.include	"../../devel/boost-libs/buildlink3.mk"
-.include	"../../devel/libusb1/buildlink3.mk"
-.include	"../../devel/orc/buildlink3.mk"
-
-# \todo Clearly threre is some ordering scheme.  Explain it.
-
-.include	"../../ham/uhd/buildlink3.mk"
-.include	"../../lang/python/application.mk"
-
-.include	"../../ham/rtl-sdr/buildlink3.mk"
-.include	"../../ham/hackrf/buildlink3.mk"
-.include	"../../ham/soapy-sdr/buildlink3.mk"
-
-.include	"../../ham/gnuradio-core/buildlink3.mk"
-.include	"../../ham/gnuradio-uhd/buildlink3.mk"
-
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/orc/buildlink3.mk"
+.include "../../devel/py-pybind11/buildlink3.mk"
+.include "../../ham/gnuradio-core/buildlink3.mk"
+.include "../../ham/gnuradio-uhd/buildlink3.mk"
+.include "../../ham/hackrf/buildlink3.mk"
+.include "../../ham/rtl-sdr/buildlink3.mk"
+.include "../../ham/soapy-sdr/buildlink3.mk"
+.include "../../ham/uhd/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/gr-osmosdr/PLIST b/ham/gr-osmosdr/PLIST
index a4d088cb3e3..f708a6c58d4 100644
--- a/ham/gr-osmosdr/PLIST
+++ b/ham/gr-osmosdr/PLIST
@@ -1,15 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2020/08/30 21:35:53 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/04/07 16:14:09 tnn Exp $
 bin/osmocom_fft
 bin/osmocom_siggen_nogui
-bin/osmocom_spectrum_sense
 include/osmosdr/api.h
 include/osmosdr/device.h
 include/osmosdr/pimpl.h
 include/osmosdr/ranges.h
 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
@@ -20,13 +17,10 @@ lib/libgnuradio-osmosdr.so.0.2.0.0
 ${PYSITELIB}/osmosdr/__init__.py
 ${PYSITELIB}/osmosdr/__init__.pyc
 ${PYSITELIB}/osmosdr/__init__.pyo
-${PYSITELIB}/osmosdr/_osmosdr_swig.so
 ${PYSITELIB}/osmosdr/osmocom_siggen_base.py
 ${PYSITELIB}/osmosdr/osmocom_siggen_base.pyc
 ${PYSITELIB}/osmosdr/osmocom_siggen_base.pyo
-${PYSITELIB}/osmosdr/osmosdr_swig.py
-${PYSITELIB}/osmosdr/osmosdr_swig.pyc
-${PYSITELIB}/osmosdr/osmosdr_swig.pyo
+${PYSITELIB}/osmosdr/osmosdr_python.so
 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 --git a/ham/gr-osmosdr/distinfo b/ham/gr-osmosdr/distinfo
index 2359c767eb1..bbab6feded0 100644
--- a/ham/gr-osmosdr/distinfo
+++ b/ham/gr-osmosdr/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/08/30 21:35:53 tnn Exp $
+$NetBSD: distinfo,v 1.6 2021/04/07 16:14:09 tnn Exp $
 
-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
+SHA1 (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = f035d5c14d8fdcc698c7e69b465814412e848eb9
+RMD160 (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = b938ebf1596caff61bab0d6e4481f292e463430b
+SHA512 (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = 4dcb6b2c10eeb2252111ba691be179fe5b6dc9598fa7e6129a3b214ee74d43ca2d67ab5eafa73cea2abb25729c24be0592585d149e13c7285f2ce330e52a6470
+Size (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = 257938 bytes