pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/ham gnuradio: updated to 3.10.4.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/77213f42254c
branches: trunk
changeset: 386481:77213f42254c
user: adam <adam%pkgsrc.org@localhost>
date: Sun Oct 09 07:56:09 2022 +0000
description:
gnuradio: updated to 3.10.4.0
3.10.4.0
Project Scope
Replace get_initial_sptr() calls with make_block_sptr() calls. There were a number of places the incorrect function was being used.
Runtime
Use correctly typed arguments to log messages to prevent build errors.
GRC
Add xfce4-terminal and urxvt to the list of terminal emulators discovered during the build process.
Suppress GUI hint errors that were being shown in the terminal window.
Use integers for screenshot size (floats were causing Cairo errors).
Build system and packaging
Reformat cmake files and make cmake formatting part of the workflow.
Allow GNU Radio to be a part of other cmake-based projects.
Correct linking to libiio and libad9361 on macOS.
Update method for determining Python installation directory. This should work correctly now on (all?) distro releases.
gr-blocks
New Block Interleaver/Deinterleaver interleaves blocks of symbols
Correct calculation of items_remaining in File Source, which allows seek() to work correctly.
Add an example for Wavefile Sink
gr-digital
Deprecate the CRC32 and CRC16 blocks, which will be removed in the future. There are more general CRC blocks which do the same thing (and more).
gr-filter
Fix demo for PFB channelizer
gr-iio
FMCOMMS2 Sink assumes CS16 data is scaled to 32768, rather than 2048.
FMCOMMS2 returns the correct samples for the second channel in 2-channel mode.
gr-trellis
Correct Python bindings for trellis::metrics.
gr-qtgui
Range widget can now output messages when value changes.
Add C++ code generation for Time Sink
Regenerate Python bindings for some blocks when necessary.
Waterfall Sink correctly uses half spectrum for float input.
gr-uhd
Add Python bindings for the UHD find() functino.
gr-zeromq
Support newer get() and older/deprecated getsockopt() functions in cppzmq depending on availability.
Modtool
Parse IO signatures with or without gr:: prefix.
Documentation
Update certain file lists to keep build paths out of documentation.
Testing
Update Conda recipe for Qt 5.15 and re-render CI support files.
Add testing on Ubuntu 22.04.
Link tests directly against spdlog with not linking to GR runtime.
Ignore Python "missing whitespace after keywork" formatting error.
diffstat:
ham/gnuradio-channels/Makefile | 9 +-
ham/gnuradio-companion/Makefile | 13 +-
ham/gnuradio-companion/PLIST | 7 +-
ham/gnuradio-core/Makefile | 7 +-
ham/gnuradio-core/Makefile.common | 60 +-
ham/gnuradio-core/PLIST | 19 +-
ham/gnuradio-core/distinfo | 16 +-
ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake | 22 +-
ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt | 10 +-
ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt | 14 +-
ham/gnuradio-core/version.mk | 4 +-
ham/gnuradio-ctrlport/Makefile | 10 +-
ham/gnuradio-digital/Makefile | 11 +-
ham/gnuradio-doxygen/Makefile | 9 +-
ham/gnuradio-doxygen/PLIST | 500 +-
ham/gnuradio-dtv/Makefile | 14 +-
ham/gnuradio-fec/Makefile | 11 +-
ham/gnuradio-network/Makefile | 9 +-
ham/gnuradio-pdu/Makefile | 10 +-
ham/gnuradio-qtgui/Makefile | 15 +-
ham/gnuradio-soapy-sdr/Makefile | 11 +-
ham/gnuradio-trellis/Makefile | 9 +-
ham/gnuradio-uhd/Makefile | 12 +-
ham/gnuradio-utils/Makefile | 3 +-
ham/gnuradio-utils/PLIST | 9 +-
ham/gnuradio-video-sdl/Makefile | 12 +-
ham/gnuradio-vocoder/Makefile | 14 +-
ham/gnuradio-wavelet/Makefile | 11 +-
ham/gnuradio-zeromq/Makefile | 22 +-
ham/gnuradio-zeromq/files/zmq.hpp | 2713 ----------
30 files changed, 247 insertions(+), 3339 deletions(-)
diffs (truncated from 4814 to 300 lines):
diff -r a8b719153d3e -r 77213f42254c ham/gnuradio-channels/Makefile
--- a/ham/gnuradio-channels/Makefile Sun Oct 09 07:54:17 2022 +0000
+++ b/ham/gnuradio-channels/Makefile Sun Oct 09 07:56:09 2022 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2022/09/11 12:51:54 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/10/09 07:56:09 adam Exp $
PKGNAME= gnuradio-channels-${VERSION}
-PKGREVISION= 2
COMMENT= Signal processing blocks to simulate channel models of GNU Radio
-.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
+.include "../../ham/gnuradio-core/Makefile.common"
+.include "../../ham/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_CHANNELS=ON
@@ -13,4 +12,4 @@
PLIST_MINUS+= companion
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r a8b719153d3e -r 77213f42254c ham/gnuradio-companion/Makefile
--- a/ham/gnuradio-companion/Makefile Sun Oct 09 07:54:17 2022 +0000
+++ b/ham/gnuradio-companion/Makefile Sun Oct 09 07:56:09 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2022/09/11 12:51:54 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2022/10/09 07:56:09 adam Exp $
PKGNAME= gnuradio-companion-${VERSION}
-PKGREVISION= 2
COMMENT= User interface entry of GNU Radio
#CONF_FILES+= ${EGDIR}/grc.conf ${PKG_SYSCONFDIR}/grc.conf
@@ -11,17 +10,17 @@
REPLACE_BASH= grc/scripts/freedesktop/grc_setup_freedesktop.in
-.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
+.include "../../ham/gnuradio-core/Makefile.common"
+.include "../../ham/gnuradio-core/Nocore.mk"
# gnuradio-companion
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GRC=ON
ICON_THEMES= yes
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
# -- Configuring gnuradio-companion support...
# -- Dependency ENABLE_GNURADIO_RUNTIME = ON
diff -r a8b719153d3e -r 77213f42254c ham/gnuradio-companion/PLIST
--- a/ham/gnuradio-companion/PLIST Sun Oct 09 07:54:17 2022 +0000
+++ b/ham/gnuradio-companion/PLIST Sun Oct 09 07:56:09 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2022/05/26 15:20:08 mef Exp $
+@comment $NetBSD: PLIST,v 1.16 2022/10/09 07:56:09 adam Exp $
bin/gnuradio-companion
bin/grcc
${PYSITELIB}/gnuradio/grc/__init__.py
@@ -344,6 +344,7 @@
share/gnuradio/grc/blocks/blocks_and_const_xx.block.yml
share/gnuradio/grc/blocks/blocks_and_xx.block.yml
share/gnuradio/grc/blocks/blocks_argmax_xx.block.yml
+share/gnuradio/grc/blocks/blocks_blockinterleaver_xx.block.yml
share/gnuradio/grc/blocks/blocks_burst_tagger.block.yml
share/gnuradio/grc/blocks/blocks_char_to_float.block.yml
share/gnuradio/grc/blocks/blocks_char_to_short.block.yml
@@ -509,6 +510,7 @@
share/gnuradio/grc/blocks/filter_single_pole_iir_filter_xx.block.yml
share/gnuradio/grc/blocks/grc.tree.yml
share/gnuradio/grc/blocks/import.block.yml
+share/gnuradio/grc/blocks/json_config.block.yml
share/gnuradio/grc/blocks/message.domain.yml
share/gnuradio/grc/blocks/note.block.yml
share/gnuradio/grc/blocks/options.block.yml
@@ -529,6 +531,7 @@
share/gnuradio/grc/blocks/variable_struct.block.yml
share/gnuradio/grc/blocks/xmlrpc_client.block.yml
share/gnuradio/grc/blocks/xmlrpc_server.block.yml
+share/gnuradio/grc/blocks/yaml_config.block.yml
share/gnuradio/grc/freedesktop/gnuradio-grc.desktop
share/gnuradio/grc/freedesktop/gnuradio-grc.xml
share/gnuradio/grc/freedesktop/grc-icon-128.png
@@ -547,5 +550,3 @@
share/icons/hicolor/64x64/apps/gnuradio-grc.png
share/metainfo/org.gnuradio.grc.metainfo.xml
share/mime/packages/gnuradio-grc.xml
-share/gnuradio/grc/blocks/json_config.block.yml
-share/gnuradio/grc/blocks/yaml_config.block.yml
diff -r a8b719153d3e -r 77213f42254c ham/gnuradio-core/Makefile
--- a/ham/gnuradio-core/Makefile Sun Oct 09 07:54:17 2022 +0000
+++ b/ham/gnuradio-core/Makefile Sun Oct 09 07:56:09 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2022/09/11 12:51:54 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2022/10/09 07:56:09 adam Exp $
PKGNAME= gnuradio-core-${VERSION}
-PKGREVISION= 4
COMMENT= Core part of GNU Radio, all others need this
PLIST_MINUS= # empty
@@ -12,7 +11,7 @@
#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf
#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf
-.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
#CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss
@@ -26,4 +25,4 @@
# ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \
# ${DESTDIR}${PREFIX}/${EGDIR}/
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r a8b719153d3e -r 77213f42254c ham/gnuradio-core/Makefile.common
--- a/ham/gnuradio-core/Makefile.common Sun Oct 09 07:54:17 2022 +0000
+++ b/ham/gnuradio-core/Makefile.common Sun Oct 09 07:56:09 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2022/05/26 15:20:09 mef Exp $
+# $NetBSD: Makefile.common,v 1.42 2022/10/09 07:56:09 adam Exp $
# This Makefile fragment is included in the package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
# settings).
@@ -22,7 +22,7 @@
# used by ham/gnuradio-wavelet/Makefile
# used by ham/gnuradio-zeromq/Makefile
-.include "../../ham/gnuradio-core/version.mk"
+.include "../../ham/gnuradio-core/version.mk"
DISTNAME?= gnuradio-${VERSION}
CATEGORIES+= ham
@@ -36,22 +36,24 @@
HOMEPAGE?= https://www.gnu.org/software/gnuradio/
LICENSE= gnu-gpl-v3
-USE_LANGUAGES= c c++
-USE_TOOLS= perl gmake cmake pkg-config
-USE_CMAKE= yes
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS= gmake perl pkg-config
-GCC_REQD+= 8
+GCC_REQD+= 8
+DEPENDS+= ${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
+DEPENDS+= ${PYPKGPREFIX}-pygccxml-[0-9]*:../../textproc/py-pygccxml
# for companion
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-DISTINFO_FILE= ${.CURDIR}/../../ham/gnuradio-core/distinfo
-PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
+DISTINFO_FILE= ${.CURDIR}/../../ham/gnuradio-core/distinfo
+PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
# see CMakeLists.txt GR_PYTHON_MIN_VERSION
PYTHON_VERSIONS_INCOMPATIBLE= 27 37 # py-scipy
@@ -136,26 +138,24 @@
do-install:
cd ${WRKSRC}/${BUILD_DIRS} && ${GMAKE} DESTDIR=${DESTDIR} install
-
-.include "../../audio/gsm/buildlink3.mk"
-.include "../../audio/jack/buildlink3.mk"
-.include "../../audio/portaudio/buildlink3.mk"
-
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/cppunit/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/spdlog/buildlink3.mk"
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../audio/jack/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.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"
+.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/icu/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
+.include "../../lang/libunwind/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../math/fftw/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
+.include "../../math/py-numpy/buildlink3.mk"
+.include "../../math/volk/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
diff -r a8b719153d3e -r 77213f42254c ham/gnuradio-core/PLIST
--- a/ham/gnuradio-core/PLIST Sun Oct 09 07:54:17 2022 +0000
+++ b/ham/gnuradio-core/PLIST Sun Oct 09 07:56:09 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2022/05/26 15:20:09 mef Exp $
+@comment $NetBSD: PLIST,v 1.38 2022/10/09 07:56:09 adam Exp $
bin/gnuradio-config-info
bin/gr_filter_design
include/gnuradio/analog/agc.h
@@ -61,6 +61,8 @@
include/gnuradio/blocks/annotator_raw.h
include/gnuradio/blocks/api.h
include/gnuradio/blocks/argmax.h
+include/gnuradio/blocks/blockinterleaver_xx.h
+include/gnuradio/blocks/blockinterleaving.h
include/gnuradio/blocks/burst_tagger.h
include/gnuradio/blocks/char_to_float.h
include/gnuradio/blocks/char_to_short.h
@@ -100,6 +102,7 @@
include/gnuradio/blocks/float_to_short.h
include/gnuradio/blocks/float_to_uchar.h
include/gnuradio/blocks/head.h
+include/gnuradio/blocks/host_buffer_copy.h
include/gnuradio/blocks/int_to_float.h
include/gnuradio/blocks/integrate.h
include/gnuradio/blocks/interleave.h
@@ -370,26 +373,26 @@
lib/cmake/gnuradio/gnuradio-runtimeTargets-release.cmake
lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
lib/libgnuradio-analog.so
+lib/libgnuradio-analog.so.${PKGVERSION}
lib/libgnuradio-analog.so.${PKGVER_MICRO}
-lib/libgnuradio-analog.so.${PKGVERSION}
lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.${PKGVER_MICRO}
lib/libgnuradio-audio.so.${PKGVERSION}
+lib/libgnuradio-audio.so.${PKGVER_MICRO}
lib/libgnuradio-blocks.so
+lib/libgnuradio-blocks.so.${PKGVERSION}
lib/libgnuradio-blocks.so.${PKGVER_MICRO}
-lib/libgnuradio-blocks.so.${PKGVERSION}
lib/libgnuradio-fft.so
+lib/libgnuradio-fft.so.${PKGVERSION}
lib/libgnuradio-fft.so.${PKGVER_MICRO}
-lib/libgnuradio-fft.so.${PKGVERSION}
lib/libgnuradio-filter.so
+lib/libgnuradio-filter.so.${PKGVERSION}
lib/libgnuradio-filter.so.${PKGVER_MICRO}
-lib/libgnuradio-filter.so.${PKGVERSION}
lib/libgnuradio-pmt.so
+lib/libgnuradio-pmt.so.${PKGVERSION}
lib/libgnuradio-pmt.so.${PKGVER_MICRO}
-lib/libgnuradio-pmt.so.${PKGVERSION}
lib/libgnuradio-runtime.so
+lib/libgnuradio-runtime.so.${PKGVERSION}
lib/libgnuradio-runtime.so.${PKGVER_MICRO}
-lib/libgnuradio-runtime.so.${PKGVERSION}
lib/pkgconfig/gnuradio-analog.pc
lib/pkgconfig/gnuradio-audio.pc
lib/pkgconfig/gnuradio-blocks.pc
diff -r a8b719153d3e -r 77213f42254c ham/gnuradio-core/distinfo
--- a/ham/gnuradio-core/distinfo Sun Oct 09 07:54:17 2022 +0000
+++ b/ham/gnuradio-core/distinfo Sun Oct 09 07:56:09 2022 +0000
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.48 2022/05/26 15:20:09 mef Exp $
+$NetBSD: distinfo,v 1.49 2022/10/09 07:56:09 adam Exp $
-BLAKE2s (gnuradio-3.10.2.0.tar.gz) = ce1797e79609b2bf9b418b0cd4d43cb5e5c647da7be8769c26fc99979d18bd9f
-SHA512 (gnuradio-3.10.2.0.tar.gz) = f34cd3aee1a5d72da387246c25f8494d9a28b2d66aa58ec99a6ff2ae45672f3ec65111af095282f026e2ef267bca2e64042a2aa3ee284ce770351629963fe468
-Size (gnuradio-3.10.2.0.tar.gz) = 4323022 bytes
-SHA1 (patch-cmake_Modules_GrPybind.cmake) = e2b42c840ca985dc3b1c0cba3029002a088c8407
-SHA1 (patch-gnuradio-runtime_CMakeLists.txt) = a5b2b60c7fcc46b5784027e08e137480c0cf3307
-SHA1 (patch-gnuradio-runtime_lib_CMakeLists.txt) = 310d0432de07cf5c03fbd9fd34dcb42733cf6367
+BLAKE2s (gnuradio-3.10.4.0.tar.gz) = 72065d24922d7ab4c97e89bd99a95ad76088e7ff9d13fd395b13a7075558bd6a
+SHA512 (gnuradio-3.10.4.0.tar.gz) = a8690016513df3928cb2f63eef190c7306bc3cc452dfeafab2e47b43aa1dd3f61515df49832e99530535f94deabfb614388a27212b09e1c816782f3fdd4915eb
+Size (gnuradio-3.10.4.0.tar.gz) = 4392284 bytes
+SHA1 (patch-cmake_Modules_GrPybind.cmake) = b585fc9bddad66f98d9e70db3d9335c937698df9
+SHA1 (patch-gnuradio-runtime_CMakeLists.txt) = 3e4ae78cd722aa54a9626ca458cfe90ab11619a5
+SHA1 (patch-gnuradio-runtime_lib_CMakeLists.txt) = 8f29121bcff204fd4533c113cd05440a7d39477d
Home |
Main Index |
Thread Index |
Old Index