gnuradio-vocoder: 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 08:52:44 2020 +0200
Changeset:	a92c7bb146510a201e65f209584e172c4b1f2d71

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

Log Message:
gnuradio-vocoder: 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=a92c7bb146510a201e65f209584e172c4b1f2d71

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

diffstat:
 gnuradio-vocoder/Makefile      |  5 ++--
 gnuradio-vocoder/PLIST         | 52 +++++++++++++++++++++++++-----------------
 gnuradio-vocoder/buildlink3.mk |  6 ++---
 3 files changed, 36 insertions(+), 27 deletions(-)

diffs:
diff --git a/gnuradio-vocoder/Makefile b/gnuradio-vocoder/Makefile
index b5a6ae971c..654dee3901 100644
--- a/gnuradio-vocoder/Makefile
+++ b/gnuradio-vocoder/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.16 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-vocoder-${VERSION}
-PKGREVISION=	2
 COMMENT=	All available vocoders in 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_VOCODER=True
diff --git a/gnuradio-vocoder/PLIST b/gnuradio-vocoder/PLIST
index 61fa3b1ce3..659eb4be0a 100644
--- a/gnuradio-vocoder/PLIST
+++ b/gnuradio-vocoder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/07/12 11:36:47 mef Exp $
+@comment $NetBSD$
 include/gnuradio/swig/vocoder_swig.i
 include/gnuradio/swig/vocoder_swig_doc.i
 include/gnuradio/vocoder/alaw_decode_bs.h
@@ -16,7 +16,11 @@ include/gnuradio/vocoder/gsm_fr_decode_ps.h
 include/gnuradio/vocoder/gsm_fr_encode_sp.h
 include/gnuradio/vocoder/ulaw_decode_bs.h
 include/gnuradio/vocoder/ulaw_encode_sb.h
+lib/cmake/gnuradio/gnuradio-vocoderConfig.cmake
+lib/cmake/gnuradio/gnuradio-vocoderTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-vocoderTargets.cmake
 lib/libgnuradio-vocoder.so
+lib/libgnuradio-vocoder.so.3.8.1
 lib/libgnuradio-vocoder.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-vocoder.pc
 ${PYSITELIB}/gnuradio/vocoder/__init__.py
@@ -31,29 +35,35 @@ ${PYSITELIB}/gnuradio/vocoder/vocoder_swig.pyc
 ${PYSITELIB}/gnuradio/vocoder/vocoder_swig.pyo
 share/doc/gnuradio-${PKGVERSION}/README.vocoder
 share/gnuradio/examples/vocoder/alaw_audio_loopback.py
-share/gnuradio/examples/vocoder/codec2_audio_loopback.py
 share/gnuradio/examples/vocoder/cvsd_audio_loopback.py
 share/gnuradio/examples/vocoder/g721_audio_loopback.py
 share/gnuradio/examples/vocoder/g723_24_audio_loopback.py
 share/gnuradio/examples/vocoder/g723_40_audio_loopback.py
 share/gnuradio/examples/vocoder/gsm_audio_loopback.py
 share/gnuradio/examples/vocoder/ulaw_audio_loopback.py
-share/gnuradio/grc/blocks/vocoder_alaw_decode_bs.xml
-share/gnuradio/grc/blocks/vocoder_alaw_encode_sb.xml
-share/gnuradio/grc/blocks/vocoder_block_tree.xml
-share/gnuradio/grc/blocks/vocoder_codec2_decode_ps.xml
-share/gnuradio/grc/blocks/vocoder_codec2_encode_sp.xml
-share/gnuradio/grc/blocks/vocoder_cvsd_decode.xml
-share/gnuradio/grc/blocks/vocoder_cvsd_decode_bs.xml
-share/gnuradio/grc/blocks/vocoder_cvsd_encode.xml
-share/gnuradio/grc/blocks/vocoder_cvsd_encode_sb.xml
-share/gnuradio/grc/blocks/vocoder_g721_decode_bs.xml
-share/gnuradio/grc/blocks/vocoder_g721_encode_sb.xml
-share/gnuradio/grc/blocks/vocoder_g723_24_decode_bs.xml
-share/gnuradio/grc/blocks/vocoder_g723_24_encode_sb.xml
-share/gnuradio/grc/blocks/vocoder_g723_40_decode_bs.xml
-share/gnuradio/grc/blocks/vocoder_g723_40_encode_sb.xml
-share/gnuradio/grc/blocks/vocoder_gsm_fr_decode_ps.xml
-share/gnuradio/grc/blocks/vocoder_gsm_fr_encode_sp.xml
-share/gnuradio/grc/blocks/vocoder_ulaw_decode_bs.xml
-share/gnuradio/grc/blocks/vocoder_ulaw_encode_sb.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-vocoder/buildlink3.mk b/gnuradio-vocoder/buildlink3.mk
index d6df8bc365..ada94b22fa 100644
--- a/gnuradio-vocoder/buildlink3.mk
+++ b/gnuradio-vocoder/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-vocoder
 .if !defined(GNURADIO_VOCODER_BUILDLINK3_MK)
 GNURADIO_VOCODER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-vocoder+=	gnuradio-vocoder>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-vocoder+=	gnuradio-vocoder>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-vocoder?=		../../ham/gnuradio-vocoder
+BUILDLINK_API_DEPENDS.gnuradio-vocoder+=	gnuradio-vocoder>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-vocoder+=	gnuradio-vocoder>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-vocoder?=		../../wip/gnuradio-vocoder
 .endif # GNURADIO_VOCODER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-vocoder