gnuradio-trellis: 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 10:36:00 2020 +0200
Changeset:	54af4f5a138de093f45887ad4d8e45aa9f040bb6

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

Log Message:
gnuradio-trellis: 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=54af4f5a138de093f45887ad4d8e45aa9f040bb6

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

diffstat:
 gnuradio-trellis/Makefile      | 10 ++---
 gnuradio-trellis/PLIST         | 98 ++++++++++++------------------------------
 gnuradio-trellis/buildlink3.mk |  6 +--
 3 files changed, 36 insertions(+), 78 deletions(-)

diffs:
diff --git a/gnuradio-trellis/Makefile b/gnuradio-trellis/Makefile
index b4336c0b7f..54b88765f1 100644
--- a/gnuradio-trellis/Makefile
+++ b/gnuradio-trellis/Makefile
@@ -1,19 +1,19 @@
 # $NetBSD: Makefile,v 1.35 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-trellis-${VERSION}
-PKGREVISION=	2
 COMMENT=	Trellis-based encoding and decoding 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"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_TRELLIS=True
 CMAKE_ARGS+=	-DENABLE_GR_DIGITAL=True
+CMAKE_ARGS+=	-DENABLE_GRC=True
 
-DEPENDS+=	gnuradio-digital-[0-9]*:../../ham/gnuradio-digital
+DEPENDS+=	gnuradio-digital-[0-9]*:../../wip/gnuradio-digital
 DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
-PLIST_MINUS+=	digital
+PLIST_MINUS+=	companion digital
 
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-trellis/PLIST b/gnuradio-trellis/PLIST
index 2a45547a59..14f043a216 100644
--- a/gnuradio-trellis/PLIST
+++ b/gnuradio-trellis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/03/15 14:07:12 mef Exp $
+@comment $NetBSD$
 include/gnuradio/swig/trellis_swig0.i
 include/gnuradio/swig/trellis_swig0_doc.i
 include/gnuradio/swig/trellis_swig1.i
@@ -8,69 +8,28 @@ include/gnuradio/trellis/base.h
 include/gnuradio/trellis/calc_metric.h
 include/gnuradio/trellis/constellation_metrics_cf.h
 include/gnuradio/trellis/core_algorithms.h
-include/gnuradio/trellis/encoder_bb.h
-include/gnuradio/trellis/encoder_bi.h
-include/gnuradio/trellis/encoder_bs.h
-include/gnuradio/trellis/encoder_ii.h
-include/gnuradio/trellis/encoder_si.h
-include/gnuradio/trellis/encoder_ss.h
+include/gnuradio/trellis/encoder.h
 include/gnuradio/trellis/fsm.h
 include/gnuradio/trellis/interleaver.h
-include/gnuradio/trellis/metrics_c.h
-include/gnuradio/trellis/metrics_f.h
-include/gnuradio/trellis/metrics_i.h
-include/gnuradio/trellis/metrics_s.h
-include/gnuradio/trellis/pccc_decoder_b.h
-include/gnuradio/trellis/pccc_decoder_combined_cb.h
-include/gnuradio/trellis/pccc_decoder_combined_ci.h
-include/gnuradio/trellis/pccc_decoder_combined_cs.h
-include/gnuradio/trellis/pccc_decoder_combined_fb.h
-include/gnuradio/trellis/pccc_decoder_combined_fi.h
-include/gnuradio/trellis/pccc_decoder_combined_fs.h
-include/gnuradio/trellis/pccc_decoder_i.h
-include/gnuradio/trellis/pccc_decoder_s.h
-include/gnuradio/trellis/pccc_encoder_bb.h
-include/gnuradio/trellis/pccc_encoder_bi.h
-include/gnuradio/trellis/pccc_encoder_bs.h
-include/gnuradio/trellis/pccc_encoder_ii.h
-include/gnuradio/trellis/pccc_encoder_si.h
-include/gnuradio/trellis/pccc_encoder_ss.h
+include/gnuradio/trellis/metrics.h
+include/gnuradio/trellis/pccc_decoder_blk.h
+include/gnuradio/trellis/pccc_decoder_combined_blk.h
+include/gnuradio/trellis/pccc_encoder.h
 include/gnuradio/trellis/permutation.h
 include/gnuradio/trellis/quicksort_index.h
-include/gnuradio/trellis/sccc_decoder_b.h
-include/gnuradio/trellis/sccc_decoder_combined_cb.h
-include/gnuradio/trellis/sccc_decoder_combined_ci.h
-include/gnuradio/trellis/sccc_decoder_combined_cs.h
-include/gnuradio/trellis/sccc_decoder_combined_fb.h
-include/gnuradio/trellis/sccc_decoder_combined_fi.h
-include/gnuradio/trellis/sccc_decoder_combined_fs.h
-include/gnuradio/trellis/sccc_decoder_i.h
-include/gnuradio/trellis/sccc_decoder_s.h
-include/gnuradio/trellis/sccc_encoder_bb.h
-include/gnuradio/trellis/sccc_encoder_bi.h
-include/gnuradio/trellis/sccc_encoder_bs.h
-include/gnuradio/trellis/sccc_encoder_ii.h
-include/gnuradio/trellis/sccc_encoder_si.h
-include/gnuradio/trellis/sccc_encoder_ss.h
+include/gnuradio/trellis/sccc_decoder_blk.h
+include/gnuradio/trellis/sccc_decoder_combined_blk.h
+include/gnuradio/trellis/sccc_encoder.h
 include/gnuradio/trellis/siso_combined_f.h
 include/gnuradio/trellis/siso_f.h
 include/gnuradio/trellis/siso_type.h
-include/gnuradio/trellis/viterbi_b.h
-include/gnuradio/trellis/viterbi_combined_cb.h
-include/gnuradio/trellis/viterbi_combined_ci.h
-include/gnuradio/trellis/viterbi_combined_cs.h
-include/gnuradio/trellis/viterbi_combined_fb.h
-include/gnuradio/trellis/viterbi_combined_fi.h
-include/gnuradio/trellis/viterbi_combined_fs.h
-include/gnuradio/trellis/viterbi_combined_ib.h
-include/gnuradio/trellis/viterbi_combined_ii.h
-include/gnuradio/trellis/viterbi_combined_is.h
-include/gnuradio/trellis/viterbi_combined_sb.h
-include/gnuradio/trellis/viterbi_combined_si.h
-include/gnuradio/trellis/viterbi_combined_ss.h
-include/gnuradio/trellis/viterbi_i.h
-include/gnuradio/trellis/viterbi_s.h
+include/gnuradio/trellis/viterbi.h
+include/gnuradio/trellis/viterbi_combined.h
+lib/cmake/gnuradio/gnuradio-trellisConfig.cmake
+lib/cmake/gnuradio/gnuradio-trellisTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-trellisTargets.cmake
 lib/libgnuradio-trellis.so
+lib/libgnuradio-trellis.so.3.8.1
 lib/libgnuradio-trellis.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-trellis.pc
 ${PYSITELIB}/gnuradio/trellis/__init__.py
@@ -131,20 +90,19 @@ share/gnuradio/examples/trellis/pccc.grc
 share/gnuradio/examples/trellis/readme.txt
 share/gnuradio/examples/trellis/sccc.grc
 share/gnuradio/examples/trellis/tcm.grc
-share/gnuradio/examples/trellis/test_cpm.py
 share/gnuradio/examples/trellis/test_tcm.py
 share/gnuradio/examples/trellis/turbo_equalization.grc
 share/gnuradio/examples/trellis/viterbi_equalization.grc
-share/gnuradio/grc/blocks/trellis_encoder_xx.xml
-share/gnuradio/grc/blocks/trellis_metrics_x.xml
-share/gnuradio/grc/blocks/trellis_pccc_decoder_combined_xx.xml
-share/gnuradio/grc/blocks/trellis_pccc_decoder_x.xml
-share/gnuradio/grc/blocks/trellis_pccc_encoder_xx.xml
-share/gnuradio/grc/blocks/trellis_permutation.xml
-share/gnuradio/grc/blocks/trellis_sccc_decoder_combined_xx.xml
-share/gnuradio/grc/blocks/trellis_sccc_decoder_x.xml
-share/gnuradio/grc/blocks/trellis_sccc_encoder_xx.xml
-share/gnuradio/grc/blocks/trellis_siso_combined_f.xml
-share/gnuradio/grc/blocks/trellis_siso_f.xml
-share/gnuradio/grc/blocks/trellis_viterbi_combined_xx.xml
-share/gnuradio/grc/blocks/trellis_viterbi_x.xml
+share/gnuradio/grc/blocks/trellis_encoder_xx.block.yml
+share/gnuradio/grc/blocks/trellis_metrics_x.block.yml
+share/gnuradio/grc/blocks/trellis_pccc_decoder_combined_xx.block.yml
+share/gnuradio/grc/blocks/trellis_pccc_decoder_x.block.yml
+share/gnuradio/grc/blocks/trellis_pccc_encoder_xx.block.yml
+share/gnuradio/grc/blocks/trellis_permutation.block.yml
+share/gnuradio/grc/blocks/trellis_sccc_decoder_combined_xx.block.yml
+share/gnuradio/grc/blocks/trellis_sccc_decoder_x.block.yml
+share/gnuradio/grc/blocks/trellis_sccc_encoder_xx.block.yml
+share/gnuradio/grc/blocks/trellis_siso_combined_f.block.yml
+share/gnuradio/grc/blocks/trellis_siso_f.block.yml
+share/gnuradio/grc/blocks/trellis_viterbi_combined_xx.block.yml
+share/gnuradio/grc/blocks/trellis_viterbi_x.block.yml
diff --git a/gnuradio-trellis/buildlink3.mk b/gnuradio-trellis/buildlink3.mk
index ad3f195498..4afbbaaa84 100644
--- a/gnuradio-trellis/buildlink3.mk
+++ b/gnuradio-trellis/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-trellis
 .if !defined(GNURADIO_TRELLIS_BUILDLINK3_MK)
 GNURADIO_TRELLIS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-trellis?=		../../ham/gnuradio-trellis
+BUILDLINK_API_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-trellis?=		../../wip/gnuradio-trellis
 .endif # GNURADIO_TRELLIS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-trellis