gnuradio-fec: catch up w/ gnuradio-core

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnuradio-fec: catch up w/ gnuradio-core
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Sun, 02 Aug 2020 06:35:47 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 08:35:47 2020 +0200
Changeset:	353d61e17ec6fd8cd58437aabaf5fb0c60134a7e

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

Log Message:
gnuradio-fec: 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=353d61e17ec6fd8cd58437aabaf5fb0c60134a7e

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

diffstat:
 gnuradio-fec/Makefile      |  5 ++-
 gnuradio-fec/PLIST         | 80 ++++++++++++++++++++++------------------------
 gnuradio-fec/buildlink3.mk |  6 ++--
 3 files changed, 44 insertions(+), 47 deletions(-)

diffs:
diff --git a/gnuradio-fec/Makefile b/gnuradio-fec/Makefile
index 843b748e2e..92ad484313 100644
--- a/gnuradio-fec/Makefile
+++ b/gnuradio-fec/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.18 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-fec-${VERSION}
-PKGREVISION=	2
 COMMENT=	Forward Error Correction blocks, utilities, & examples 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=OFF
 CMAKE_ARGS+=	-DENABLE_GR_FEC=ON
diff --git a/gnuradio-fec/PLIST b/gnuradio-fec/PLIST
index 5de8346fde..fcf896c114 100644
--- a/gnuradio-fec/PLIST
+++ b/gnuradio-fec/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/03/15 14:07:12 mef Exp $
+@comment $NetBSD$
 bin/polar_channel_construction
 include/gnuradio/fec/alist.h
 include/gnuradio/fec/api.h
@@ -52,7 +52,11 @@ include/gnuradio/fec/tpc_encoder.h
 include/gnuradio/fec/viterbi.h
 include/gnuradio/swig/fec_swig.i
 include/gnuradio/swig/fec_swig_doc.i
+lib/cmake/gnuradio/gnuradio-fecConfig.cmake
+lib/cmake/gnuradio/gnuradio-fecTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-fecTargets.cmake
 lib/libgnuradio-fec.so
+lib/libgnuradio-fec.so.3.8.1
 lib/libgnuradio-fec.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-fec.pc
 ${PYSITELIB}/gnuradio/fec/LDPC/Generate_LDPC_matrix.py
@@ -113,6 +117,15 @@ ${PYSITELIB}/gnuradio/fec/polar/channel_construction_awgn.pyo
 ${PYSITELIB}/gnuradio/fec/polar/channel_construction_bec.py
 ${PYSITELIB}/gnuradio/fec/polar/channel_construction_bec.pyc
 ${PYSITELIB}/gnuradio/fec/polar/channel_construction_bec.pyo
+${PYSITELIB}/gnuradio/fec/polar/common.py
+${PYSITELIB}/gnuradio/fec/polar/common.pyc
+${PYSITELIB}/gnuradio/fec/polar/common.pyo
+${PYSITELIB}/gnuradio/fec/polar/decoder.py
+${PYSITELIB}/gnuradio/fec/polar/decoder.pyc
+${PYSITELIB}/gnuradio/fec/polar/decoder.pyo
+${PYSITELIB}/gnuradio/fec/polar/encoder.py
+${PYSITELIB}/gnuradio/fec/polar/encoder.pyc
+${PYSITELIB}/gnuradio/fec/polar/encoder.pyo
 ${PYSITELIB}/gnuradio/fec/polar/helper_functions.py
 ${PYSITELIB}/gnuradio/fec/polar/helper_functions.pyc
 ${PYSITELIB}/gnuradio/fec/polar/helper_functions.pyo
@@ -158,43 +171,28 @@ share/gnuradio/fec/ldpc/n_1100_k_0442_gap_24.alist
 share/gnuradio/fec/ldpc/n_1300_k_0522_gap_30.alist
 share/gnuradio/fec/ldpc/n_1800_k_0902_gap_28.alist
 share/gnuradio/fec/ldpc/simple_g_matrix.alist
-share/gnuradio/grc/blocks/fec_async_decoder.xml
-share/gnuradio/grc/blocks/fec_async_encoder.xml
-share/gnuradio/grc/blocks/fec_ber_bf.xml
-share/gnuradio/grc/blocks/fec_bercurve_generator.xml
-share/gnuradio/grc/blocks/fec_block_tree.xml
-share/gnuradio/grc/blocks/fec_decode_ccsds_27_bb.xml
-share/gnuradio/grc/blocks/fec_decode_ccsds_27_fb.xml
-share/gnuradio/grc/blocks/fec_decoder.xml
-share/gnuradio/grc/blocks/fec_depuncture_bb.xml
-share/gnuradio/grc/blocks/fec_encoder.xml
-share/gnuradio/grc/blocks/fec_extended_async_encoder.xml
-share/gnuradio/grc/blocks/fec_extended_decoder.xml
-share/gnuradio/grc/blocks/fec_extended_encoder.xml
-share/gnuradio/grc/blocks/fec_extended_tagged_decoder.xml
-share/gnuradio/grc/blocks/fec_extended_tagged_encoder.xml
-share/gnuradio/grc/blocks/fec_puncture_xx.xml
-share/gnuradio/grc/blocks/fec_tagged_decoder.xml
-share/gnuradio/grc/blocks/fec_tagged_encoder.xml
-share/gnuradio/grc/blocks/ldpc_decoder_def_list.xml
-share/gnuradio/grc/blocks/ldpc_encoder_def_list.xml
-share/gnuradio/grc/blocks/tpc_decoder_def_list.xml
-share/gnuradio/grc/blocks/tpc_encoder_def_list.xml
-share/gnuradio/grc/blocks/variable_cc_decoder_def_list.xml
-share/gnuradio/grc/blocks/variable_cc_encoder_def_list.xml
-share/gnuradio/grc/blocks/variable_ccsds_encoder_def_list.xml
-share/gnuradio/grc/blocks/variable_dummy_decoder_def_list.xml
-share/gnuradio/grc/blocks/variable_dummy_encoder_def_list.xml
-share/gnuradio/grc/blocks/variable_ldpc_G_matrix_object.xml
-share/gnuradio/grc/blocks/variable_ldpc_H_matrix_object.xml
-share/gnuradio/grc/blocks/variable_ldpc_bit_flip_decoder.xml
-share/gnuradio/grc/blocks/variable_ldpc_encoder_G.xml
-share/gnuradio/grc/blocks/variable_ldpc_encoder_H.xml
-share/gnuradio/grc/blocks/variable_polar_code_configurator.xml
-share/gnuradio/grc/blocks/variable_polar_decoder_sc.xml
-share/gnuradio/grc/blocks/variable_polar_decoder_sc_list.xml
-share/gnuradio/grc/blocks/variable_polar_decoder_sc_systematic.xml
-share/gnuradio/grc/blocks/variable_polar_encoder.xml
-share/gnuradio/grc/blocks/variable_polar_encoder_systematic.xml
-share/gnuradio/grc/blocks/variable_repetition_decoder_def_list.xml
-share/gnuradio/grc/blocks/variable_repetition_encoder_def_list.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
diff --git a/gnuradio-fec/buildlink3.mk b/gnuradio-fec/buildlink3.mk
index d0623b19ba..cec917a506 100644
--- a/gnuradio-fec/buildlink3.mk
+++ b/gnuradio-fec/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-fec
 .if !defined(GNURADIO_FEC_BUILDLINK3_MK)
 GNURADIO_FEC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-fec+=	gnuradio-fec>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-fec+=	gnuradio-fec>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-fec?=	../../ham/gnuradio-fec
+BUILDLINK_API_DEPENDS.gnuradio-fec+=	gnuradio-fec>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-fec+=	gnuradio-fec>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-fec?=	../../wip/gnuradio-fec
 .endif # GNURADIO_FEC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-fec
Prev by Date: gnuradio-utils: catch up w/ gnuradio-core
Next by Date: gnuradio-core: adjust bl3 for wip
Previous by Thread: gnuradio-utils: catch up w/ gnuradio-core
Next by Thread: gnuradio-core: adjust bl3 for wip
Indexes:
Home | Main Index | Thread Index | Old Index