summaryrefslogtreecommitdiff
path: root/ham/gnuradio-core
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2021-04-07 16:14:07 +0000
committertnn <tnn@pkgsrc.org>2021-04-07 16:14:07 +0000
commit75df2496c3a23f6675ae75b9cb8958634ef110d5 (patch)
tree09f4a44ccb4881174294568ab3ed6cca3c7cba33 /ham/gnuradio-core
parent20515f3f4e9c5dc053dd8d2bce35ba14b82cb658 (diff)
downloadpkgsrc-75df2496c3a23f6675ae75b9cb8958634ef110d5.tar.gz
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
Diffstat (limited to 'ham/gnuradio-core')
-rw-r--r--ham/gnuradio-core/Makefile3
-rw-r--r--ham/gnuradio-core/Makefile.common50
-rw-r--r--ham/gnuradio-core/PLIST260
-rw-r--r--ham/gnuradio-core/buildlink3.mk6
-rw-r--r--ham/gnuradio-core/distinfo17
-rw-r--r--ham/gnuradio-core/options.mk7
-rw-r--r--ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake17
-rw-r--r--ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in14
-rw-r--r--ham/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h16
-rw-r--r--ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h10
-rw-r--r--ham/gnuradio-core/patches/patch-gr-digital_lib_map__bb__impl.cc17
-rw-r--r--ham/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion15
-rw-r--r--ham/gnuradio-core/version.mk4
13 files changed, 120 insertions, 316 deletions
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index 262c003f828..471ec9fb694 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2021/01/01 08:24:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.78 2021/04/07 16:14:07 tnn Exp $
PKGNAME= gnuradio-core-${VERSION}
-PKGREVISION= 3
COMMENT= Core part of GNU Radio, all others need this
PLIST_MINUS= # empty
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index c953e523928..d807d910cb1 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2021/04/05 07:02:52 nia Exp $
+# $NetBSD: Makefile.common,v 1.32 2021/04/07 16:14:07 tnn Exp $
# This Makefile fragment is included in the package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
# settings).
@@ -6,6 +6,7 @@
# used by ham/gnuradio-channels/Makefile
# used by ham/gnuradio-companion/Makefile
# used by ham/gnuradio-core/Makefile
+# used by ham/gnuradio-network/Makefile
# used by ham/gnuradio-ctrlport/Makefile
# used by ham/gnuradio-digital/Makefile
# used by ham/gnuradio-doxygen/Makefile
@@ -28,7 +29,7 @@ CATEGORIES+= ham
#MASTER_SITES+= http://gnuradio.org/releases/gnuradio/
MASTER_SITES= ${MASTER_SITE_GITHUB:=gnuradio/}
GITHUB_PROJECT= gnuradio
-GITHUB_RELEASE= v${VERSION}
+GITHUB_TAG= v${VERSION}
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= https://www.gnu.org/software/gnuradio/
@@ -37,23 +38,19 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
USE_TOOLS= perl gmake cmake pkg-config
USE_CMAKE= yes
-LDFLAGS.NetBSD+= -lrt
-DEPENDS+= ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
-DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-# gr_filter_design in gnuradio-core ask for:
-DEPENDS+= ${PYPKGPREFIX}-qwt-qt5-[0-9]*:../../x11/py-qwt-qt5
+DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
+# for companion
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
-DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DISTINFO_FILE= ${.CURDIR}/../../ham/gnuradio-core/distinfo
PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
# see CMakeLists.txt GR_PYTHON_MIN_VERSION
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 27
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
@@ -67,6 +64,7 @@ PKG_SYSCONFSUBDIR= gnuradio/conf.d
CXXFLAGS+= -pthread
CFLAGS+= -pthread
LDFLAGS.DragonFly+= -lboost_system
+LDFLAGS.NetBSD+= -lrt
LDFLAGS.SunOS+= -lboost_system
CXXFLAGS.SunOS+= -pthreads
@@ -75,10 +73,6 @@ INSTALLATION_DIRS+= ${EGDIR}
# -------- R E S E T CMAKE_ARGS H E R E -------------
CMAKE_ARGS=
-# set default as minimum
-# See http://gnuradio.org/redmine/projects/gnuradio/wiki/BuildGuide
-# http://gnuradio.org/redmine/projects/gnuradio/wiki/CygwinInstallMain
-
CMAKE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
CMAKE_ARGS+= -DENABLE_GR_ANALOG=ON
CMAKE_ARGS+= -DENABLE_GR_AUDIO=ON
@@ -97,6 +91,7 @@ CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
CMAKE_ARGS+= -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
+CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
CMAKE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
@@ -110,13 +105,6 @@ CMAKE_ARG_PATH= ../
.include "options.mk"
-# Fixes build errors w/ clang
-SUBST_CLASSES+= boost
-SUBST_MESSAGE.boost= prepend boost placeholders with namespace
-SUBST_FILES.boost= */lib/*.cc
-SUBST_SED.boost= -e 's, _1), boost::placeholders::_1),'
-SUBST_STAGE.boost= pre-configure
-
# disable/enable ALSA, see also patches/patch-gr-audio_lib_CMakeLists.txt
SUBST_CLASSES+= alsa
SUBST_MESSAGE.alsa= Arrange the patched line depepending on alsa is in PKG_OPTIONS or not
@@ -125,11 +113,11 @@ SUBST_FILES.alsa+= gr-audio/lib/CMakeLists.txt
SUBST_SED.alsa= -e 's,@@ALSA@@,${ALSA_ENABLED},'
SUBST_STAGE.alsa= pre-configure
-SUBST_CLASSES+= pyvers
-SUBST_FILES.pyvers= cmake/Modules/FindSphinx.cmake
-SUBST_MESSAGE.pyvers= Fix SPHINX_EXECUTABLE NAMES(sphinx-build)
-SUBST_VARS.pyvers+= PYVERSSUFFIX
-SUBST_STAGE.pyvers= pre-configure
+SUBST_CLASSES+= prefix
+SUBST_STAGE.prefix= pre-configure
+SUBST_MESSAGE.prefix= Substitute PREFIX
+SUBST_FILES.prefix= gnuradio-runtime/lib/constants.cc.in
+SUBST_VARS.prefix= PREFIX
REPLACE_PYTHON= */*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
*/*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py
@@ -140,6 +128,7 @@ pre-configure:
do-install:
cd ${WRKSRC}/${BUILD_DIRS} && ${GMAKE} DESTDIR=${DESTDIR} install
+
.include "../../audio/gsm/buildlink3.mk"
.include "../../audio/jack/buildlink3.mk"
.include "../../audio/portaudio/buildlink3.mk"
@@ -148,14 +137,15 @@ do-install:
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/cppunit/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/swig3/buildlink3.mk"
-
+BUILDLINK_API_DEPENDS.py-pybind11+= ${PYPKGPREFIX}-pybind11>=2.6.0
+.include "../../devel/py-pybind11/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../lang/python/application.mk"
+.include "../../math/py-numpy/buildlink3.mk"
.include "../../math/fftwf/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../math/volk/buildlink3.mk"
.include "../../textproc/log4cpp/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 2cac57996b6..fe8882f191f 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2020/08/30 20:43:46 tnn Exp $
+@comment $NetBSD: PLIST,v 1.31 2021/04/07 16:14:07 tnn Exp $
bin/gnuradio-config-info
bin/gr_filter_design
include/gnuradio/analog/agc.h
@@ -61,7 +61,6 @@ include/gnuradio/blocks/annotator_alltoall.h
include/gnuradio/blocks/annotator_raw.h
include/gnuradio/blocks/api.h
include/gnuradio/blocks/argmax.h
-include/gnuradio/blocks/bin_statistics_f.h
include/gnuradio/blocks/burst_tagger.h
include/gnuradio/blocks/char_to_float.h
include/gnuradio/blocks/char_to_short.h
@@ -78,6 +77,10 @@ include/gnuradio/blocks/complex_to_real.h
include/gnuradio/blocks/conjugate_cc.h
include/gnuradio/blocks/control_loop.h
include/gnuradio/blocks/copy.h
+include/gnuradio/blocks/correctiq.h
+include/gnuradio/blocks/correctiq_auto.h
+include/gnuradio/blocks/correctiq_man.h
+include/gnuradio/blocks/correctiq_swapiq.h
include/gnuradio/blocks/count_bits.h
include/gnuradio/blocks/deinterleave.h
include/gnuradio/blocks/delay.h
@@ -107,7 +110,6 @@ include/gnuradio/blocks/keep_one_in_n.h
include/gnuradio/blocks/lfsr_15_1_0.h
include/gnuradio/blocks/lfsr_32k.h
include/gnuradio/blocks/lfsr_32k_source_s.h
-include/gnuradio/blocks/log2_const.h
include/gnuradio/blocks/magphase_to_complex.h
include/gnuradio/blocks/max_blk.h
include/gnuradio/blocks/message_debug.h
@@ -139,6 +141,7 @@ include/gnuradio/blocks/pdu_set.h
include/gnuradio/blocks/pdu_to_tagged_stream.h
include/gnuradio/blocks/peak_detector.h
include/gnuradio/blocks/peak_detector2_fb.h
+include/gnuradio/blocks/phase_shift.h
include/gnuradio/blocks/plateau_detector_fb.h
include/gnuradio/blocks/probe_rate.h
include/gnuradio/blocks/probe_signal.h
@@ -157,6 +160,7 @@ include/gnuradio/blocks/short_to_char.h
include/gnuradio/blocks/short_to_float.h
include/gnuradio/blocks/skiphead.h
include/gnuradio/blocks/socket_pdu.h
+include/gnuradio/blocks/stream_demux.h
include/gnuradio/blocks/stream_mux.h
include/gnuradio/blocks/stream_to_streams.h
include/gnuradio/blocks/stream_to_tagged_stream.h
@@ -204,12 +208,10 @@ include/gnuradio/config.h
include/gnuradio/constants.h
include/gnuradio/endianness.h
include/gnuradio/expj.h
-include/gnuradio/feval.h
include/gnuradio/fft/api.h
include/gnuradio/fft/fft.h
include/gnuradio/fft/fft_shift.h
-include/gnuradio/fft/fft_vcc.h
-include/gnuradio/fft/fft_vfc.h
+include/gnuradio/fft/fft_v.h
include/gnuradio/fft/goertzel.h
include/gnuradio/fft/goertzel_fc.h
include/gnuradio/fft/window.h
@@ -237,6 +239,7 @@ include/gnuradio/filter/iir_filter_ccz.h
include/gnuradio/filter/iir_filter_ffd.h
include/gnuradio/filter/interp_fir_filter.h
include/gnuradio/filter/interpolator_taps.h
+include/gnuradio/filter/ival_decimator.h
include/gnuradio/filter/mmse_fir_interpolator_cc.h
include/gnuradio/filter/mmse_fir_interpolator_ff.h
include/gnuradio/filter/mmse_interp_differentiator_cc.h
@@ -255,7 +258,7 @@ include/gnuradio/filter/pfb_interpolator_ccf.h
include/gnuradio/filter/pfb_synthesizer_ccf.h
include/gnuradio/filter/pm_remez.h
include/gnuradio/filter/polyphase_filterbank.h
-include/gnuradio/filter/rational_resampler_base.h
+include/gnuradio/filter/rational_resampler.h
include/gnuradio/filter/single_pole_iir.h
include/gnuradio/filter/single_pole_iir_filter_cc.h
include/gnuradio/filter/single_pole_iir_filter_ff.h
@@ -266,6 +269,7 @@ include/gnuradio/fxpt_vco.h
include/gnuradio/gr_complex.h
include/gnuradio/hier_block2.h
include/gnuradio/high_res_timer.h
+include/gnuradio/integer_math.h
include/gnuradio/io_signature.h
include/gnuradio/logger.h
include/gnuradio/math.h
@@ -281,11 +285,9 @@ include/gnuradio/msg_handler.h
include/gnuradio/msg_queue.h
include/gnuradio/nco.h
include/gnuradio/prefs.h
-include/gnuradio/py_feval.h
include/gnuradio/pycallback_object.h
include/gnuradio/random.h
include/gnuradio/realtime.h
-include/gnuradio/realtime_impl.h
include/gnuradio/rpccallbackregister_base.h
include/gnuradio/rpcmanager.h
include/gnuradio/rpcmanager_base.h
@@ -298,68 +300,6 @@ include/gnuradio/rpcserver_selector.h
include/gnuradio/runtime_types.h
include/gnuradio/sincos.h
include/gnuradio/sptr_magic.h
-include/gnuradio/swig/analog_swig.i
-include/gnuradio/swig/analog_swig_doc.i
-include/gnuradio/swig/audio_swig.i
-include/gnuradio/swig/audio_swig_doc.i
-include/gnuradio/swig/basic_block.i
-include/gnuradio/swig/block.i
-include/gnuradio/swig/block_detail.i
-include/gnuradio/swig/block_gateway.i
-include/gnuradio/swig/blocks_swig0.i
-include/gnuradio/swig/blocks_swig0_doc.i
-include/gnuradio/swig/blocks_swig1.i
-include/gnuradio/swig/blocks_swig10.i
-include/gnuradio/swig/blocks_swig10_doc.i
-include/gnuradio/swig/blocks_swig1_doc.i
-include/gnuradio/swig/blocks_swig2.i
-include/gnuradio/swig/blocks_swig2_doc.i
-include/gnuradio/swig/blocks_swig3.i
-include/gnuradio/swig/blocks_swig3_doc.i
-include/gnuradio/swig/blocks_swig4.i
-include/gnuradio/swig/blocks_swig4_doc.i
-include/gnuradio/swig/blocks_swig5.i
-include/gnuradio/swig/blocks_swig5_doc.i
-include/gnuradio/swig/blocks_swig6.i
-include/gnuradio/swig/blocks_swig6_doc.i
-include/gnuradio/swig/blocks_swig7.i
-include/gnuradio/swig/blocks_swig7_doc.i
-include/gnuradio/swig/blocks_swig8.i
-include/gnuradio/swig/blocks_swig8_doc.i
-include/gnuradio/swig/blocks_swig9.i
-include/gnuradio/swig/blocks_swig9_doc.i
-include/gnuradio/swig/buffer.i
-include/gnuradio/swig/constants.i
-include/gnuradio/swig/feval.i
-include/gnuradio/swig/fft_swig.i
-include/gnuradio/swig/fft_swig_doc.i
-include/gnuradio/swig/filter_swig.i
-include/gnuradio/swig/gnuradio.i
-include/gnuradio/swig/gr_ctrlport.i
-include/gnuradio/swig/gr_extras.i
-include/gnuradio/swig/gr_filter_swig_doc.i
-include/gnuradio/swig/gr_logger.i
-include/gnuradio/swig/gr_shared_ptr.i
-include/gnuradio/swig/gr_swig_block_magic.i
-include/gnuradio/swig/gr_types.i
-include/gnuradio/swig/hier_block2.i
-include/gnuradio/swig/io_signature.i
-include/gnuradio/swig/message.i
-include/gnuradio/swig/msg_handler.i
-include/gnuradio/swig/msg_queue.i
-include/gnuradio/swig/pmt_swig.i
-include/gnuradio/swig/pmt_swig_doc.i
-include/gnuradio/swig/prefs.i
-include/gnuradio/swig/py3compat.i
-include/gnuradio/swig/realtime.i
-include/gnuradio/swig/runtime_swig.i
-include/gnuradio/swig/runtime_swig_doc.i
-include/gnuradio/swig/sync_block.i
-include/gnuradio/swig/sync_decimator.i
-include/gnuradio/swig/sync_interpolator.i
-include/gnuradio/swig/tagged_stream_block.i
-include/gnuradio/swig/tags.i
-include/gnuradio/swig/top_block.i
include/gnuradio/sync_block.h
include/gnuradio/sync_decimator.h
include/gnuradio/sync_interpolator.h
@@ -386,21 +326,21 @@ lib/cmake/gnuradio/FindALSA.cmake
lib/cmake/gnuradio/FindCodec2.cmake
lib/cmake/gnuradio/FindFFTW3f.cmake
lib/cmake/gnuradio/FindGMP.cmake
-lib/cmake/gnuradio/FindGSL.cmake
lib/cmake/gnuradio/FindGSM.cmake
lib/cmake/gnuradio/FindGit.cmake
lib/cmake/gnuradio/FindJACK.cmake
lib/cmake/gnuradio/FindLOG4CPP.cmake
lib/cmake/gnuradio/FindMPIR.cmake
lib/cmake/gnuradio/FindMPLIB.cmake
+lib/cmake/gnuradio/FindMathJax2.cmake
lib/cmake/gnuradio/FindOSS.cmake
lib/cmake/gnuradio/FindPORTAUDIO.cmake
lib/cmake/gnuradio/FindQwt.cmake
-lib/cmake/gnuradio/FindSWIG.cmake
-lib/cmake/gnuradio/FindSphinx.cmake
+lib/cmake/gnuradio/FindSNDFILE.cmake
lib/cmake/gnuradio/FindTHRIFT.cmake
lib/cmake/gnuradio/FindUHD.cmake
lib/cmake/gnuradio/FindZeroMQ.cmake
+lib/cmake/gnuradio/Findlibunwind.cmake
lib/cmake/gnuradio/GnuradioConfig.cmake
lib/cmake/gnuradio/GnuradioConfigVersion.cmake
lib/cmake/gnuradio/GrBoost.cmake
@@ -408,12 +348,11 @@ lib/cmake/gnuradio/GrBuildTypes.cmake
lib/cmake/gnuradio/GrComponent.cmake
lib/cmake/gnuradio/GrMiscUtils.cmake
lib/cmake/gnuradio/GrPlatform.cmake
+lib/cmake/gnuradio/GrPybind.cmake
lib/cmake/gnuradio/GrPython.cmake
-lib/cmake/gnuradio/GrSwig.cmake
lib/cmake/gnuradio/GrTest.cmake
lib/cmake/gnuradio/GrVersion.cmake
lib/cmake/gnuradio/LibFindMacros.cmake
-lib/cmake/gnuradio/UseSWIG.cmake
lib/cmake/gnuradio/gnuradio-analogConfig.cmake
lib/cmake/gnuradio/gnuradio-analogTargets-release.cmake
lib/cmake/gnuradio/gnuradio-analogTargets.cmake
@@ -435,28 +374,26 @@ lib/cmake/gnuradio/gnuradio-pmtTargets.cmake
lib/cmake/gnuradio/gnuradio-runtimeConfig.cmake
lib/cmake/gnuradio/gnuradio-runtimeTargets-release.cmake
lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
-lib/cmake/gnuradio/runtime_swigTargets-release.cmake
-lib/cmake/gnuradio/runtime_swigTargets.cmake
lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.3.8.1
+lib/libgnuradio-analog.so.3.9.1
lib/libgnuradio-analog.so.${PKGVERSION}
lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.3.8.1
+lib/libgnuradio-audio.so.3.9.1
lib/libgnuradio-audio.so.${PKGVERSION}
lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.3.8.1
+lib/libgnuradio-blocks.so.3.9.1
lib/libgnuradio-blocks.so.${PKGVERSION}
lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.3.8.1
+lib/libgnuradio-fft.so.3.9.1
lib/libgnuradio-fft.so.${PKGVERSION}
lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.3.8.1
+lib/libgnuradio-filter.so.3.9.1
lib/libgnuradio-filter.so.${PKGVERSION}
lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.3.8.1
+lib/libgnuradio-pmt.so.3.9.1
lib/libgnuradio-pmt.so.${PKGVERSION}
lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.3.8.1
+lib/libgnuradio-runtime.so.3.9.1
lib/libgnuradio-runtime.so.${PKGVERSION}
lib/pkgconfig/gnuradio-analog.pc
lib/pkgconfig/gnuradio-audio.pc
@@ -470,13 +407,10 @@ ${PYSITELIB}/gnuradio/__init__.pyo
${PYSITELIB}/gnuradio/analog/__init__.py
${PYSITELIB}/gnuradio/analog/__init__.pyc
${PYSITELIB}/gnuradio/analog/__init__.pyo
-${PYSITELIB}/gnuradio/analog/_analog_swig.so
${PYSITELIB}/gnuradio/analog/am_demod.py
${PYSITELIB}/gnuradio/analog/am_demod.pyc
${PYSITELIB}/gnuradio/analog/am_demod.pyo
-${PYSITELIB}/gnuradio/analog/analog_swig.py
-${PYSITELIB}/gnuradio/analog/analog_swig.pyc
-${PYSITELIB}/gnuradio/analog/analog_swig.pyo
+${PYSITELIB}/gnuradio/analog/analog_python.so
${PYSITELIB}/gnuradio/analog/fm_demod.py
${PYSITELIB}/gnuradio/analog/fm_demod.pyc
${PYSITELIB}/gnuradio/analog/fm_demod.pyo
@@ -507,66 +441,26 @@ ${PYSITELIB}/gnuradio/analog/wfm_tx.pyo
${PYSITELIB}/gnuradio/audio/__init__.py
${PYSITELIB}/gnuradio/audio/__init__.pyc
${PYSITELIB}/gnuradio/audio/__init__.pyo
-${PYSITELIB}/gnuradio/audio/_audio_swig.so
-${PYSITELIB}/gnuradio/audio/audio_swig.py
-${PYSITELIB}/gnuradio/audio/audio_swig.pyc
-${PYSITELIB}/gnuradio/audio/audio_swig.pyo
+${PYSITELIB}/gnuradio/audio/audio_python.so
${PYSITELIB}/gnuradio/blocks/__init__.py
${PYSITELIB}/gnuradio/blocks/__init__.pyc
${PYSITELIB}/gnuradio/blocks/__init__.pyo
-${PYSITELIB}/gnuradio/blocks/_blocks_swig0.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig1.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig10.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig2.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig3.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig4.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig5.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig6.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig7.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig8.so
-${PYSITELIB}/gnuradio/blocks/_blocks_swig9.so
-${PYSITELIB}/gnuradio/blocks/blocks_swig.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig0.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig0.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig0.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig1.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig1.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig1.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig10.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig10.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig10.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig2.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig2.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig2.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig3.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig3.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig3.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig4.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig4.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig4.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig5.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig5.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig5.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig6.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig6.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig6.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig7.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig7.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig7.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig8.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig8.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig8.pyo
-${PYSITELIB}/gnuradio/blocks/blocks_swig9.py
-${PYSITELIB}/gnuradio/blocks/blocks_swig9.pyc
-${PYSITELIB}/gnuradio/blocks/blocks_swig9.pyo
+${PYSITELIB}/gnuradio/blocks/blocks_python.so
+${PYSITELIB}/gnuradio/blocks/msg_meta_to_pair.py
+${PYSITELIB}/gnuradio/blocks/msg_meta_to_pair.pyc
+${PYSITELIB}/gnuradio/blocks/msg_meta_to_pair.pyo
+${PYSITELIB}/gnuradio/blocks/msg_pair_to_var.py
+${PYSITELIB}/gnuradio/blocks/msg_pair_to_var.pyc
+${PYSITELIB}/gnuradio/blocks/msg_pair_to_var.pyo
${PYSITELIB}/gnuradio/blocks/parse_file_metadata.py
${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyc
${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyo
${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.py
${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyc
${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyo
+${PYSITELIB}/gnuradio/blocks/var_to_msg.py
+${PYSITELIB}/gnuradio/blocks/var_to_msg.pyc
+${PYSITELIB}/gnuradio/blocks/var_to_msg.pyo
${PYSITELIB}/gnuradio/eng_arg.py
${PYSITELIB}/gnuradio/eng_arg.pyc
${PYSITELIB}/gnuradio/eng_arg.pyo
@@ -579,10 +473,13 @@ ${PYSITELIB}/gnuradio/eng_option.pyo
${PYSITELIB}/gnuradio/fft/__init__.py
${PYSITELIB}/gnuradio/fft/__init__.pyc
${PYSITELIB}/gnuradio/fft/__init__.pyo
-${PYSITELIB}/gnuradio/fft/_fft_swig.so
-${PYSITELIB}/gnuradio/fft/fft_swig.py
-${PYSITELIB}/gnuradio/fft/fft_swig.pyc
-${PYSITELIB}/gnuradio/fft/fft_swig.pyo
+${PYSITELIB}/gnuradio/fft/fft_python.so
+${PYSITELIB}/gnuradio/fft/fft_vcc.py
+${PYSITELIB}/gnuradio/fft/fft_vcc.pyc
+${PYSITELIB}/gnuradio/fft/fft_vcc.pyo
+${PYSITELIB}/gnuradio/fft/fft_vfc.py
+${PYSITELIB}/gnuradio/fft/fft_vfc.pyc
+${PYSITELIB}/gnuradio/fft/fft_vfc.pyo
${PYSITELIB}/gnuradio/fft/logpwrfft.py
${PYSITELIB}/gnuradio/fft/logpwrfft.pyc
${PYSITELIB}/gnuradio/fft/logpwrfft.pyo
@@ -595,7 +492,6 @@ ${PYSITELIB}/gnuradio/filter/GrFilterPlotWidget.pyo
${PYSITELIB}/gnuradio/filter/__init__.py
${PYSITELIB}/gnuradio/filter/__init__.pyc
${PYSITELIB}/gnuradio/filter/__init__.pyo
-${PYSITELIB}/gnuradio/filter/_filter_swig.so
${PYSITELIB}/gnuradio/filter/api_object.py
${PYSITELIB}/gnuradio/filter/api_object.pyc
${PYSITELIB}/gnuradio/filter/api_object.pyo
@@ -605,12 +501,13 @@ ${PYSITELIB}/gnuradio/filter/bandgraphicsview.pyo
${PYSITELIB}/gnuradio/filter/banditems.py
${PYSITELIB}/gnuradio/filter/banditems.pyc
${PYSITELIB}/gnuradio/filter/banditems.pyo
+${PYSITELIB}/gnuradio/filter/file_taps_loader.py
+${PYSITELIB}/gnuradio/filter/file_taps_loader.pyc
+${PYSITELIB}/gnuradio/filter/file_taps_loader.pyo
${PYSITELIB}/gnuradio/filter/filter_design.py
${PYSITELIB}/gnuradio/filter/filter_design.pyc
${PYSITELIB}/gnuradio/filter/filter_design.pyo
-${PYSITELIB}/gnuradio/filter/filter_swig.py
-${PYSITELIB}/gnuradio/filter/filter_swig.pyc
-${PYSITELIB}/gnuradio/filter/filter_swig.pyo
+${PYSITELIB}/gnuradio/filter/filter_python.so
${PYSITELIB}/gnuradio/filter/filterbank.py
${PYSITELIB}/gnuradio/filter/filterbank.pyc
${PYSITELIB}/gnuradio/filter/filterbank.pyo
@@ -638,19 +535,16 @@ ${PYSITELIB}/gnuradio/filter/polezero_plot.pyo
${PYSITELIB}/gnuradio/filter/pyqt_filter_stacked.py
${PYSITELIB}/gnuradio/filter/pyqt_filter_stacked.pyc
${PYSITELIB}/gnuradio/filter/pyqt_filter_stacked.pyo
-${PYSITELIB}/gnuradio/filter/rational_resampler.py
-${PYSITELIB}/gnuradio/filter/rational_resampler.pyc
-${PYSITELIB}/gnuradio/filter/rational_resampler.pyo
${PYSITELIB}/gnuradio/gr/__init__.py
${PYSITELIB}/gnuradio/gr/__init__.pyc
${PYSITELIB}/gnuradio/gr/__init__.pyo
-${PYSITELIB}/gnuradio/gr/_runtime_swig.so
${PYSITELIB}/gnuradio/gr/exceptions.py
${PYSITELIB}/gnuradio/gr/exceptions.pyc
${PYSITELIB}/gnuradio/gr/exceptions.pyo
${PYSITELIB}/gnuradio/gr/gateway.py
${PYSITELIB}/gnuradio/gr/gateway.pyc
${PYSITELIB}/gnuradio/gr/gateway.pyo
+${PYSITELIB}/gnuradio/gr/gr_python.so
${PYSITELIB}/gnuradio/gr/hier_block2.py
${PYSITELIB}/gnuradio/gr/hier_block2.pyc
${PYSITELIB}/gnuradio/gr/hier_block2.pyo
@@ -660,9 +554,6 @@ ${PYSITELIB}/gnuradio/gr/packet_utils.pyo
${PYSITELIB}/gnuradio/gr/pubsub.py
${PYSITELIB}/gnuradio/gr/pubsub.pyc
${PYSITELIB}/gnuradio/gr/pubsub.pyo
-${PYSITELIB}/gnuradio/gr/runtime_swig.py
-${PYSITELIB}/gnuradio/gr/runtime_swig.pyc
-${PYSITELIB}/gnuradio/gr/runtime_swig.pyo
${PYSITELIB}/gnuradio/gr/tag_utils.py
${PYSITELIB}/gnuradio/gr/tag_utils.pyc
${PYSITELIB}/gnuradio/gr/tag_utils.pyo
@@ -672,59 +563,29 @@ ${PYSITELIB}/gnuradio/gr/top_block.pyo
${PYSITELIB}/gnuradio/gr_unittest.py
${PYSITELIB}/gnuradio/gr_unittest.pyc
${PYSITELIB}/gnuradio/gr_unittest.pyo
-${PYSITELIB}/gnuradio/gru/__init__.py
-${PYSITELIB}/gnuradio/gru/__init__.pyc
-${PYSITELIB}/gnuradio/gru/__init__.pyo
-${PYSITELIB}/gnuradio/gru/daemon.py
-${PYSITELIB}/gnuradio/gru/daemon.pyc
-${PYSITELIB}/gnuradio/gru/daemon.pyo
-${PYSITELIB}/gnuradio/gru/freqz.py
-${PYSITELIB}/gnuradio/gru/freqz.pyc
-${PYSITELIB}/gnuradio/gru/freqz.pyo
-${PYSITELIB}/gnuradio/gru/gnuplot_freqz.py
-${PYSITELIB}/gnuradio/gru/gnuplot_freqz.pyc
-${PYSITELIB}/gnuradio/gru/gnuplot_freqz.pyo
-${PYSITELIB}/gnuradio/gru/hexint.py
-${PYSITELIB}/gnuradio/gru/hexint.pyc
-${PYSITELIB}/gnuradio/gru/hexint.pyo
-${PYSITELIB}/gnuradio/gru/listmisc.py
-${PYSITELIB}/gnuradio/gru/listmisc.pyc
-${PYSITELIB}/gnuradio/gru/listmisc.pyo
-${PYSITELIB}/gnuradio/gru/mathmisc.py
-${PYSITELIB}/gnuradio/gru/mathmisc.pyc
-${PYSITELIB}/gnuradio/gru/mathmisc.pyo
-${PYSITELIB}/gnuradio/gru/msgq_runner.py
-${PYSITELIB}/gnuradio/gru/msgq_runner.pyc
-${PYSITELIB}/gnuradio/gru/msgq_runner.pyo
-${PYSITELIB}/gnuradio/gru/os_read_exactly.py
-${PYSITELIB}/gnuradio/gru/os_read_exactly.pyc
-${PYSITELIB}/gnuradio/gru/os_read_exactly.pyo
-${PYSITELIB}/gnuradio/gru/seq_with_cursor.py
-${PYSITELIB}/gnuradio/gru/seq_with_cursor.pyc
-${PYSITELIB}/gnuradio/gru/seq_with_cursor.pyo
-${PYSITELIB}/gnuradio/gru/socket_stuff.py
-${PYSITELIB}/gnuradio/gru/socket_stuff.pyc
-${PYSITELIB}/gnuradio/gru/socket_stuff.pyo
${PYSITELIB}/pmt/__init__.py
${PYSITELIB}/pmt/__init__.pyc
${PYSITELIB}/pmt/__init__.pyo
-${PYSITELIB}/pmt/_pmt_swig.so
-${PYSITELIB}/pmt/pmt_swig.py
-${PYSITELIB}/pmt/pmt_swig.pyc
-${PYSITELIB}/pmt/pmt_swig.pyo
+${PYSITELIB}/pmt/pmt_python.so
${PYSITELIB}/pmt/pmt_to_python.py
${PYSITELIB}/pmt/pmt_to_python.pyc
${PYSITELIB}/pmt/pmt_to_python.pyo
share/doc/gnuradio-${PKGVERSION}/CHANGELOG.md
+share/doc/gnuradio-${PKGVERSION}/CONTRIBUTING.md
share/doc/gnuradio-${PKGVERSION}/README.analog
share/doc/gnuradio-${PKGVERSION}/README.audio
share/doc/gnuradio-${PKGVERSION}/README.blocks
share/doc/gnuradio-${PKGVERSION}/README.fft
share/doc/gnuradio-${PKGVERSION}/README.filter
-share/doc/gnuradio-${PKGVERSION}/README.hacking
share/doc/gnuradio-${PKGVERSION}/README.md
+share/gnuradio/clang-format.conf
+share/gnuradio/examples/analog/USRP_FM_stereo.grc
+share/gnuradio/examples/analog/fm_demod.py
+share/gnuradio/examples/analog/fm_rx.grc
+share/gnuradio/examples/analog/fm_tx.grc
share/gnuradio/examples/analog/fmtest.py
share/gnuradio/examples/analog/noise_power.grc
+share/gnuradio/examples/analog/sig_source_msg_ports.grc
share/gnuradio/examples/audio/audio_copy.py
share/gnuradio/examples/audio/audio_play.py
share/gnuradio/examples/audio/audio_to_file.py
@@ -732,7 +593,6 @@ share/gnuradio/examples/audio/cvsd_sweep.grc
share/gnuradio/examples/audio/dial_tone
share/gnuradio/examples/audio/dial_tone.grc
share/gnuradio/examples/audio/dial_tone.py
-share/gnuradio/examples/audio/dial_tone_daemon.py
share/gnuradio/examples/audio/dial_tone_wav.py
share/gnuradio/examples/audio/mono_tone.py
share/gnuradio/examples/audio/multi_tone.py
@@ -740,16 +600,22 @@ share/gnuradio/examples/audio/noise.py
share/gnuradio/examples/audio/spectrum_inversion.py
share/gnuradio/examples/audio/test_resampler.py
share/gnuradio/examples/blocks/matrix_multiplexer.grc
+share/gnuradio/examples/blocks/msg_to_var.grc
share/gnuradio/examples/blocks/peak_detector2.grc
share/gnuradio/examples/blocks/py_snippets_demo.grc
share/gnuradio/examples/blocks/selector.grc
-share/gnuradio/examples/blocks/test_stream_mux_tags.grc
+share/gnuradio/examples/blocks/stream_demux_demo.grc
+share/gnuradio/examples/blocks/stream_mux_demo.grc
+share/gnuradio/examples/blocks/var_to_msg.grc
share/gnuradio/examples/blocks/vector_source_with_tags.grc
+share/gnuradio/examples/filter/benchmark_filters.py
share/gnuradio/examples/filter/channelize.py
share/gnuradio/examples/filter/chirp_channelize.py
share/gnuradio/examples/filter/decimate.py
share/gnuradio/examples/filter/fft_filter_ccc.py
share/gnuradio/examples/filter/filter_taps.grc
+share/gnuradio/examples/filter/filter_taps_example_complex_bandpass_taps
+share/gnuradio/examples/filter/filter_taps_loader.grc
share/gnuradio/examples/filter/fir_filter_ccc.py
share/gnuradio/examples/filter/fir_filter_fff.py
share/gnuradio/examples/filter/gr_filtdes_api.py
@@ -757,6 +623,7 @@ share/gnuradio/examples/filter/gr_filtdes_callback.py
share/gnuradio/examples/filter/gr_filtdes_live_upd.py
share/gnuradio/examples/filter/gr_filtdes_restrict.py
share/gnuradio/examples/filter/interpolate.py
+share/gnuradio/examples/filter/polyphase_channelizer_demo.grc
share/gnuradio/examples/filter/reconstruction.py
share/gnuradio/examples/filter/resampler.py
share/gnuradio/examples/filter/resampler_demo.grc
@@ -764,6 +631,7 @@ share/gnuradio/examples/filter/synth_filter.py
share/gnuradio/examples/filter/synth_to_chan.py
share/gnuradio/examples/gnuradio-runtime.conf
share/gnuradio/examples/gr-audio-jack.conf
+share/gnuradio/examples/gr-audio-oss.conf
share/gnuradio/examples/gr-audio-portaudio.conf
share/gnuradio/examples/gr-audio.conf
share/gnuradio/examples/gr_log_default.conf
@@ -783,7 +651,9 @@ share/gnuradio/examples/network/dial_tone_sink.py
share/gnuradio/examples/network/dial_tone_source.py
share/gnuradio/examples/network/vector_sink.py
share/gnuradio/examples/network/vector_source.py
+share/gnuradio/examples/tags/tagged_file_sink.grc
share/gnuradio/examples/tags/test_file_tags.py
+share/gnuradio/examples/tags/test_tag_prop.grc
share/gnuradio/examples/tags/uhd_burst_detector.py
share/gnuradio/examples/volk_benchmark/README
share/gnuradio/examples/volk_benchmark/volk_math.py
diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk
index 83dbc1d1ada..e24a7370fe7 100644
--- a/ham/gnuradio-core/buildlink3.mk
+++ b/ham/gnuradio-core/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.30 2020/08/30 20:43:46 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2021/04/07 16:14:07 tnn Exp $
BUILDLINK_TREE+= gnuradio-core
.if !defined(GNURADIO_CORE_BUILDLINK3_MK)
GNURADIO_CORE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.8.1.0
-BUILDLINK_ABI_DEPENDS.gnuradio-core+= gnuradio-core>=3.8.1.0
+BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.9.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-core+= gnuradio-core>=3.9.1.0
BUILDLINK_PKGSRCDIR.gnuradio-core?= ../../ham/gnuradio-core
.include "../../devel/gmp/buildlink3.mk"
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 8ae4575d1b6..f694ad78d71 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.40 2020/11/29 22:35:47 dbj Exp $
+$NetBSD: distinfo,v 1.41 2021/04/07 16:14:07 tnn Exp $
-SHA1 (gnuradio-3.8.1.0.tar.gz) = d01a97bc06ac2543e393dc0b7df629f9a4fb07d4
-RMD160 (gnuradio-3.8.1.0.tar.gz) = 6b6c96a7942ae1a42aff2ac4f70fb761b735864a
-SHA512 (gnuradio-3.8.1.0.tar.gz) = d1ada5b36c32aefd5915e4aa33beafd06aaaa00654f5a9f126bc9068f9e607580660bd5c57177503c3c29c23e9f3f4bc0f9c6c394a6f4bb003f6ffdf520eb2e0
-Size (gnuradio-3.8.1.0.tar.gz) = 3567141 bytes
-SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
-SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
+SHA1 (gnuradio-3.9.1.0.tar.gz) = 058f77b2ca3412003d56f8f6a6676bfd6e4d6332
+RMD160 (gnuradio-3.9.1.0.tar.gz) = f9f8cb138f0a62592f31b6af4ed378ac9a797163
+SHA512 (gnuradio-3.9.1.0.tar.gz) = 01baf79cb77e093f845d223c12f6ec1a70ada297022b6ed7d17485e1e3143ee8655ef93e62561d2b5daa38518e8f6a5bda98c53b613ceced0e3bbe5051279514
+Size (gnuradio-3.9.1.0.tar.gz) = 4127980 bytes
+SHA1 (patch-gnuradio-runtime_lib_constants.cc.in) = e3ca88db06eef0a38387ddbfbd9a4d3b6262b9a6
SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 9adacb93a20b2be596a23985306cbfd5f93c80a8
-SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = 565b4ada865395f19228511659bfc489a5a9583f
-SHA1 (patch-gr-digital_lib_map__bb__impl.cc) = da52d58b1c2779650670bf80a1aa91e60637e4dc
-SHA1 (patch-grc_scripts_gnuradio-companion) = 852f520670c0b9ec822b88aea331a1e052175340
+SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = cfa9b629e5cf21198cfd53cf27a908b5874866f4
diff --git a/ham/gnuradio-core/options.mk b/ham/gnuradio-core/options.mk
index 5731d810648..499accd74de 100644
--- a/ham/gnuradio-core/options.mk
+++ b/ham/gnuradio-core/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2020/08/30 20:43:46 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2021/04/07 16:14:07 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio
PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
# ninja-build is said supported, but not working
-# alas is said supported, but not good on NetBSD
+# alsa is said supported, but not good on NetBSD
# Adding ninja-build to following line (now) stops
# [164/850] cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
@@ -26,8 +26,7 @@ do-build:
.endif
.if !empty(PKG_OPTIONS:Mfilter-design)
-# Running gr_filter_design asks for the package
-DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
+DEPENDS+= ${PYPKGPREFIX}-qtgraph-qt5-[0-9]*:../../x11/py-qtgraph-qt5
.endif
.if !empty(PKG_OPTIONS:Malsa)
diff --git a/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake b/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
deleted file mode 100644
index f4ea0af57d5..00000000000
--- a/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-cmake_Modules_FindSphinx.cmake,v 1.3 2020/08/30 20:43:46 tnn Exp $
-
-(Starting with gnuradio-3.7.6), cmake wants sphinx-build exact executable
-name. With SUBST_CLASSES.pyvers in Makefile.common, tell the name.
-(The problem without this fix is in gnuradio-doxygen).
-
---- cmake/Modules/FindSphinx.cmake.orig 2013-05-02 08:57:50.000000000 +0900
-+++ cmake/Modules/FindSphinx.cmake 2015-03-06 22:08:44.000000000 +0900
-@@ -19,7 +19,7 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
--find_program(SPHINX_EXECUTABLE NAMES sphinx-build
-+find_program(SPHINX_EXECUTABLE NAMES sphinx-build@PYVERSSUFFIX@
- HINTS
- $ENV{SPHINX_DIR}
- PATH_SUFFIXES bin
diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in
new file mode 100644
index 00000000000..e5bb54c2616
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-gnuradio-runtime_lib_constants.cc.in,v 1.1 2021/04/07 16:14:07 tnn Exp $
+
+Override broken PREFIX detection.
+
+--- gnuradio-runtime/lib/constants.cc.in.orig 2021-03-22 22:37:12.000000000 +0000
++++ gnuradio-runtime/lib/constants.cc.in
+@@ -26,6 +26,7 @@ const std::string prefix()
+ if (prefix != NULL)
+ return prefix;
+
++ return "@PREFIX@";
+ boost::filesystem::path prefix_rel_lib = "@prefix_relative_to_lib@";
+ boost::filesystem::path gr_runtime_lib_path = boost::dll::this_line_location();
+ // Normalize before decomposing path so result is reliable
diff --git a/ham/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h b/ham/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h
deleted file mode 100644
index d3fb9e93023..00000000000
--- a/ham/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gnuradio_runtime_include_gnuradio_high__res__timer__h,v 1.2 2014/10/17 09:51:56 mef Exp $
-
-This patch is kind of joke, but better than nothing for packaging
-
---- gnuradio-runtime/include/gnuradio/high_res_timer.h.orig 2014-07-31 05:39:51.000000000 +0900
-+++ gnuradio-runtime/include/gnuradio/high_res_timer.h 2014-10-03 00:14:18.000000000 +0900
-@@ -23,6 +23,9 @@
- #define INCLUDED_GNURADIO_HIGH_RES_TIMER_H
-
- #include <gnuradio/api.h>
-+#ifndef CLOCK_THREAD_CPUTIME_ID
-+# define CLOCK_THREAD_CPUTIME_ID 3
-+#endif
-
- ////////////////////////////////////////////////////////////////////////
- // Use architecture defines to determine the implementation
diff --git a/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h b/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
index 3e46bfb4c64..9d3a94fb540 100644
--- a/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
+++ b/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
@@ -1,14 +1,14 @@
-$NetBSD: patch-gr-audio_lib_alsa_alsa__impl_h,v 1.3 2020/08/30 20:43:46 tnn Exp $
+$NetBSD: patch-gr-audio_lib_alsa_alsa__impl_h,v 1.4 2021/04/07 16:14:07 tnn Exp $
gnuradio-3.7.2.1/gr-audio/lib/alsa/alsa_source.cc:477:23: error: 'ESTRPIPE' was not declared in this scope
See also
https://mail-index.netbsd.org/pkgsrc-wip-discuss/2013/10/27/msg002529.html
---- gr-audio/lib/alsa/alsa_impl.h.orig 2019-08-10 06:40:34.000000000 +0900
-+++ gr-audio/lib/alsa/alsa_impl.h 2019-09-10 21:21:40.475233198 +0900
-@@ -26,6 +26,10 @@
+--- gr-audio/lib/alsa/alsa_impl.h.orig 2021-03-22 22:37:12.000000000 +0000
++++ gr-audio/lib/alsa/alsa_impl.h
+@@ -14,6 +14,10 @@
#include <alsa/asoundlib.h>
- #include <stdio.h>
+ #include <cstdio>
+#ifndef ESTRPIPE
+#define ESTRPIPE EPIPE
diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_map__bb__impl.cc b/ham/gnuradio-core/patches/patch-gr-digital_lib_map__bb__impl.cc
deleted file mode 100644
index fc84d032dcc..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-digital_lib_map__bb__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gr-digital_lib_map__bb__impl.cc,v 1.1 2020/11/29 22:35:47 dbj Exp $
-
-Add missing definition for a static class member
-fixed from upstream rev 3282fa7
-https://github.com/gnuradio/gnuradio/pull/3677
-
---- gr-digital/lib/map_bb_impl.cc.orig 2020-04-08 17:21:10.000000000 +0000
-+++ gr-digital/lib/map_bb_impl.cc
-@@ -30,6 +30,8 @@
- namespace gr {
- namespace digital {
-
-+constexpr size_t map_bb_impl::s_map_size;
-+
- map_bb::sptr map_bb::make(const std::vector<int>& map)
- {
- return gnuradio::get_initial_sptr(new map_bb_impl(map));
diff --git a/ham/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion b/ham/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
deleted file mode 100644
index a0eb0e30aa6..00000000000
--- a/ham/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-grc_scripts_gnuradio-companion,v 1.1 2020/08/30 20:43:47 tnn Exp $
-
-Add message for NetBSD when failed to import gnuradio.
-Or missing gnuradio-core package.
-
---- grc/scripts/gnuradio-companion.orig 2019-08-10 06:40:34.000000000 +0900
-+++ grc/scripts/gnuradio-companion 2019-09-16 21:26:17.217333967 +0900
-@@ -23,6 +23,7 @@ import warnings
-
- GR_IMPORT_ERROR_MESSAGE = """\
- Cannot import gnuradio.
-+You may be missing gnuradio-core package or
-
- Is the model path environment variable set correctly?
- All OS: PYTHONPATH
diff --git a/ham/gnuradio-core/version.mk b/ham/gnuradio-core/version.mk
index b3c259351d3..b1e2c0c08ac 100644
--- a/ham/gnuradio-core/version.mk
+++ b/ham/gnuradio-core/version.mk
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.1 2020/08/30 20:43:46 tnn Exp $
+# $NetBSD: version.mk,v 1.2 2021/04/07 16:14:07 tnn Exp $
-VERSION= 3.8.1.0
+VERSION= 3.9.1.0
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 00:54:04 +0000