gnuradio-digital: catch up w/ gnuradio-core

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnuradio-digital: catch up w/ gnuradio-core
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Sun, 02 Aug 2020 07:04:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 09:04:20 2020 +0200
Changeset:	485f1e2e2222f3b0f5eb0879496ddc3303baf160

Modified Files:
	gnuradio-digital/Makefile
	gnuradio-digital/PLIST
	gnuradio-digital/buildlink3.mk

Log Message:
gnuradio-digital: catch up w/ gnuradio-core

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=485f1e2e2222f3b0f5eb0879496ddc3303baf160

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

diffstat:
 gnuradio-digital/Makefile      |   8 +--
 gnuradio-digital/PLIST         | 158 +++++++++--------------------------------
 gnuradio-digital/buildlink3.mk |   6 +-
 3 files changed, 40 insertions(+), 132 deletions(-)

diffs:
diff --git a/gnuradio-digital/Makefile b/gnuradio-digital/Makefile
index d783e86a20..af112f75b1 100644
--- a/gnuradio-digital/Makefile
+++ b/gnuradio-digital/Makefile
@@ -1,14 +1,12 @@
 # $NetBSD: Makefile,v 1.17 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-digital-${VERSION}
-PKGREVISION=	2
 COMMENT=	Digital related algorithms for GNU Radio
 
-.include	"../../ham/gnuradio-core/Makefile.common"
-.include	"../../ham/gnuradio-core/Nocore.mk"
+.include	"../../wip/gnuradio-core/Makefile.common"
+.include	"../../wip/gnuradio-core/Nocore.mk"
 # link to libgnuradio-fft.so.${PKGVERSON_NOREV}
-.include       "../../ham/gnuradio-core/buildlink3.mk"
-
+.include       "../../wip/gnuradio-core/buildlink3.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_DIGITAL=True
diff --git a/gnuradio-digital/PLIST b/gnuradio-digital/PLIST
index d1caff3b97..73fda2ed5c 100644
--- a/gnuradio-digital/PLIST
+++ b/gnuradio-digital/PLIST
@@ -1,15 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2018/07/16 07:55:22 mef Exp $
+@comment $NetBSD$
 include/gnuradio/digital/additive_scrambler_bb.h
 include/gnuradio/digital/api.h
 include/gnuradio/digital/binary_slicer_fb.h
-include/gnuradio/digital/burst_shaper_cc.h
-include/gnuradio/digital/burst_shaper_ff.h
-include/gnuradio/digital/chunks_to_symbols_bc.h
-include/gnuradio/digital/chunks_to_symbols_bf.h
-include/gnuradio/digital/chunks_to_symbols_ic.h
-include/gnuradio/digital/chunks_to_symbols_if.h
-include/gnuradio/digital/chunks_to_symbols_sc.h
-include/gnuradio/digital/chunks_to_symbols_sf.h
+include/gnuradio/digital/burst_shaper.h
+include/gnuradio/digital/chunks_to_symbols.h
 include/gnuradio/digital/clock_recovery_mm_cc.h
 include/gnuradio/digital/clock_recovery_mm_ff.h
 include/gnuradio/digital/cma_equalizer_cc.h
@@ -23,7 +17,6 @@ include/gnuradio/digital/correlate_access_code_bb_ts.h
 include/gnuradio/digital/correlate_access_code_ff_ts.h
 include/gnuradio/digital/correlate_access_code_tag_bb.h
 include/gnuradio/digital/correlate_access_code_tag_ff.h
-include/gnuradio/digital/correlate_and_sync_cc.h
 include/gnuradio/digital/costas_loop_cc.h
 include/gnuradio/digital/cpmmod_bc.h
 include/gnuradio/digital/crc32.h
@@ -54,7 +47,6 @@ include/gnuradio/digital/lms_dd_equalizer_cc.h
 include/gnuradio/digital/map_bb.h
 include/gnuradio/digital/metric_type.h
 include/gnuradio/digital/modulate_vector.h
-include/gnuradio/digital/mpsk_receiver_cc.h
 include/gnuradio/digital/mpsk_snr_est.h
 include/gnuradio/digital/mpsk_snr_est_cc.h
 include/gnuradio/digital/msk_timing_recovery_cc.h
@@ -64,12 +56,7 @@ include/gnuradio/digital/ofdm_cyclic_prefixer.h
 include/gnuradio/digital/ofdm_equalizer_base.h
 include/gnuradio/digital/ofdm_equalizer_simpledfe.h
 include/gnuradio/digital/ofdm_equalizer_static.h
-include/gnuradio/digital/ofdm_frame_acquisition.h
 include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h
-include/gnuradio/digital/ofdm_frame_sink.h
-include/gnuradio/digital/ofdm_insert_preamble.h
-include/gnuradio/digital/ofdm_mapper_bcv.h
-include/gnuradio/digital/ofdm_sampler.h
 include/gnuradio/digital/ofdm_serializer_vcc.h
 include/gnuradio/digital/ofdm_sync_sc_cfb.h
 include/gnuradio/digital/packet_header_default.h
@@ -101,7 +88,11 @@ include/gnuradio/swig/digital_swig2.i
 include/gnuradio/swig/digital_swig2_doc.i
 include/gnuradio/swig/ofdm_equalizer.i
 include/gnuradio/swig/packet_header.i
+lib/cmake/gnuradio/gnuradio-digitalConfig.cmake
+lib/cmake/gnuradio/gnuradio-digitalTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-digitalTargets.cmake
 lib/libgnuradio-digital.so
+lib/libgnuradio-digital.so.3.8.1
 lib/libgnuradio-digital.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-digital.pc
 ${PYSITELIB}/gnuradio/digital/__init__.py
@@ -173,9 +164,6 @@ ${PYSITELIB}/gnuradio/digital/ofdm_txrx.pyo
 ${PYSITELIB}/gnuradio/digital/packet_utils.py
 ${PYSITELIB}/gnuradio/digital/packet_utils.pyc
 ${PYSITELIB}/gnuradio/digital/packet_utils.pyo
-${PYSITELIB}/gnuradio/digital/pkt.py
-${PYSITELIB}/gnuradio/digital/pkt.pyc
-${PYSITELIB}/gnuradio/digital/pkt.pyo
 ${PYSITELIB}/gnuradio/digital/psk.py
 ${PYSITELIB}/gnuradio/digital/psk.pyc
 ${PYSITELIB}/gnuradio/digital/psk.pyo
@@ -212,49 +200,29 @@ ${PYSITELIB}/gnuradio/digital/utils/mod_codes.pyo
 ${PYSITELIB}/gnuradio/digital/utils/tagged_streams.py
 ${PYSITELIB}/gnuradio/digital/utils/tagged_streams.pyc
 ${PYSITELIB}/gnuradio/digital/utils/tagged_streams.pyo
-${PYSITELIB}/grc_gnuradio/blks2/packet.py
-${PYSITELIB}/grc_gnuradio/blks2/packet.pyc
-${PYSITELIB}/grc_gnuradio/blks2/packet.pyo
 share/doc/gnuradio-${PKGVERSION}/README.digital
 share/gnuradio/examples/digital/burst_shaper.grc
-share/gnuradio/examples/digital/demod/ber_simulation.grc
 share/gnuradio/examples/digital/demod/constellation_soft_decoder.grc
 share/gnuradio/examples/digital/demod/digital_freq_lock.grc
-share/gnuradio/examples/digital/demod/dpsk_loopback.grc
-share/gnuradio/examples/digital/demod/gfsk_loopback.grc
-share/gnuradio/examples/digital/demod/mpsk_demod.grc
 share/gnuradio/examples/digital/demod/pam_sync.grc
 share/gnuradio/examples/digital/demod/pam_timing.grc
 share/gnuradio/examples/digital/demod/symbol_sync_test_complex.grc
 share/gnuradio/examples/digital/demod/symbol_sync_test_float.grc
 share/gnuradio/examples/digital/demod/symbol_sync_test_float_ted_gain.m
-share/gnuradio/examples/digital/demod/test_corr_and_sync.grc
 share/gnuradio/examples/digital/demod/test_corr_est.grc
-share/gnuradio/examples/digital/demod/uhd_corr_and_sync_rx.grc
-share/gnuradio/examples/digital/demod/uhd_corr_and_sync_tx.grc
 share/gnuradio/examples/digital/example_costas.py
 share/gnuradio/examples/digital/example_fll.py
 share/gnuradio/examples/digital/example_timing.py
 share/gnuradio/examples/digital/gen_whitener.py
-share/gnuradio/examples/digital/narrowband/benchmark_rx.py
-share/gnuradio/examples/digital/narrowband/benchmark_tx.py
+share/gnuradio/examples/digital/narrowband/benchmark_add_channel.py
 share/gnuradio/examples/digital/narrowband/digital_bert_rx.py
 share/gnuradio/examples/digital/narrowband/digital_bert_tx.py
-share/gnuradio/examples/digital/narrowband/receive_path.py
-share/gnuradio/examples/digital/narrowband/rx_voice.py
-share/gnuradio/examples/digital/narrowband/transmit_path.py
-share/gnuradio/examples/digital/narrowband/tunnel.py
-share/gnuradio/examples/digital/narrowband/tx_voice.py
 share/gnuradio/examples/digital/narrowband/uhd_interface.py
 share/gnuradio/examples/digital/ofdm/benchmark_add_channel.py
-share/gnuradio/examples/digital/ofdm/benchmark_rx.py
-share/gnuradio/examples/digital/ofdm/benchmark_tx.py
-share/gnuradio/examples/digital/ofdm/gr_plot_ofdm.py
 share/gnuradio/examples/digital/ofdm/ofdm_loopback.grc
 share/gnuradio/examples/digital/ofdm/receive_path.py
 share/gnuradio/examples/digital/ofdm/rx_ofdm.grc
 share/gnuradio/examples/digital/ofdm/transmit_path.py
-share/gnuradio/examples/digital/ofdm/tunnel.py
 share/gnuradio/examples/digital/ofdm/tx_ofdm.grc
 share/gnuradio/examples/digital/ofdm/uhd_interface.py
 share/gnuradio/examples/digital/packet/burst_tagger.grc
@@ -282,87 +250,29 @@ share/gnuradio/examples/digital/packet/uhd_packet_tx.grc
 share/gnuradio/examples/digital/packet/uhd_packet_tx_tun.grc
 share/gnuradio/examples/digital/run_length.py
 share/gnuradio/examples/digital/snr_estimators.py
-share/gnuradio/grc/blocks/blks2_packet_decoder.xml
-share/gnuradio/grc/blocks/blks2_packet_encoder.xml
-share/gnuradio/grc/blocks/digital_additive_scrambler_bb.xml
-share/gnuradio/grc/blocks/digital_binary_slicer_fb.xml
-share/gnuradio/grc/blocks/digital_block_tree.xml
-share/gnuradio/grc/blocks/digital_burst_shaper.xml
-share/gnuradio/grc/blocks/digital_chunks_to_symbols.xml
-share/gnuradio/grc/blocks/digital_clock_recovery_mm_xx.xml
-share/gnuradio/grc/blocks/digital_cma_equalizer_cc.xml
-share/gnuradio/grc/blocks/digital_constellation.xml
-share/gnuradio/grc/blocks/digital_constellation_decoder_cb.xml
-share/gnuradio/grc/blocks/digital_constellation_modulator.xml
-share/gnuradio/grc/blocks/digital_constellation_receiver_cb.xml
-share/gnuradio/grc/blocks/digital_constellation_rect.xml
-share/gnuradio/grc/blocks/digital_constellation_soft_decoder_cf.xml
-share/gnuradio/grc/blocks/digital_corr_est_cc.xml
-share/gnuradio/grc/blocks/digital_correlate_access_code_bb.xml
-share/gnuradio/grc/blocks/digital_correlate_access_code_tag_xx.xml
-share/gnuradio/grc/blocks/digital_correlate_access_code_xx_ts.xml
-share/gnuradio/grc/blocks/digital_correlate_and_sync_cc.xml
-share/gnuradio/grc/blocks/digital_costas_loop_cc.xml
-share/gnuradio/grc/blocks/digital_cpmmod_bc.xml
-share/gnuradio/grc/blocks/digital_crc32_async_bb.xml
-share/gnuradio/grc/blocks/digital_crc32_bb.xml
-share/gnuradio/grc/blocks/digital_descrambler_bb.xml
-share/gnuradio/grc/blocks/digital_diff_decoder_bb.xml
-share/gnuradio/grc/blocks/digital_diff_encoder_bb.xml
-share/gnuradio/grc/blocks/digital_diff_phasor_cc.xml
-share/gnuradio/grc/blocks/digital_dxpsk_demod.xml
-share/gnuradio/grc/blocks/digital_dxpsk_mod.xml
-share/gnuradio/grc/blocks/digital_fll_band_edge_cc.xml
-share/gnuradio/grc/blocks/digital_framer_sink_1.xml
-share/gnuradio/grc/blocks/digital_gfsk_demod.xml
-share/gnuradio/grc/blocks/digital_gfsk_mod.xml
-share/gnuradio/grc/blocks/digital_glfsr_source_x.xml
-share/gnuradio/grc/blocks/digital_gmsk_demod.xml
-share/gnuradio/grc/blocks/digital_gmsk_mod.xml
-share/gnuradio/grc/blocks/digital_gmskmod_bc.xml
-share/gnuradio/grc/blocks/digital_hdlc_deframer_bp.xml
-share/gnuradio/grc/blocks/digital_hdlc_framer_pb.xml
-share/gnuradio/grc/blocks/digital_header_payload_demux.xml
-share/gnuradio/grc/blocks/digital_kurtotic_equalizer_cc.xml
-share/gnuradio/grc/blocks/digital_lms_dd_equalizer_cc.xml
-share/gnuradio/grc/blocks/digital_map_bb.xml
-share/gnuradio/grc/blocks/digital_modulate_vector.xml
-share/gnuradio/grc/blocks/digital_mpsk_receiver_cc.xml
-share/gnuradio/grc/blocks/digital_mpsk_snr_est_cc.xml
-share/gnuradio/grc/blocks/digital_msk_timing_recovery_cc.xml
-share/gnuradio/grc/blocks/digital_ofdm_carrier_allocator_cvc.xml
-share/gnuradio/grc/blocks/digital_ofdm_chanest_vcvc.xml
-share/gnuradio/grc/blocks/digital_ofdm_cyclic_prefixer.xml
-share/gnuradio/grc/blocks/digital_ofdm_demod.xml
-share/gnuradio/grc/blocks/digital_ofdm_frame_acquisition.xml
-share/gnuradio/grc/blocks/digital_ofdm_frame_equalizer_vcvc.xml
-share/gnuradio/grc/blocks/digital_ofdm_frame_sink.xml
-share/gnuradio/grc/blocks/digital_ofdm_insert_preamble.xml
-share/gnuradio/grc/blocks/digital_ofdm_mod.xml
-share/gnuradio/grc/blocks/digital_ofdm_rx.xml
-share/gnuradio/grc/blocks/digital_ofdm_sampler.xml
-share/gnuradio/grc/blocks/digital_ofdm_serializer_vcc.xml
-share/gnuradio/grc/blocks/digital_ofdm_sync_pn.xml
-share/gnuradio/grc/blocks/digital_ofdm_sync_sc_cfb.xml
-share/gnuradio/grc/blocks/digital_ofdm_tx.xml
-share/gnuradio/grc/blocks/digital_packet_headergenerator_bb.xml
-share/gnuradio/grc/blocks/digital_packet_headergenerator_bb_default.xml
-share/gnuradio/grc/blocks/digital_packet_headerparser_b.xml
-share/gnuradio/grc/blocks/digital_packet_headerparser_b_default.xml
-share/gnuradio/grc/blocks/digital_packet_sink.xml
-share/gnuradio/grc/blocks/digital_pfb_clock_sync.xml
-share/gnuradio/grc/blocks/digital_pn_correlator_cc.xml
-share/gnuradio/grc/blocks/digital_probe_density_b.xml
-share/gnuradio/grc/blocks/digital_probe_mpsk_snr_est_c.xml
-share/gnuradio/grc/blocks/digital_protocol_formatter_async.xml
-share/gnuradio/grc/blocks/digital_protocol_formatter_bb.xml
-share/gnuradio/grc/blocks/digital_protocol_parser_b.xml
-share/gnuradio/grc/blocks/digital_psk_demod.xml
-share/gnuradio/grc/blocks/digital_psk_mod.xml
-share/gnuradio/grc/blocks/digital_qam_demod.xml
-share/gnuradio/grc/blocks/digital_qam_mod.xml
-share/gnuradio/grc/blocks/digital_scrambler_bb.xml
-share/gnuradio/grc/blocks/digital_simple_correlator.xml
-share/gnuradio/grc/blocks/digital_simple_framer.xml
-share/gnuradio/grc/blocks/digital_symbol_sync_xx.xml
-share/gnuradio/grc/blocks/variable_header_format_default.xml
+@pkgdir share/gnuradio/examples/volk_benchmark
+@pkgdir share/gnuradio/examples/tags
+@pkgdir share/gnuradio/examples/network
+@pkgdir share/gnuradio/examples/mp-sched
+@pkgdir share/gnuradio/examples/metadata
+@pkgdir share/gnuradio/examples/filter
+@pkgdir share/gnuradio/examples/blocks
+@pkgdir share/gnuradio/examples/audio
+@pkgdir share/gnuradio/examples/analog
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
+@pkgdir include/pmt
+@pkgdir include/gnuradio/thread
+@pkgdir include/gnuradio/messages
+@pkgdir include/gnuradio/filter
+@pkgdir include/gnuradio/fft
+@pkgdir include/gnuradio/blocks
+@pkgdir include/gnuradio/audio
+@pkgdir include/gnuradio/analog
+@pkgdir bin
diff --git a/gnuradio-digital/buildlink3.mk b/gnuradio-digital/buildlink3.mk
index 855c1476f5..2a2d570905 100644
--- a/gnuradio-digital/buildlink3.mk
+++ b/gnuradio-digital/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-digital
 .if !defined(GNURADIO_DIGITAL_BUILDLINK3_MK)
 GNURADIO_DIGITAL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-digital+=	gnuradio-digital>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-digital+=	gnuradio-digital>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-digital?=		../../ham/gnuradio-digital
+BUILDLINK_API_DEPENDS.gnuradio-digital+=	gnuradio-digital>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-digital+=	gnuradio-digital>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-digital?=		../../wip/gnuradio-digital
 .endif # GNURADIO_DIGITAL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-digital
Prev by Date: gnuradio-vocoder: catch up w/ gnuradio-core
Next by Date: gnuradio-pager: add TODO item
Previous by Thread: gnuradio-vocoder: catch up w/ gnuradio-core
Next by Thread: gnuradio-pager: add TODO item
Indexes:
Home | Main Index | Thread Index | Old Index