diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 73472bf42ed2..22967aa40534 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -1,7 +1,6 @@ PORTNAME= gnuradio DISTVERSIONPREFIX= v -DISTVERSION= 3.8.1.0 -PORTREVISION= 8 +DISTVERSION= 3.8.4.0 CATEGORIES= comms astro hamradio MAINTAINER= hamradio@FreeBSD.org @@ -24,7 +23,6 @@ BUILD_DEPENDS= volk>0:devel/volk \ aconnect:audio/alsa-utils \ cheetah:devel/py-cheetah3@${PY_FLAVOR} \ cppzmq>0:net/cppzmq \ - guile:lang/guile \ minixmlto:textproc/minixmlto \ sdl-config:devel/sdl12 \ swig:devel/swig \ @@ -79,9 +77,6 @@ LIBSTRIP_FILES= analog audio blocks channels digital dtv fec fft\ vocoder wavelet OPTIONS_DEFINE= DOCS UHD TESTING DOXYGEN -# Unfortunately building docs on i386 fails -##OPTIONS_EXCLUDE_${i386}= DOXYGEN -# Yay. building docs is broken on 10 and HEAD too so turn them all off OPTIONS_EXCLUDE= DOXYGEN OPTIONS_SUB= yes UHD_DESC= Include UHD support from Ettus diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo index edda7a7f06ba..614175eb0e1f 100644 --- a/comms/gnuradio/distinfo +++ b/comms/gnuradio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586537060 -SHA256 (gnuradio-gnuradio-v3.8.1.0_GH0.tar.gz) = 4c8647192495756b867062ea2419ba3c47da1fb0dda7e159487adbca275cf9ae -SIZE (gnuradio-gnuradio-v3.8.1.0_GH0.tar.gz) = 3377761 +TIMESTAMP = 1641159466 +SHA256 (gnuradio-gnuradio-v3.8.4.0_GH0.tar.gz) = 6fbf605b4859fbf0862e9b8dc4c345d7e5bb39469d604a49b5e55b715ad45fb7 +SIZE (gnuradio-gnuradio-v3.8.4.0_GH0.tar.gz) = 3395297 diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist index 1c493d36b64d..a8cd105b792b 100644 --- a/comms/gnuradio/pkg-plist +++ b/comms/gnuradio/pkg-plist @@ -513,7 +513,6 @@ include/gnuradio/nco.h include/gnuradio/prefs.h include/gnuradio/py_feval.h include/gnuradio/pycallback_object.h -include/gnuradio/qtgui/CMakeLists.txt include/gnuradio/qtgui/ConstellationDisplayPlot.h include/gnuradio/qtgui/DisplayPlot.h include/gnuradio/qtgui/FrequencyDisplayPlot.h @@ -562,6 +561,7 @@ include/gnuradio/qtgui/waterfalldisplayform.h include/gnuradio/random.h include/gnuradio/realtime.h include/gnuradio/realtime_impl.h +include/gnuradio/rpc_shared_ptr_selection.h include/gnuradio/rpccallbackregister_base.h include/gnuradio/rpcmanager.h include/gnuradio/rpcmanager_base.h @@ -615,8 +615,12 @@ include/gnuradio/swig/digital_swig1.i include/gnuradio/swig/digital_swig1_doc.i include/gnuradio/swig/digital_swig2.i include/gnuradio/swig/digital_swig2_doc.i -include/gnuradio/swig/dtv_swig.i -include/gnuradio/swig/dtv_swig_doc.i +include/gnuradio/swig/dtv_swig0.i +include/gnuradio/swig/dtv_swig0_doc.i +include/gnuradio/swig/dtv_swig1.i +include/gnuradio/swig/dtv_swig1_doc.i +include/gnuradio/swig/dtv_swig2.i +include/gnuradio/swig/dtv_swig2_doc.i include/gnuradio/swig/fec_swig.i include/gnuradio/swig/fec_swig_doc.i include/gnuradio/swig/feval.i @@ -657,6 +661,10 @@ include/gnuradio/swig/trellis_swig0.i include/gnuradio/swig/trellis_swig0_doc.i include/gnuradio/swig/trellis_swig1.i include/gnuradio/swig/trellis_swig1_doc.i +include/gnuradio/swig/trellis_swig2.i +include/gnuradio/swig/trellis_swig2_doc.i +include/gnuradio/swig/trellis_swig3.i +include/gnuradio/swig/trellis_swig3_doc.i %%UHD%%include/gnuradio/swig/uhd_swig.i %%UHD%%include/gnuradio/swig/uhd_swig_doc.i include/gnuradio/swig/video_sdl_swig.i @@ -846,59 +854,59 @@ lib/cmake/gnuradio/gnuradio-zeromqTargets.cmake lib/cmake/gnuradio/runtime_swigTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/gnuradio/runtime_swigTargets.cmake lib/libgnuradio-analog.so -lib/libgnuradio-analog.so.3.8.1 -lib/libgnuradio-analog.so.3.8.1.0 +lib/libgnuradio-analog.so.%%PYTHON_VER%%.4 +lib/libgnuradio-analog.so.%%PORTVERSION%% lib/libgnuradio-audio.so -lib/libgnuradio-audio.so.3.8.1 -lib/libgnuradio-audio.so.3.8.1.0 +lib/libgnuradio-audio.so.%%PYTHON_VER%%.4 +lib/libgnuradio-audio.so.%%PORTVERSION%% lib/libgnuradio-blocks.so -lib/libgnuradio-blocks.so.3.8.1 -lib/libgnuradio-blocks.so.3.8.1.0 +lib/libgnuradio-blocks.so.%%PYTHON_VER%%.4 +lib/libgnuradio-blocks.so.%%PORTVERSION%% lib/libgnuradio-channels.so -lib/libgnuradio-channels.so.3.8.1 -lib/libgnuradio-channels.so.3.8.1.0 +lib/libgnuradio-channels.so.%%PYTHON_VER%%.4 +lib/libgnuradio-channels.so.%%PORTVERSION%% lib/libgnuradio-digital.so -lib/libgnuradio-digital.so.3.8.1 -lib/libgnuradio-digital.so.3.8.1.0 +lib/libgnuradio-digital.so.%%PYTHON_VER%%.4 +lib/libgnuradio-digital.so.%%PORTVERSION%% lib/libgnuradio-dtv.so -lib/libgnuradio-dtv.so.3.8.1 -lib/libgnuradio-dtv.so.3.8.1.0 +lib/libgnuradio-dtv.so.%%PYTHON_VER%%.4 +lib/libgnuradio-dtv.so.%%PORTVERSION%% lib/libgnuradio-fec.so -lib/libgnuradio-fec.so.3.8.1 -lib/libgnuradio-fec.so.3.8.1.0 +lib/libgnuradio-fec.so.%%PYTHON_VER%%.4 +lib/libgnuradio-fec.so.%%PORTVERSION%% lib/libgnuradio-fft.so -lib/libgnuradio-fft.so.3.8.1 -lib/libgnuradio-fft.so.3.8.1.0 +lib/libgnuradio-fft.so.%%PYTHON_VER%%.4 +lib/libgnuradio-fft.so.%%PORTVERSION%% lib/libgnuradio-filter.so -lib/libgnuradio-filter.so.3.8.1 -lib/libgnuradio-filter.so.3.8.1.0 +lib/libgnuradio-filter.so.%%PYTHON_VER%%.4 +lib/libgnuradio-filter.so.%%PORTVERSION%% lib/libgnuradio-pmt.so -lib/libgnuradio-pmt.so.3.8.1 -lib/libgnuradio-pmt.so.3.8.1.0 +lib/libgnuradio-pmt.so.%%PYTHON_VER%%.4 +lib/libgnuradio-pmt.so.%%PORTVERSION%% lib/libgnuradio-qtgui.so -lib/libgnuradio-qtgui.so.3.8.1 -lib/libgnuradio-qtgui.so.3.8.1.0 +lib/libgnuradio-qtgui.so.%%PYTHON_VER%%.4 +lib/libgnuradio-qtgui.so.%%PORTVERSION%% lib/libgnuradio-runtime.so -lib/libgnuradio-runtime.so.3.8.1 -lib/libgnuradio-runtime.so.3.8.1.0 +lib/libgnuradio-runtime.so.%%PYTHON_VER%%.4 +lib/libgnuradio-runtime.so.%%PORTVERSION%% lib/libgnuradio-trellis.so -lib/libgnuradio-trellis.so.3.8.1 -lib/libgnuradio-trellis.so.3.8.1.0 +lib/libgnuradio-trellis.so.%%PYTHON_VER%%.4 +lib/libgnuradio-trellis.so.%%PORTVERSION%% %%UHD%%lib/libgnuradio-uhd.so -%%UHD%%lib/libgnuradio-uhd.so.3.8.1 -%%UHD%%lib/libgnuradio-uhd.so.3.8.1.0 +%%UHD%%lib/libgnuradio-uhd.so.%%PYTHON_VER%%.4 +%%UHD%%lib/libgnuradio-uhd.so.%%PORTVERSION%% lib/libgnuradio-video-sdl.so -lib/libgnuradio-video-sdl.so.3.8.1 -lib/libgnuradio-video-sdl.so.3.8.1.0 +lib/libgnuradio-video-sdl.so.%%PYTHON_VER%%.4 +lib/libgnuradio-video-sdl.so.%%PORTVERSION%% lib/libgnuradio-vocoder.so -lib/libgnuradio-vocoder.so.3.8.1 -lib/libgnuradio-vocoder.so.3.8.1.0 +lib/libgnuradio-vocoder.so.%%PYTHON_VER%%.4 +lib/libgnuradio-vocoder.so.%%PORTVERSION%% lib/libgnuradio-wavelet.so -lib/libgnuradio-wavelet.so.3.8.1 -lib/libgnuradio-wavelet.so.3.8.1.0 +lib/libgnuradio-wavelet.so.%%PYTHON_VER%%.4 +lib/libgnuradio-wavelet.so.%%PORTVERSION%% lib/libgnuradio-zeromq.so -lib/libgnuradio-zeromq.so.3.8.1 -lib/libgnuradio-zeromq.so.3.8.1.0 +lib/libgnuradio-zeromq.so.%%PYTHON_VER%%.4 +lib/libgnuradio-zeromq.so.%%PORTVERSION%% %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo @@ -996,6 +1004,9 @@ lib/libgnuradio-zeromq.so.3.8.1.0 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig9.py %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig9.pyc %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig9.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/matrix_interleaver.py +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/matrix_interleaver.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/matrix_interleaver.pyo %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.py %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.pyc %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.pyo @@ -1160,7 +1171,9 @@ lib/libgnuradio-zeromq.so.3.8.1.0 %%PYTHON_SITELIBDIR%%/gnuradio/dtv/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/dtv/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/dtv/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/dtv/_dtv_swig.so +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/_dtv_swig0.so +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/_dtv_swig1.so +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/_dtv_swig2.so %%PYTHON_SITELIBDIR%%/gnuradio/dtv/atsc_rx.py %%PYTHON_SITELIBDIR%%/gnuradio/dtv/atsc_rx.pyc %%PYTHON_SITELIBDIR%%/gnuradio/dtv/atsc_rx.pyo @@ -1170,6 +1183,15 @@ lib/libgnuradio-zeromq.so.3.8.1.0 %%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig0.py +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig0.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig0.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig1.py +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig1.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig1.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig2.py +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig2.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig2.pyo %%PYTHON_SITELIBDIR%%/gnuradio/eng_arg.py %%PYTHON_SITELIBDIR%%/gnuradio/eng_arg.pyc %%PYTHON_SITELIBDIR%%/gnuradio/eng_arg.pyo @@ -1802,6 +1824,8 @@ lib/libgnuradio-zeromq.so.3.8.1.0 %%PYTHON_SITELIBDIR%%/gnuradio/trellis/__init__.pyo %%PYTHON_SITELIBDIR%%/gnuradio/trellis/_trellis_swig0.so %%PYTHON_SITELIBDIR%%/gnuradio/trellis/_trellis_swig1.so +%%PYTHON_SITELIBDIR%%/gnuradio/trellis/_trellis_swig2.so +%%PYTHON_SITELIBDIR%%/gnuradio/trellis/_trellis_swig3.so %%PYTHON_SITELIBDIR%%/gnuradio/trellis/fsm_utils.py %%PYTHON_SITELIBDIR%%/gnuradio/trellis/fsm_utils.pyc %%PYTHON_SITELIBDIR%%/gnuradio/trellis/fsm_utils.pyo @@ -1814,6 +1838,12 @@ lib/libgnuradio-zeromq.so.3.8.1.0 %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig1.py %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig1.pyc %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig1.pyo +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig2.py +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig2.pyc +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig2.pyo +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig3.py +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig3.pyc +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig3.pyo %%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.py %%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyc %%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyo @@ -1927,6 +1957,7 @@ share/applications/gnuradio-grc.desktop %%DATADIR%%/examples/audio/noise.py %%DATADIR%%/examples/audio/spectrum_inversion.py %%DATADIR%%/examples/audio/test_resampler.py +%%DATADIR%%/examples/blocks/matrix_interleaver.grc %%DATADIR%%/examples/blocks/matrix_multiplexer.grc %%DATADIR%%/examples/blocks/peak_detector2.grc %%DATADIR%%/examples/blocks/py_snippets_demo.grc @@ -2284,6 +2315,7 @@ share/applications/gnuradio-grc.desktop %%DATADIR%%/grc/blocks/blocks_keep_m_in_n.block.yml %%DATADIR%%/grc/blocks/blocks_keep_one_in_n.block.yml %%DATADIR%%/grc/blocks/blocks_magphase_to_complex.block.yml +%%DATADIR%%/grc/blocks/blocks_matrix_interleaver.block.yml %%DATADIR%%/grc/blocks/blocks_max_xx.block.yml %%DATADIR%%/grc/blocks/blocks_message_debug.block.yml %%DATADIR%%/grc/blocks/blocks_message_strobe.block.yml @@ -2641,6 +2673,7 @@ share/applications/gnuradio-grc.desktop %%DATADIR%%/grc/blocks/variable_struct.block.yml %%DATADIR%%/grc/blocks/video.tree.yml %%DATADIR%%/grc/blocks/video_sdl_sink.block.yml +%%DATADIR%%/grc/blocks/vocoder.tree.yml %%DATADIR%%/grc/blocks/vocoder_alaw_decode_bs.block.yml %%DATADIR%%/grc/blocks/vocoder_alaw_encode_sb.block.yml %%DATADIR%%/grc/blocks/vocoder_codec2_decode_ps.block.yml