pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc gnuradio: update to 3.10.0.0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a05e486e8f21
branches:  trunk
changeset: 371939:a05e486e8f21
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Jan 16 18:06:25 2022 +0000

description:
gnuradio: update to 3.10.0.0

- gr-pdu: Protocol Data Units library
- gr-iio: Linux industrial I/O library (but not packaged in pkgsrc)
- Custom Buffers Support
- switch from Log4CPP to spdlog

diffstat:

 ham/Makefile                                                         |     3 +-
 ham/gnuradio-channels/Makefile                                       |     3 +-
 ham/gnuradio-channels/PLIST                                          |     4 +-
 ham/gnuradio-companion/Makefile                                      |     3 +-
 ham/gnuradio-companion/PLIST                                         |    14 +-
 ham/gnuradio-core/Makefile                                           |     3 +-
 ham/gnuradio-core/Makefile.common                                    |     9 +-
 ham/gnuradio-core/PLIST                                              |    55 +-
 ham/gnuradio-core/buildlink3.mk                                      |     8 +-
 ham/gnuradio-core/distinfo                                           |    13 +-
 ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake         |    15 +
 ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt      |    15 +
 ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt  |    15 +
 ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in |    10 +-
 ham/gnuradio-core/version.mk                                         |     4 +-
 ham/gnuradio-ctrlport/Makefile                                       |     3 +-
 ham/gnuradio-ctrlport/buildlink3.mk                                  |     5 +-
 ham/gnuradio-digital/Makefile                                        |     3 +-
 ham/gnuradio-digital/PLIST                                           |    23 +-
 ham/gnuradio-digital/buildlink3.mk                                   |     5 +-
 ham/gnuradio-doxygen/Makefile                                        |     3 +-
 ham/gnuradio-doxygen/PLIST                                           |  1174 ++-
 ham/gnuradio-dtv/Makefile                                            |     3 +-
 ham/gnuradio-dtv/PLIST                                               |     5 +-
 ham/gnuradio-dtv/buildlink3.mk                                       |     5 +-
 ham/gnuradio-fec/Makefile                                            |     3 +-
 ham/gnuradio-fec/PLIST                                               |     4 +-
 ham/gnuradio-fec/buildlink3.mk                                       |     5 +-
 ham/gnuradio-network/Makefile                                        |     3 +-
 ham/gnuradio-network/PLIST                                           |     8 +-
 ham/gnuradio-pdu/DESCR                                               |     7 +
 ham/gnuradio-pdu/Makefile                                            |    17 +
 ham/gnuradio-pdu/PLIST                                               |    48 +
 ham/gnuradio-pdu/buildlink3.mk                                       |    12 +
 ham/gnuradio-qtgui/Makefile                                          |     3 +-
 ham/gnuradio-qtgui/PLIST                                             |     4 +-
 ham/gnuradio-soapy-sdr/Makefile                                      |     3 +-
 ham/gnuradio-soapy-sdr/PLIST                                         |     4 +-
 ham/gnuradio-soapy-sdr/buildlink3.mk                                 |     4 +-
 ham/gnuradio-trellis/Makefile                                        |     3 +-
 ham/gnuradio-trellis/PLIST                                           |     4 +-
 ham/gnuradio-trellis/buildlink3.mk                                   |     5 +-
 ham/gnuradio-uhd/Makefile                                            |     3 +-
 ham/gnuradio-uhd/PLIST                                               |     4 +-
 ham/gnuradio-uhd/buildlink3.mk                                       |     5 +-
 ham/gnuradio-utils/Makefile                                          |     3 +-
 ham/gnuradio-utils/PLIST                                             |    27 +-
 ham/gnuradio-utils/buildlink3.mk                                     |     5 +-
 ham/gnuradio-video-sdl/Makefile                                      |     3 +-
 ham/gnuradio-video-sdl/PLIST                                         |     4 +-
 ham/gnuradio-video-sdl/buildlink3.mk                                 |     5 +-
 ham/gnuradio-vocoder/Makefile                                        |     3 +-
 ham/gnuradio-vocoder/PLIST                                           |     4 +-
 ham/gnuradio-vocoder/buildlink3.mk                                   |     5 +-
 ham/gnuradio-wavelet/Makefile                                        |     3 +-
 ham/gnuradio-wavelet/PLIST                                           |     4 +-
 ham/gnuradio-wavelet/buildlink3.mk                                   |     5 +-
 ham/gnuradio-zeromq/Makefile                                         |     3 +-
 ham/gnuradio-zeromq/PLIST                                            |     4 +-
 ham/gnuradio-zeromq/buildlink3.mk                                    |     5 +-
 ham/gnuradio-zeromq/files/zmq.hpp                                    |  3064 ++++++++-
 meta-pkgs/gnuradio/Makefile                                          |     3 +-
 62 files changed, 3740 insertions(+), 962 deletions(-)

diffs (truncated from 6725 to 300 lines):

diff -r 4088c21a6d65 -r a05e486e8f21 ham/Makefile
--- a/ham/Makefile      Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/Makefile      Sun Jan 16 18:06:25 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2021/06/27 08:12:28 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2022/01/16 18:06:25 tnn Exp $
 #
 
 COMMENT=       Wireless communication tools and applications
@@ -22,6 +22,7 @@
 SUBDIR+=       gnuradio-dtv
 SUBDIR+=       gnuradio-fec
 SUBDIR+=       gnuradio-network
+SUBDIR+=       gnuradio-pdu
 SUBDIR+=       gnuradio-qtgui
 SUBDIR+=       gnuradio-soapy-sdr
 SUBDIR+=       gnuradio-trellis
diff -r 4088c21a6d65 -r a05e486e8f21 ham/gnuradio-channels/Makefile
--- a/ham/gnuradio-channels/Makefile    Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/gnuradio-channels/Makefile    Sun Jan 16 18:06:25 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2022/01/10 01:46:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2022/01/16 18:06:25 tnn Exp $
 
 PKGNAME=       gnuradio-channels-${VERSION}
-PKGREVISION=   1
 COMMENT=       Signal processing blocks to simulate channel models of GNU Radio
 
 .include       "../../ham/gnuradio-core/Makefile.common"
diff -r 4088c21a6d65 -r a05e486e8f21 ham/gnuradio-channels/PLIST
--- a/ham/gnuradio-channels/PLIST       Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/gnuradio-channels/PLIST       Sun Jan 16 18:06:25 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/12/11 14:57:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/01/16 18:06:25 tnn Exp $
 include/gnuradio/channels/api.h
 include/gnuradio/channels/channel_model.h
 include/gnuradio/channels/channel_model2.h
@@ -9,7 +9,7 @@
 lib/cmake/gnuradio/gnuradio-channelsTargets-release.cmake
 lib/cmake/gnuradio/gnuradio-channelsTargets.cmake
 lib/libgnuradio-channels.so
-lib/libgnuradio-channels.so.3.9.4
+lib/libgnuradio-channels.so.3.10.0
 lib/libgnuradio-channels.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-channels.pc
 ${PYSITELIB}/gnuradio/channels/__init__.py
diff -r 4088c21a6d65 -r a05e486e8f21 ham/gnuradio-companion/Makefile
--- a/ham/gnuradio-companion/Makefile   Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/gnuradio-companion/Makefile   Sun Jan 16 18:06:25 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2022/01/10 01:46:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2022/01/16 18:06:25 tnn Exp $
 
 PKGNAME=       gnuradio-companion-${VERSION}
-PKGREVISION=   1
 COMMENT=       User interface entry of GNU Radio
 
 #CONF_FILES+=  ${EGDIR}/grc.conf       ${PKG_SYSCONFDIR}/grc.conf
diff -r 4088c21a6d65 -r a05e486e8f21 ham/gnuradio-companion/PLIST
--- a/ham/gnuradio-companion/PLIST      Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/gnuradio-companion/PLIST      Sun Jan 16 18:06:25 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2021/12/11 14:57:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/01/16 18:06:25 tnn Exp $
 bin/gnuradio-companion
 bin/grcc
 ${PYSITELIB}/gnuradio/grc/__init__.py
@@ -418,10 +418,6 @@
 share/gnuradio/grc/blocks/blocks_pack_k_bits_bb.block.yml
 share/gnuradio/grc/blocks/blocks_packed_to_unpacked_xx.block.yml
 share/gnuradio/grc/blocks/blocks_patterned_interleaver.block.yml
-share/gnuradio/grc/blocks/blocks_pdu_filter.block.yml
-share/gnuradio/grc/blocks/blocks_pdu_remove.block.yml
-share/gnuradio/grc/blocks/blocks_pdu_set.block.yml
-share/gnuradio/grc/blocks/blocks_pdu_to_tagged_stream.block.yml
 share/gnuradio/grc/blocks/blocks_peak_detector2_fb.block.yml
 share/gnuradio/grc/blocks/blocks_peak_detector_xb.block.yml
 share/gnuradio/grc/blocks/blocks_phase_shift.block.yml
@@ -429,7 +425,6 @@
 share/gnuradio/grc/blocks/blocks_probe_rate.block.yml
 share/gnuradio/grc/blocks/blocks_probe_signal_vx.block.yml
 share/gnuradio/grc/blocks/blocks_probe_signal_x.block.yml
-share/gnuradio/grc/blocks/blocks_random_pdu.block.yml
 share/gnuradio/grc/blocks/blocks_regenerate_bb.block.yml
 share/gnuradio/grc/blocks/blocks_repack_bits_bb.block.yml
 share/gnuradio/grc/blocks/blocks_repeat.block.yml
@@ -440,7 +435,6 @@
 share/gnuradio/grc/blocks/blocks_short_to_char.block.yml
 share/gnuradio/grc/blocks/blocks_short_to_float.block.yml
 share/gnuradio/grc/blocks/blocks_skiphead.block.yml
-share/gnuradio/grc/blocks/blocks_socket_pdu.block.yml
 share/gnuradio/grc/blocks/blocks_stream_demux.block.yml
 share/gnuradio/grc/blocks/blocks_stream_mux.block.yml
 share/gnuradio/grc/blocks/blocks_stream_to_streams.block.yml
@@ -459,17 +453,12 @@
 share/gnuradio/grc/blocks/blocks_tagged_stream_align.block.yml
 share/gnuradio/grc/blocks/blocks_tagged_stream_multiply_length.block.yml
 share/gnuradio/grc/blocks/blocks_tagged_stream_mux.block.yml
-share/gnuradio/grc/blocks/blocks_tagged_stream_to_pdu.block.yml
 share/gnuradio/grc/blocks/blocks_tags_strobe.block.yml
-share/gnuradio/grc/blocks/blocks_tcp_server_sink.block.yml
 share/gnuradio/grc/blocks/blocks_test_tag_variable_rate_ff.block.yml
 share/gnuradio/grc/blocks/blocks_threshold_ff.block.yml
 share/gnuradio/grc/blocks/blocks_throttle.block.yml
 share/gnuradio/grc/blocks/blocks_transcendental.block.yml
-share/gnuradio/grc/blocks/blocks_tuntap_pdu.block.yml
 share/gnuradio/grc/blocks/blocks_uchar_to_float.block.yml
-share/gnuradio/grc/blocks/blocks_udp_sink.block.yml
-share/gnuradio/grc/blocks/blocks_udp_source.block.yml
 share/gnuradio/grc/blocks/blocks_unpack_k_bits_bb.block.yml
 share/gnuradio/grc/blocks/blocks_unpacked_to_packed_xx.block.yml
 share/gnuradio/grc/blocks/blocks_var_to_msg.block.yml
@@ -506,7 +495,6 @@
 share/gnuradio/grc/blocks/filter_interp_fir_filter_xxx.block.yml
 share/gnuradio/grc/blocks/filter_ival_decimator.block.yml
 share/gnuradio/grc/blocks/filter_low_pass_filter.block.yml
-share/gnuradio/grc/blocks/filter_mmse_interpolator_xx.block.yml
 share/gnuradio/grc/blocks/filter_mmse_resampler_xx.block.yml
 share/gnuradio/grc/blocks/filter_pfb_arb_resampler.block.yml
 share/gnuradio/grc/blocks/filter_pfb_channelizer.block.yml
diff -r 4088c21a6d65 -r a05e486e8f21 ham/gnuradio-core/Makefile
--- a/ham/gnuradio-core/Makefile        Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/gnuradio-core/Makefile        Sun Jan 16 18:06:25 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2022/01/10 01:46:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.90 2022/01/16 18:06:25 tnn Exp $
 
 PKGNAME=       gnuradio-core-${VERSION}
-PKGREVISION=   1
 COMMENT=       Core part of GNU Radio, all others need this
 
 PLIST_MINUS=   # empty
diff -r 4088c21a6d65 -r a05e486e8f21 ham/gnuradio-core/Makefile.common
--- a/ham/gnuradio-core/Makefile.common Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/gnuradio-core/Makefile.common Sun Jan 16 18:06:25 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2021/06/27 08:08:59 tnn Exp $
+# $NetBSD: Makefile.common,v 1.36 2022/01/16 18:06:25 tnn Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -81,8 +81,6 @@
 CMAKE_ARGS+=   -DENABLE_GR_FFT=ON
 CMAKE_ARGS+=   -DENABLE_GR_FILTER=ON
 CMAKE_ARGS+=   -DENABLE_PYTHON=ON
-CMAKE_ARGS+=   -DENABLE_VOLK=ON -DENABLE_INTERNAL_VOLK=OFF
-CMAKE_ARGS+=   -DCMAKE_HAVE_PTHREADS_CREATE=OFF
 
 CMAKE_ARGS+=   -DLIB_SUFFIX=""
 
@@ -93,7 +91,6 @@
 CMAKE_ARGS+=   -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
 CMAKE_ARGS+=   -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
 CMAKE_ARGS+=   -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-CMAKE_ARGS+=   -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
 CMAKE_ARGS+=   -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
 
 CMAKE_ARGS+=   -DGR_LIBRARY_DIR=${PREFIX}/lib
@@ -140,15 +137,17 @@
 .include       "../../devel/boost-libs/buildlink3.mk"
 .include       "../../devel/cppunit/buildlink3.mk"
 .include       "../../devel/gmp/buildlink3.mk"
+.include       "../../devel/spdlog/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-pybind11+=    ${PYPKGPREFIX}-pybind11>=2.6.0
 .include       "../../devel/py-pybind11/buildlink3.mk"
 .include       "../../graphics/cairo/buildlink3.mk"
 .include       "../../graphics/cairo-gobject/buildlink3.mk"
+# FIXME should be optional
+.include       "../../lang/libunwind/buildlink3.mk"
 .include       "../../lang/python/application.mk"
 .include       "../../math/py-numpy/buildlink3.mk"
 .include       "../../math/fftw/buildlink3.mk"
 .include       "../../math/gsl/buildlink3.mk"
 .include       "../../math/volk/buildlink3.mk"
-.include       "../../textproc/log4cpp/buildlink3.mk"
 .include       "../../textproc/icu/buildlink3.mk"
 .include       "../../x11/gtk3/buildlink3.mk"
diff -r 4088c21a6d65 -r a05e486e8f21 ham/gnuradio-core/PLIST
--- a/ham/gnuradio-core/PLIST   Sun Jan 16 16:54:13 2022 +0000
+++ b/ham/gnuradio-core/PLIST   Sun Jan 16 18:06:25 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2021/12/11 14:57:50 tnn Exp $
+@comment $NetBSD: PLIST,v 1.35 2022/01/16 18:06:25 tnn Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 include/gnuradio/analog/agc.h
@@ -134,11 +134,6 @@
 include/gnuradio/blocks/pack_k_bits_bb.h
 include/gnuradio/blocks/packed_to_unpacked.h
 include/gnuradio/blocks/patterned_interleaver.h
-include/gnuradio/blocks/pdu.h
-include/gnuradio/blocks/pdu_filter.h
-include/gnuradio/blocks/pdu_remove.h
-include/gnuradio/blocks/pdu_set.h
-include/gnuradio/blocks/pdu_to_tagged_stream.h
 include/gnuradio/blocks/peak_detector.h
 include/gnuradio/blocks/peak_detector2_fb.h
 include/gnuradio/blocks/phase_shift.h
@@ -146,7 +141,6 @@
 include/gnuradio/blocks/probe_rate.h
 include/gnuradio/blocks/probe_signal.h
 include/gnuradio/blocks/probe_signal_v.h
-include/gnuradio/blocks/random_pdu.h
 include/gnuradio/blocks/regenerate_bb.h
 include/gnuradio/blocks/repack_bits_bb.h
 include/gnuradio/blocks/repeat.h
@@ -159,7 +153,6 @@
 include/gnuradio/blocks/short_to_char.h
 include/gnuradio/blocks/short_to_float.h
 include/gnuradio/blocks/skiphead.h
-include/gnuradio/blocks/socket_pdu.h
 include/gnuradio/blocks/stream_demux.h
 include/gnuradio/blocks/stream_mux.h
 include/gnuradio/blocks/stream_to_streams.h
@@ -176,18 +169,13 @@
 include/gnuradio/blocks/tagged_stream_align.h
 include/gnuradio/blocks/tagged_stream_multiply_length.h
 include/gnuradio/blocks/tagged_stream_mux.h
-include/gnuradio/blocks/tagged_stream_to_pdu.h
 include/gnuradio/blocks/tags_strobe.h
-include/gnuradio/blocks/tcp_server_sink.h
 include/gnuradio/blocks/test_tag_variable_rate_ff.h
 include/gnuradio/blocks/threshold_ff.h
 include/gnuradio/blocks/throttle.h
 include/gnuradio/blocks/transcendental.h
 include/gnuradio/blocks/tsb_vector_sink.h
-include/gnuradio/blocks/tuntap_pdu.h
 include/gnuradio/blocks/uchar_to_float.h
-include/gnuradio/blocks/udp_sink.h
-include/gnuradio/blocks/udp_source.h
 include/gnuradio/blocks/unpack_k_bits.h
 include/gnuradio/blocks/unpack_k_bits_bb.h
 include/gnuradio/blocks/unpacked_to_packed.h
@@ -204,8 +192,14 @@
 include/gnuradio/blocks/wavfile_source.h
 include/gnuradio/blocks/xor_blk.h
 include/gnuradio/buffer.h
+include/gnuradio/buffer_double_mapped.h
+include/gnuradio/buffer_reader.h
+include/gnuradio/buffer_reader_sm.h
+include/gnuradio/buffer_single_mapped.h
+include/gnuradio/buffer_type.h
 include/gnuradio/config.h
 include/gnuradio/constants.h
+include/gnuradio/custom_lock.h
 include/gnuradio/endianness.h
 include/gnuradio/expj.h
 include/gnuradio/fft/api.h
@@ -244,8 +238,6 @@
 include/gnuradio/filter/mmse_fir_interpolator_ff.h
 include/gnuradio/filter/mmse_interp_differentiator_cc.h
 include/gnuradio/filter/mmse_interp_differentiator_ff.h
-include/gnuradio/filter/mmse_interpolator_cc.h
-include/gnuradio/filter/mmse_interpolator_ff.h
 include/gnuradio/filter/mmse_resampler_cc.h
 include/gnuradio/filter/mmse_resampler_ff.h
 include/gnuradio/filter/pfb_arb_resampler.h
@@ -269,6 +261,7 @@
 include/gnuradio/gr_complex.h
 include/gnuradio/hier_block2.h
 include/gnuradio/high_res_timer.h
+include/gnuradio/host_buffer.h
 include/gnuradio/integer_math.h
 include/gnuradio/io_signature.h
 include/gnuradio/logger.h
@@ -279,11 +272,11 @@
 include/gnuradio/messages/msg_passing.h
 include/gnuradio/messages/msg_producer.h
 include/gnuradio/messages/msg_queue.h
-include/gnuradio/misc.h
 include/gnuradio/msg_accepter.h
 include/gnuradio/msg_handler.h
 include/gnuradio/msg_queue.h
 include/gnuradio/nco.h
+include/gnuradio/pdu.h
 include/gnuradio/prefs.h
 include/gnuradio/pycallback_object.h
 include/gnuradio/random.h
@@ -304,7 +297,6 @@
 include/gnuradio/sync_decimator.h
 include/gnuradio/sync_interpolator.h
 include/gnuradio/sys_paths.h
-include/gnuradio/tag_checker.h
 include/gnuradio/tagged_stream_block.h
 include/gnuradio/tags.h
 include/gnuradio/thread/thread.h
@@ -312,7 +304,9 @@
 include/gnuradio/thread/thread_group.h
 include/gnuradio/top_block.h
 include/gnuradio/tpb_detail.h
+include/gnuradio/transfer_type.h
 include/gnuradio/types.h
+include/gnuradio/xoroshiro128p.h
 include/pmt/api.h
 include/pmt/pmt.h
 include/pmt/pmt_pool.h
@@ -328,7 +322,6 @@
 lib/cmake/gnuradio/FindGSM.cmake
 lib/cmake/gnuradio/FindGit.cmake



Home | Main Index | Thread Index | Old Index