gnuradio-dtv: catch up w/ gnuradio-core

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

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 09:28:05 2020 +0200
Changeset:	4a5ef9c7f2a03b2cdb5cce7783dcd98a5494723f

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

Log Message:
gnuradio-dtv: 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=4a5ef9c7f2a03b2cdb5cce7783dcd98a5494723f

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

diffstat:
 gnuradio-dtv/Makefile      |   7 ++-
 gnuradio-dtv/PLIST         | 104 ++++++++++++++++++---------------------------
 gnuradio-dtv/buildlink3.mk |   6 +--
 3 files changed, 48 insertions(+), 69 deletions(-)

diffs:
diff --git a/gnuradio-dtv/Makefile b/gnuradio-dtv/Makefile
index 4836f10600..b58fc9642f 100644
--- a/gnuradio-dtv/Makefile
+++ b/gnuradio-dtv/Makefile
@@ -1,18 +1,17 @@
 # $NetBSD: Makefile,v 1.19 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-dtv-${VERSION}
-PKGREVISION=	2
 COMMENT=	Various digital television standards of 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"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_DTV=True
 CMAKE_ARGS+=	-DENABLE_GR_FEC=True
 
 PLIST_MINUS+=	fec
-.include	"../../ham/gnuradio-fec/buildlink3.mk"
+.include	"../../wip/gnuradio-fec/buildlink3.mk"
 .include	"../../math/gsl/buildlink3.mk"
 
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-dtv/PLIST b/gnuradio-dtv/PLIST
index 5d30a3f281..84e89be73c 100644
--- a/gnuradio-dtv/PLIST
+++ b/gnuradio-dtv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2018/07/16 07:55:22 mef Exp $
+@comment $NetBSD$
 include/gnuradio/dtv/api.h
 include/gnuradio/dtv/atsc_consts.h
 include/gnuradio/dtv/atsc_deinterleaver.h
@@ -60,7 +60,11 @@ include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h
 include/gnuradio/dtv/dvbt_viterbi_decoder.h
 include/gnuradio/swig/dtv_swig.i
 include/gnuradio/swig/dtv_swig_doc.i
+lib/cmake/gnuradio/gnuradio-dtvConfig.cmake
+lib/cmake/gnuradio/gnuradio-dtvTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-dtvTargets.cmake
 lib/libgnuradio-dtv.so
+lib/libgnuradio-dtv.so.3.8.1
 lib/libgnuradio-dtv.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-dtv.pc
 ${PYSITELIB}/gnuradio/dtv/__init__.py
@@ -77,6 +81,7 @@ ${PYSITELIB}/gnuradio/dtv/dtv_swig.py
 ${PYSITELIB}/gnuradio/dtv/dtv_swig.pyc
 ${PYSITELIB}/gnuradio/dtv/dtv_swig.pyo
 share/doc/gnuradio-${PKGVERSION}/README.dtv
+share/gnuradio/examples/dtv/README.atsc
 share/gnuradio/examples/dtv/README.catv
 share/gnuradio/examples/dtv/README.dvbs
 share/gnuradio/examples/dtv/README.dvbs2
@@ -91,12 +96,6 @@ share/gnuradio/examples/dtv/dvbt_tx_2k.grc
 share/gnuradio/examples/dtv/dvbt_tx_8k.grc
 share/gnuradio/examples/dtv/file_atsc_rx.grc
 share/gnuradio/examples/dtv/file_atsc_tx.grc
-share/gnuradio/examples/dtv/uhd_atsc_capture.grc
-share/gnuradio/examples/dtv/uhd_rx_atsc.grc
-share/gnuradio/examples/dtv/vv003-cr23.grc
-share/gnuradio/examples/dtv/vv009-4kfft.grc
-share/gnuradio/examples/dtv/vv018-miso.grc
-share/gnuradio/examples/dtv/README.atsc
 share/gnuradio/examples/dtv/germany-g1.grc
 share/gnuradio/examples/dtv/germany-g10.grc
 share/gnuradio/examples/dtv/germany-g2.grc
@@ -107,12 +106,16 @@ share/gnuradio/examples/dtv/germany-g6.grc
 share/gnuradio/examples/dtv/germany-g7.grc
 share/gnuradio/examples/dtv/germany-g8.grc
 share/gnuradio/examples/dtv/germany-g9.grc
+share/gnuradio/examples/dtv/uhd_atsc_capture.grc
 share/gnuradio/examples/dtv/uhd_atsc_tx.grc
+share/gnuradio/examples/dtv/uhd_rx_atsc.grc
 share/gnuradio/examples/dtv/vv001-cr35.grc
+share/gnuradio/examples/dtv/vv003-cr23.grc
 share/gnuradio/examples/dtv/vv004-8kfft.grc
 share/gnuradio/examples/dtv/vv005-8kfft.grc
 share/gnuradio/examples/dtv/vv007-16kfft.grc
 share/gnuradio/examples/dtv/vv008-16kfft.grc
+share/gnuradio/examples/dtv/vv009-4kfft.grc
 share/gnuradio/examples/dtv/vv010-2kfft.grc
 share/gnuradio/examples/dtv/vv011-1kfft.grc
 share/gnuradio/examples/dtv/vv012-64qam45.grc
@@ -121,62 +124,39 @@ share/gnuradio/examples/dtv/vv014-64qam34.grc
 share/gnuradio/examples/dtv/vv015-8kfft.grc
 share/gnuradio/examples/dtv/vv016-256qam34.grc
 share/gnuradio/examples/dtv/vv017-paprtr.grc
+share/gnuradio/examples/dtv/vv018-miso.grc
 share/gnuradio/examples/dtv/vv019-norot.grc
 share/gnuradio/examples/dtv/vv034-dtg016.grc
 share/gnuradio/examples/dtv/vv035-dtg052.grc
 share/gnuradio/examples/dtv/vv036-dtg091.grc
-share/gnuradio/grc/blocks/dtv_atsc_deinterleaver.xml
-share/gnuradio/grc/blocks/dtv_atsc_depad.xml
-share/gnuradio/grc/blocks/dtv_atsc_derandomizer.xml
-share/gnuradio/grc/blocks/dtv_atsc_equalizer.xml
-share/gnuradio/grc/blocks/dtv_atsc_field_sync_mux.xml
-share/gnuradio/grc/blocks/dtv_atsc_fpll.xml
-share/gnuradio/grc/blocks/dtv_atsc_fs_checker.xml
-share/gnuradio/grc/blocks/dtv_atsc_interleaver.xml
-share/gnuradio/grc/blocks/dtv_atsc_pad.xml
-share/gnuradio/grc/blocks/dtv_atsc_randomizer.xml
-share/gnuradio/grc/blocks/dtv_atsc_rs_decoder.xml
-share/gnuradio/grc/blocks/dtv_atsc_rs_encoder.xml
-share/gnuradio/grc/blocks/dtv_atsc_rx.xml
-share/gnuradio/grc/blocks/dtv_atsc_rx_filter.xml
-share/gnuradio/grc/blocks/dtv_atsc_sync.xml
-share/gnuradio/grc/blocks/dtv_atsc_trellis_encoder.xml
-share/gnuradio/grc/blocks/dtv_atsc_viterbi_decoder.xml
-share/gnuradio/grc/blocks/dtv_block_tree.xml
-share/gnuradio/grc/blocks/dtv_catv_frame_sync_enc_bb.xml
-share/gnuradio/grc/blocks/dtv_catv_randomizer_bb.xml
-share/gnuradio/grc/blocks/dtv_catv_reed_solomon_enc_bb.xml
-share/gnuradio/grc/blocks/dtv_catv_transport_framing_enc_bb.xml
-share/gnuradio/grc/blocks/dtv_catv_trellis_enc_bb.xml
-share/gnuradio/grc/blocks/dtv_dvb_bbheader_bb.xml
-share/gnuradio/grc/blocks/dtv_dvb_bbscrambler_bb.xml
-share/gnuradio/grc/blocks/dtv_dvb_bch_bb.xml
-share/gnuradio/grc/blocks/dtv_dvb_ldpc_bb.xml
-share/gnuradio/grc/blocks/dtv_dvbs2_interleaver_bb.xml
-share/gnuradio/grc/blocks/dtv_dvbs2_modulator_bc.xml
-share/gnuradio/grc/blocks/dtv_dvbs2_physical_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_cellinterleaver_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_framemapper_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_freqinterleaver_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_interleaver_bb.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_miso_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_modulator_bc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_p1insertion_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_paprtr_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt2_pilotgenerator_cc.xml
-share/gnuradio/grc/blocks/dtv_dvbt_bit_inner_deinterleaver.xml
-share/gnuradio/grc/blocks/dtv_dvbt_bit_inner_interleaver.xml
-share/gnuradio/grc/blocks/dtv_dvbt_convolutional_deinterleaver.xml
-share/gnuradio/grc/blocks/dtv_dvbt_convolutional_interleaver.xml
-share/gnuradio/grc/blocks/dtv_dvbt_demap.xml
-share/gnuradio/grc/blocks/dtv_dvbt_demod_reference_signals.xml
-share/gnuradio/grc/blocks/dtv_dvbt_energy_descramble.xml
-share/gnuradio/grc/blocks/dtv_dvbt_energy_dispersal.xml
-share/gnuradio/grc/blocks/dtv_dvbt_inner_coder.xml
-share/gnuradio/grc/blocks/dtv_dvbt_map.xml
-share/gnuradio/grc/blocks/dtv_dvbt_ofdm_sym_acquisition.xml
-share/gnuradio/grc/blocks/dtv_dvbt_reed_solomon_dec.xml
-share/gnuradio/grc/blocks/dtv_dvbt_reed_solomon_enc.xml
-share/gnuradio/grc/blocks/dtv_dvbt_reference_signals.xml
-share/gnuradio/grc/blocks/dtv_dvbt_symbol_inner_interleaver.xml
-share/gnuradio/grc/blocks/dtv_dvbt_viterbi_decoder.xml
+@pkgdir share/gnuradio/fec/ldpc
+@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/fec
+@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/fec/polar
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fec/LDPC
+@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/fec
+@pkgdir include/gnuradio/blocks
+@pkgdir include/gnuradio/audio
+@pkgdir include/gnuradio/analog
+@pkgdir bin
diff --git a/gnuradio-dtv/buildlink3.mk b/gnuradio-dtv/buildlink3.mk
index 6b5426d7c1..b1b02178fd 100644
--- a/gnuradio-dtv/buildlink3.mk
+++ b/gnuradio-dtv/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-dtv
 .if !defined(GNURADIO_DTV_BUILDLINK3_MK)
 GNURADIO_DTV_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-dtv?=	../../ham/gnuradio-dtv
+BUILDLINK_API_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-dtv?=	../../wip/gnuradio-dtv
 .endif # GNURADIO_DTV_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-dtv