diff options
30 files changed, 247 insertions, 3339 deletions
diff --git a/ham/gnuradio-channels/Makefile b/ham/gnuradio-channels/Makefile index e87287de779..6be7599c36c 100644 --- a/ham/gnuradio-channels/Makefile +++ b/ham/gnuradio-channels/Makefile @@ -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 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-companion/Makefile b/ham/gnuradio-companion/Makefile index 8a2b77222b0..475180e2828 100644 --- a/ham/gnuradio-companion/Makefile +++ b/ham/gnuradio-companion/Makefile @@ -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 @@ DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 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 --git a/ham/gnuradio-companion/PLIST b/ham/gnuradio-companion/PLIST index af3a9ed8ff2..324099f6155 100644 --- a/ham/gnuradio-companion/PLIST +++ b/ham/gnuradio-companion/PLIST @@ -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_add_xx.block.yml 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_root_raised_cosine_filter.block.yml 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_rrc_filter_taps.block.yml 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/48x48/apps/gnuradio-grc.png 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 --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile index e066157483f..fae13fb9142 100644 --- a/ham/gnuradio-core/Makefile +++ b/ham/gnuradio-core/Makefile @@ -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 @@ PLIST_MINUS= # empty #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 @@ CMAKE_ARGS+= -DENABLE_DEFAULT=OFF # ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \ # ${DESTDIR}${PREFIX}/${EGDIR}/ -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common index 91886455e50..56e51bd06eb 100644 --- a/ham/gnuradio-core/Makefile.common +++ b/ham/gnuradio-core/Makefile.common @@ -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 @@ MAINTAINER?= pkgsrc-users@NetBSD.org 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 @@ pre-configure: 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 --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST index adabf36ffc4..d57dbb61c9d 100644 --- a/ham/gnuradio-core/PLIST +++ b/ham/gnuradio-core/PLIST @@ -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_alltoall.h 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_int.h 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-runtimeConfig.cmake lib/cmake/gnuradio/gnuradio-runtimeTargets-release.cmake lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake lib/libgnuradio-analog.so -lib/libgnuradio-analog.so.${PKGVER_MICRO} lib/libgnuradio-analog.so.${PKGVERSION} +lib/libgnuradio-analog.so.${PKGVER_MICRO} 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.${PKGVER_MICRO} lib/libgnuradio-blocks.so.${PKGVERSION} +lib/libgnuradio-blocks.so.${PKGVER_MICRO} lib/libgnuradio-fft.so -lib/libgnuradio-fft.so.${PKGVER_MICRO} lib/libgnuradio-fft.so.${PKGVERSION} +lib/libgnuradio-fft.so.${PKGVER_MICRO} lib/libgnuradio-filter.so -lib/libgnuradio-filter.so.${PKGVER_MICRO} lib/libgnuradio-filter.so.${PKGVERSION} +lib/libgnuradio-filter.so.${PKGVER_MICRO} lib/libgnuradio-pmt.so -lib/libgnuradio-pmt.so.${PKGVER_MICRO} lib/libgnuradio-pmt.so.${PKGVERSION} +lib/libgnuradio-pmt.so.${PKGVER_MICRO} lib/libgnuradio-runtime.so -lib/libgnuradio-runtime.so.${PKGVER_MICRO} lib/libgnuradio-runtime.so.${PKGVERSION} +lib/libgnuradio-runtime.so.${PKGVER_MICRO} lib/pkgconfig/gnuradio-analog.pc lib/pkgconfig/gnuradio-audio.pc lib/pkgconfig/gnuradio-blocks.pc diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo index 471612f21af..ff3affa396e 100644 --- a/ham/gnuradio-core/distinfo +++ b/ham/gnuradio-core/distinfo @@ -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 SHA1 (patch-gnuradio-runtime_lib_constants.cc.in) = fef80a546c713c565c3851ee7289b4fa3a49e45b +SHA1 (patch-gnuradio-runtime_lib_thread_thread__group.cc) = 868809d5253b6465595dcade7f094844ff79f21c SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 9adacb93a20b2be596a23985306cbfd5f93c80a8 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = cfa9b629e5cf21198cfd53cf27a908b5874866f4 +SHA1 (patch-gr-blocks_include_gnuradio_blocks_blockinterleaving.h) = a73a5820e613159b9032faacc6ca98a2a6dfaf48 diff --git a/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake b/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake index fa9feeadbc7..7bcc6b1a0a0 100644 --- a/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake +++ b/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake @@ -1,15 +1,15 @@ -$NetBSD: patch-cmake_Modules_GrPybind.cmake,v 1.1 2022/01/16 18:06:25 tnn Exp $ +$NetBSD: patch-cmake_Modules_GrPybind.cmake,v 1.2 2022/10/09 07:56:09 adam Exp $ Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache. ---- cmake/Modules/GrPybind.cmake.orig 2022-01-14 15:27:04.000000000 +0000 +--- cmake/Modules/GrPybind.cmake.orig 2022-09-16 15:51:17.000000000 +0000 +++ cmake/Modules/GrPybind.cmake -@@ -158,7 +158,7 @@ target_include_directories(${name}_pytho - # Precompile the pybind11 header - # This should speed up building of the python bindings at least in larger modules - # This functionality is only available in CMake >= 3.16 --if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") -+if(false AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") - target_precompile_headers( - ${name}_python - PRIVATE +@@ -176,7 +176,7 @@ macro(GR_PYBIND_MAKE_CHECK_HASH name upd + # Precompile the pybind11 header + # This should speed up building of the python bindings at least in larger modules + # This functionality is only available in CMake >= 3.16 +- if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") ++ if(FALSE AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") + target_precompile_headers( + ${name}_python + PRIVATE diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt b/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt index 254750fb965..25ca52b4a4c 100644 --- a/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt +++ b/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt @@ -1,15 +1,15 @@ -$NetBSD: patch-gnuradio-runtime_CMakeLists.txt,v 1.1 2022/01/16 18:06:25 tnn Exp $ +$NetBSD: patch-gnuradio-runtime_CMakeLists.txt,v 1.2 2022/10/09 07:56:09 adam Exp $ Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache. ---- gnuradio-runtime/CMakeLists.txt.orig 2022-01-14 15:27:04.000000000 +0000 +--- gnuradio-runtime/CMakeLists.txt.orig 2022-09-16 15:51:17.000000000 +0000 +++ gnuradio-runtime/CMakeLists.txt -@@ -51,7 +51,7 @@ get_filename_component(GNURADIO_RUNTIME_ +@@ -53,7 +53,7 @@ get_filename_component(GNURADIO_RUNTIME_ ######################################################################## # Setup precompiled header pseudo-component ######################################################################## -if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") -+if(false AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") - set(GR_CMAKE_HAS_PCH ${CMAKE_VERSION}) ++if(FALSE AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") + set(GR_CMAKE_HAS_PCH ${CMAKE_VERSION}) endif() diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt index f2d5c648c3e..cb8c89a4b2b 100644 --- a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt +++ b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt @@ -1,15 +1,15 @@ -$NetBSD: patch-gnuradio-runtime_lib_CMakeLists.txt,v 1.1 2022/01/16 18:06:25 tnn Exp $ +$NetBSD: patch-gnuradio-runtime_lib_CMakeLists.txt,v 1.2 2022/10/09 07:56:09 adam Exp $ Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache. ---- gnuradio-runtime/lib/CMakeLists.txt.orig 2022-01-14 15:27:04.000000000 +0000 +--- gnuradio-runtime/lib/CMakeLists.txt.orig 2022-09-16 15:51:17.000000000 +0000 +++ gnuradio-runtime/lib/CMakeLists.txt -@@ -171,7 +171,7 @@ target_compile_definitions(gnuradio-runt +@@ -163,7 +163,7 @@ target_compile_definitions(gnuradio-runt # constants.cc includes boost::dll headers, force them to use std::filesystem target_compile_definitions(gnuradio-runtime PRIVATE BOOST_DLL_USE_STD_FS) -if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") -+if(false AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") - target_precompile_headers( - gnuradio-runtime - PRIVATE ++if(FALSE AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") + target_precompile_headers( + gnuradio-runtime PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/sync_block.h) diff --git a/ham/gnuradio-core/version.mk b/ham/gnuradio-core/version.mk index f32572da6d7..745ce23a176 100644 --- a/ham/gnuradio-core/version.mk +++ b/ham/gnuradio-core/version.mk @@ -1,3 +1,3 @@ -# $NetBSD: version.mk,v 1.7 2022/05/26 15:20:09 mef Exp $ +# $NetBSD: version.mk,v 1.8 2022/10/09 07:56:09 adam Exp $ -VERSION= 3.10.2.0 +VERSION= 3.10.4.0 diff --git a/ham/gnuradio-ctrlport/Makefile b/ham/gnuradio-ctrlport/Makefile index bb4d65585a9..a47a77ea994 100644 --- a/ham/gnuradio-ctrlport/Makefile +++ b/ham/gnuradio-ctrlport/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.40 2022/09/11 12:51:54 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2022/10/09 07:56:09 adam Exp $ PKGNAME= gnuradio-ctrlport-${VERSION} -PKGREVISION= 2 COMMENT= New set of hooks into GNU Radio to allow a remote client to attach -.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_CTRLPORT=ON -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-digital/Makefile b/ham/gnuradio-digital/Makefile index 319b78e586e..8d4c175d6c0 100644 --- a/ham/gnuradio-digital/Makefile +++ b/ham/gnuradio-digital/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.40 2022/09/11 12:51:54 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2022/10/09 07:56:10 adam Exp $ PKGNAME= gnuradio-digital-${VERSION} -PKGREVISION= 2 COMMENT= Digital related algorithms for 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" # link to libgnuradio-fft.so.${PKGVERSON_NOREV} -.include "../../ham/gnuradio-core/buildlink3.mk" +.include "../../ham/gnuradio-core/buildlink3.mk" CMAKE_ARGS+= -DENABLE_DEFAULT=OFF CMAKE_ARGS+= -DENABLE_GR_DIGITAL=ON @@ -15,4 +14,4 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-doxygen/Makefile b/ham/gnuradio-doxygen/Makefile index 9bc72255b40..7556a73c9cf 100644 --- a/ham/gnuradio-doxygen/Makefile +++ b/ham/gnuradio-doxygen/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.58 2022/10/04 11:54:13 adam Exp $ +# $NetBSD: Makefile,v 1.59 2022/10/09 07:56:10 adam Exp $ PKGNAME= gnuradio-doxygen-${VERSION} -PKGREVISION= 3 COMMENT= Doxygen documentation 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" BUILD_DEPENDS+= doxygen>=1.9.5:../../devel/doxygen BUILD_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz @@ -18,6 +17,6 @@ DEPENDS+= tex-newunicodechar-[0-9]*:../../print/tex-newunicodechar CMAKE_ARGS+= -DENABLE_DEFAULT=OFF CMAKE_ARGS+= -DENABLE_DOXYGEN=ON -MAKE_JOBS_SAFE= no +#MAKE_JOBS_SAFE= no .include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-doxygen/PLIST b/ham/gnuradio-doxygen/PLIST index 2565b4e13f8..86a47c7e56a 100644 --- a/ham/gnuradio-doxygen/PLIST +++ b/ham/gnuradio-doxygen/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2022/10/08 11:12:48 mef Exp $ +@comment $NetBSD: PLIST,v 1.32 2022/10/09 07:56:10 adam Exp $ share/doc/gnuradio-${PKGVERSION}/html/ConstellationDisplayPlot_8h.html share/doc/gnuradio-${PKGVERSION}/html/ConstellationDisplayPlot_8h__dep__incl.map share/doc/gnuradio-${PKGVERSION}/html/ConstellationDisplayPlot_8h__dep__incl.md5 @@ -81,7 +81,6 @@ share/doc/gnuradio-${PKGVERSION}/html/WaterfallDisplayPlot_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/WaterfallDisplayPlot_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/WaterfallDisplayPlot_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/WaterfallDisplayPlot_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/_formulas.log share/doc/gnuradio-${PKGVERSION}/html/_formulas.tex share/doc/gnuradio-${PKGVERSION}/html/_formulas_dark.log share/doc/gnuradio-${PKGVERSION}/html/_formulas_dark.tex @@ -150,9 +149,6 @@ share/doc/gnuradio-${PKGVERSION}/html/adaptive__algorithm__pydoc__template_8h__i share/doc/gnuradio-${PKGVERSION}/html/adaptive__algorithm__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h.html share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h.js -share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/add__blk_8h__incl.svg @@ -677,19 +673,10 @@ share/doc/gnuradio-${PKGVERSION}/html/atsc__viterbi__decoder__pydoc__template_8h share/doc/gnuradio-${PKGVERSION}/html/atsc__viterbi__decoder__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h.html share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h.js -share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__sink_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/attr__sink__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/attr__sink__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/attr__sink__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/attr__sink__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/attr__sink__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/attr__sink__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/attr__sink__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/attr__sink__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/attr__sink__pydoc__template_8h__incl.map @@ -698,19 +685,10 @@ share/doc/gnuradio-${PKGVERSION}/html/attr__sink__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__sink__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h.html share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h.js -share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__source_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/attr__source__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/attr__source__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/attr__source__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/attr__source__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/attr__source__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/attr__source__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/attr__source__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/attr__source__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/attr__source__pydoc__template_8h__incl.map @@ -719,19 +697,10 @@ share/doc/gnuradio-${PKGVERSION}/html/attr__source__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__source__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h.html share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h.js -share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/attr__updater_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/attr__updater__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/attr__updater__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/attr__updater__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/attr__updater__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/attr__updater__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/attr__updater__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/attr__updater__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/attr__updater__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/attr__updater__pydoc__template_8h__incl.map @@ -836,15 +805,12 @@ share/doc/gnuradio-${PKGVERSION}/html/block__gateway_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/block__gateway_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/block__gateway_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/block__gateway_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h__dep__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/block__impl_8h_source.html +share/doc/gnuradio-${PKGVERSION}/html/block__pydoc__template_8h.html +share/doc/gnuradio-${PKGVERSION}/html/block__pydoc__template_8h.js +share/doc/gnuradio-${PKGVERSION}/html/block__pydoc__template_8h__incl.map +share/doc/gnuradio-${PKGVERSION}/html/block__pydoc__template_8h__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/block__pydoc__template_8h__incl.svg +share/doc/gnuradio-${PKGVERSION}/html/block__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/block__registry_8h.html share/doc/gnuradio-${PKGVERSION}/html/block__registry_8h.js share/doc/gnuradio-${PKGVERSION}/html/block__registry_8h__dep__incl.map @@ -854,6 +820,18 @@ share/doc/gnuradio-${PKGVERSION}/html/block__registry_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/block__registry_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/block__registry_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/block__registry_8h_source.html +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaver__xx_8h.html +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaver__xx_8h.js +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaver__xx_8h__incl.map +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaver__xx_8h__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaver__xx_8h__incl.svg +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaver__xx_8h_source.html +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaving_8h.html +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaving_8h.js +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaving_8h__incl.map +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaving_8h__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaving_8h__incl.svg +share/doc/gnuradio-${PKGVERSION}/html/blockinterleaving_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/blocks_8dox.html share/doc/gnuradio-${PKGVERSION}/html/buffer_8h.html share/doc/gnuradio-${PKGVERSION}/html/buffer_8h.js @@ -1581,6 +1559,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1annotator__raw.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1argmax-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1argmax.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1argmax.js +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1blockinterleaver__xx-members.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1blockinterleaver__xx.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1blockinterleaver__xx.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1burst__tagger-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1burst__tagger.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1burst__tagger.js @@ -1710,6 +1691,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1float__to__uchar.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1head-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1head.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1head.js +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1host__buffer__copy-members.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1host__buffer__copy.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1host__buffer__copy.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1int__to__float-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1int__to__float.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1int__to__float.js @@ -1731,6 +1715,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1keep__m__in__n.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1keep__one__in__n-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1keep__one__in__n.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1keep__one__in__n.js +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1kernel_1_1block__interleaving-members.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1kernel_1_1block__interleaving.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1kernel_1_1block__interleaving.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1kernel_1_1pack__k__bits-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1kernel_1_1pack__k__bits.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1kernel_1_1pack__k__bits.js @@ -2799,69 +2786,39 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1host__buffer.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__sink-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__sink.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__sink.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__sink__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__sink__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__sink__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__source-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__source.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__source.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__source__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__source__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__source__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__updater-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__updater.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__updater.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__updater__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__updater__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1attr__updater__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1dds__control-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1dds__control.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1dds__control.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1dds__control__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1dds__control__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1dds__control__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__sink-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__sink.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__sink.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__sink__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__sink__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__sink__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__source-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__source.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__source.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__source__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__source__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1device__source__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__sink-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__sink.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__sink.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__sink__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__sink__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__sink__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__source-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__source.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__source.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__source__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__source__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms2__source__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink__f32c-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink__f32c.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink__f32c.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__sink__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source__f32c-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source__f32c.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source__f32c.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1fmcomms5__source__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1iio__param__t-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1iio__param__t.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1iio_1_1iio__param__t.js @@ -2904,44 +2861,27 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1msg__handler.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1msg__queue-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1msg__queue.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1msg__queue.js +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1msg__queue__comparator-members.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1msg__queue__comparator.html +share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1msg__queue__comparator.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1nco-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1nco.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1nco.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1socket__pdu-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1socket__pdu.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1socket__pdu.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1socket__pdu__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1socket__pdu__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1socket__pdu__impl.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1stream__pdu__base-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1stream__pdu__base.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1stream__pdu__base.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__connection-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__connection.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__connection.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__sink-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__sink.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__sink.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__sink__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__sink__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tcp__sink__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tuntap__pdu-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tuntap__pdu.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tuntap__pdu.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tuntap__pdu__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1tuntap__pdu__impl.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__sink-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__sink.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__sink.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__sink__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__sink__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__sink__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__source-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__source.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__source.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__source__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__source__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1network_1_1udp__source__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1pdu_1_1add__system__time-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1pdu_1_1add__system__time.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1pdu_1_1add__system__time.js @@ -3041,21 +2981,12 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1random.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1block-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1block.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1block.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1block__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1block__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1block__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1sink-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1sink.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1sink.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1sink__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1sink__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1sink__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1source-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1source.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1source.js -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1source__impl-members.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1source__impl.html -share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1soapy_1_1source__impl.js share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1sync__block-members.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1sync__block.html share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1sync__block.js @@ -3287,9 +3218,6 @@ share/doc/gnuradio-${PKGVERSION}/html/classheader__seq__num.js share/doc/gnuradio-${PKGVERSION}/html/classheader__seq__plus__size-members.html share/doc/gnuradio-${PKGVERSION}/html/classheader__seq__plus__size.html share/doc/gnuradio-${PKGVERSION}/html/classheader__seq__plus__size.js -share/doc/gnuradio-${PKGVERSION}/html/classmywindow-members.html -share/doc/gnuradio-${PKGVERSION}/html/classmywindow.html -share/doc/gnuradio-${PKGVERSION}/html/classmywindow.js share/doc/gnuradio-${PKGVERSION}/html/classpmt_1_1comparator-members.html share/doc/gnuradio-${PKGVERSION}/html/classpmt_1_1comparator.html share/doc/gnuradio-${PKGVERSION}/html/classpmt_1_1comparator.js @@ -4010,6 +3938,9 @@ share/doc/gnuradio-${PKGVERSION}/html/crc32__bb__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/crc32__bb__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/crc32__bb__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/crc_8h.html +share/doc/gnuradio-${PKGVERSION}/html/crc_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/crc_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/crc_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/crc_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/crc_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/crc_8h__incl.svg @@ -4186,19 +4117,10 @@ share/doc/gnuradio-${PKGVERSION}/html/dc__blocker__ff__pydoc__template_8h__incl. share/doc/gnuradio-${PKGVERSION}/html/dc__blocker__ff__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h.html share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h.js -share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/dds__control_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/dds__control__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/dds__control__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/dds__control__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/dds__control__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/dds__control__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/dds__control__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/dds__control__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/dds__control__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/dds__control__pydoc__template_8h__incl.map @@ -4295,15 +4217,6 @@ share/doc/gnuradio-${PKGVERSION}/html/device__sink_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/device__sink_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/device__sink_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/device__sink_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h__dep__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/device__sink__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/device__sink__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/device__sink__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/device__sink__pydoc__template_8h__incl.map @@ -4319,15 +4232,6 @@ share/doc/gnuradio-${PKGVERSION}/html/device__source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/device__source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/device__source_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/device__source_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h__dep__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/device__source__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/device__source__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/device__source__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/device__source__pydoc__template_8h__incl.map @@ -4465,9 +4369,7 @@ share/doc/gnuradio-${PKGVERSION}/html/dir_000040.js share/doc/gnuradio-${PKGVERSION}/html/dir_000041.html share/doc/gnuradio-${PKGVERSION}/html/dir_000041.js share/doc/gnuradio-${PKGVERSION}/html/dir_000042.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000042.js share/doc/gnuradio-${PKGVERSION}/html/dir_000043.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000043.js share/doc/gnuradio-${PKGVERSION}/html/dir_000044.html share/doc/gnuradio-${PKGVERSION}/html/dir_000045.html share/doc/gnuradio-${PKGVERSION}/html/dir_000046.html @@ -4479,7 +4381,9 @@ share/doc/gnuradio-${PKGVERSION}/html/dir_000051.html share/doc/gnuradio-${PKGVERSION}/html/dir_000052.html share/doc/gnuradio-${PKGVERSION}/html/dir_000053.html share/doc/gnuradio-${PKGVERSION}/html/dir_000054.html +share/doc/gnuradio-${PKGVERSION}/html/dir_000054.js share/doc/gnuradio-${PKGVERSION}/html/dir_000055.html +share/doc/gnuradio-${PKGVERSION}/html/dir_000055.js share/doc/gnuradio-${PKGVERSION}/html/dir_000056.html share/doc/gnuradio-${PKGVERSION}/html/dir_000056.js share/doc/gnuradio-${PKGVERSION}/html/dir_000057.html @@ -4701,7 +4605,6 @@ share/doc/gnuradio-${PKGVERSION}/html/dir_000164.js share/doc/gnuradio-${PKGVERSION}/html/dir_000165.html share/doc/gnuradio-${PKGVERSION}/html/dir_000165.js share/doc/gnuradio-${PKGVERSION}/html/dir_000166.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000166.js share/doc/gnuradio-${PKGVERSION}/html/dir_000167.html share/doc/gnuradio-${PKGVERSION}/html/dir_000167.js share/doc/gnuradio-${PKGVERSION}/html/dir_000168.html @@ -4715,6 +4618,7 @@ share/doc/gnuradio-${PKGVERSION}/html/dir_000171.js share/doc/gnuradio-${PKGVERSION}/html/dir_000172.html share/doc/gnuradio-${PKGVERSION}/html/dir_000172.js share/doc/gnuradio-${PKGVERSION}/html/dir_000173.html +share/doc/gnuradio-${PKGVERSION}/html/dir_000173.js share/doc/gnuradio-${PKGVERSION}/html/dir_000174.html share/doc/gnuradio-${PKGVERSION}/html/dir_000174.js share/doc/gnuradio-${PKGVERSION}/html/dir_000175.html @@ -4797,30 +4701,6 @@ share/doc/gnuradio-${PKGVERSION}/html/dir_000213.html share/doc/gnuradio-${PKGVERSION}/html/dir_000213.js share/doc/gnuradio-${PKGVERSION}/html/dir_000214.html share/doc/gnuradio-${PKGVERSION}/html/dir_000214.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000215.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000215.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000216.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000216.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000217.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000217.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000218.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000218.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000219.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000219.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000220.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000220.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000221.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000221.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000222.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000222.js -share/doc/gnuradio-${PKGVERSION}/html/dir_000223.html -share/doc/gnuradio-${PKGVERSION}/html/dir_000223.js -share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h.html -share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h.js -share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/displayform_8h.html share/doc/gnuradio-${PKGVERSION}/html/displayform_8h__dep__incl.map share/doc/gnuradio-${PKGVERSION}/html/displayform_8h__dep__incl.md5 @@ -5829,9 +5709,6 @@ share/doc/gnuradio-${PKGVERSION}/html/flowgraph__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/flowgraph__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink_8h__incl.svg @@ -5842,12 +5719,6 @@ share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__f32c__pydoc__template_8h__ share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__f32c__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__f32c__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__f32c__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__pydoc__template_8h__incl.map @@ -5856,9 +5727,6 @@ share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__pydoc__template_8h__incl.s share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__sink__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source_8h__incl.svg @@ -5869,12 +5737,6 @@ share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__f32c__pydoc__template_8h share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__f32c__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__f32c__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__f32c__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__pydoc__template_8h__incl.map @@ -5883,9 +5745,6 @@ share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__pydoc__template_8h__incl share/doc/gnuradio-${PKGVERSION}/html/fmcomms2__source__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink_8h__incl.svg @@ -5896,12 +5755,6 @@ share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__f32c__pydoc__template_8h__ share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__f32c__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__f32c__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__f32c__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__pydoc__template_8h__incl.map @@ -5910,9 +5763,6 @@ share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__pydoc__template_8h__incl.s share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__sink__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source_8h__incl.svg @@ -5923,12 +5773,6 @@ share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__f32c__pydoc__template_8h share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__f32c__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__f32c__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__f32c__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/fmcomms5__source__pydoc__template_8h__incl.map @@ -6017,9 +5861,6 @@ share/doc/gnuradio-${PKGVERSION}/html/freq__sink__c__pydoc__template_8h__incl.md share/doc/gnuradio-${PKGVERSION}/html/freq__sink__c__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/freq__sink__c__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h.html -share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__incl.svg @@ -6163,7 +6004,6 @@ share/doc/gnuradio-${PKGVERSION}/html/functions_vars_a.html share/doc/gnuradio-${PKGVERSION}/html/functions_vars_b.html share/doc/gnuradio-${PKGVERSION}/html/functions_vars_c.html share/doc/gnuradio-${PKGVERSION}/html/functions_vars_d.html -share/doc/gnuradio-${PKGVERSION}/html/functions_vars_e.html share/doc/gnuradio-${PKGVERSION}/html/functions_vars_f.html share/doc/gnuradio-${PKGVERSION}/html/functions_vars_g.html share/doc/gnuradio-${PKGVERSION}/html/functions_vars_h.html @@ -6452,12 +6292,6 @@ share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2include_2pmt_2api_8h__in share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2include_2pmt_2api_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2include_2pmt_2api_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2include_2pmt_2api_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2python_2gnuradio_2gr_2bindings_2docstrings_2block__pydoc__template_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2python_2gnuradio_2gr_2bindings_2docstrings_2block__pydoc__template_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2python_2gnuradio_2gr_2bindings_2docstrings_2block__pydoc__template_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2python_2gnuradio_2gr_2bindings_2docstrings_2block__pydoc__template_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2python_2gnuradio_2gr_2bindings_2docstrings_2block__pydoc__template_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2python_2gnuradio_2gr_2bindings_2docstrings_2block__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gnuradio_logo_icon.png share/doc/gnuradio-${PKGVERSION}/html/goertzel_8h.html share/doc/gnuradio-${PKGVERSION}/html/goertzel_8h__incl.map @@ -6509,18 +6343,6 @@ share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2include_2gnuradio_2audio_2source share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2include_2gnuradio_2audio_2source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2include_2gnuradio_2audio_2source_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2include_2gnuradio_2audio_2source_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2sink__pydoc__template_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2sink__pydoc__template_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2sink__pydoc__template_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2sink__pydoc__template_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2sink__pydoc__template_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2sink__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2source__pydoc__template_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2source__pydoc__template_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2source__pydoc__template_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2source__pydoc__template_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2source__pydoc__template_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/gr-audio_2python_2audio_2bindings_2docstrings_2source__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr-blocks_2include_2gnuradio_2blocks_2api_8h.html share/doc/gnuradio-${PKGVERSION}/html/gr-blocks_2include_2gnuradio_2blocks_2api_8h.js share/doc/gnuradio-${PKGVERSION}/html/gr-blocks_2include_2gnuradio_2blocks_2api_8h__dep__incl.map @@ -6666,40 +6488,16 @@ share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2block_ share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2block_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h.html share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2sink_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h.html share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2include_2gnuradio_2soapy_2source_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2block__pydoc__template_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2block__pydoc__template_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2block__pydoc__template_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2block__pydoc__template_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2block__pydoc__template_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2block__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2sink__pydoc__template_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2sink__pydoc__template_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2sink__pydoc__template_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2sink__pydoc__template_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2sink__pydoc__template_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2sink__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2source__pydoc__template_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2source__pydoc__template_8h.js -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2source__pydoc__template_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2source__pydoc__template_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2source__pydoc__template_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/gr-soapy_2python_2soapy_2bindings_2docstrings_2source__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr-trellis_2include_2gnuradio_2trellis_2api_8h.html share/doc/gnuradio-${PKGVERSION}/html/gr-trellis_2include_2gnuradio_2trellis_2api_8h.js share/doc/gnuradio-${PKGVERSION}/html/gr-trellis_2include_2gnuradio_2trellis_2api_8h__dep__incl.map @@ -7069,9 +6867,6 @@ share/doc/gnuradio-${PKGVERSION}/html/hilbert__fc__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/hilbert__fc__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/hilbert__fc__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h.html -share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__incl.svg @@ -7099,6 +6894,17 @@ share/doc/gnuradio-${PKGVERSION}/html/host__buffer_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/host__buffer_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/host__buffer_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/host__buffer_8h_source.html +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy_8h.html +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy_8h__incl.map +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy_8h__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy_8h__incl.svg +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy_8h_source.html +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy__pydoc__template_8h.html +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy__pydoc__template_8h.js +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy__pydoc__template_8h__incl.map +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy__pydoc__template_8h__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy__pydoc__template_8h__incl.svg +share/doc/gnuradio-${PKGVERSION}/html/host__buffer__copy__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/iio__types_8h.html share/doc/gnuradio-${PKGVERSION}/html/iio__types_8h.js share/doc/gnuradio-${PKGVERSION}/html/iio__types_8h__dep__incl.map @@ -7311,9 +7117,6 @@ share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_137.svg share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_138.map share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_138.md5 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_138.svg -share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_139.map -share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_139.md5 -share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_139.svg share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_14.map share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_14.md5 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_14.svg @@ -8604,9 +8407,6 @@ share/doc/gnuradio-${PKGVERSION}/html/navtreeindex8.js share/doc/gnuradio-${PKGVERSION}/html/navtreeindex80.js share/doc/gnuradio-${PKGVERSION}/html/navtreeindex81.js share/doc/gnuradio-${PKGVERSION}/html/navtreeindex82.js -share/doc/gnuradio-${PKGVERSION}/html/navtreeindex83.js -share/doc/gnuradio-${PKGVERSION}/html/navtreeindex84.js -share/doc/gnuradio-${PKGVERSION}/html/navtreeindex85.js share/doc/gnuradio-${PKGVERSION}/html/navtreeindex9.js share/doc/gnuradio-${PKGVERSION}/html/nco_8h.html share/doc/gnuradio-${PKGVERSION}/html/nco_8h__incl.map @@ -8632,9 +8432,6 @@ share/doc/gnuradio-${PKGVERSION}/html/nlog10__ff__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/nlog10__ff__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h.html share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h.js -share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/noise__source_8h__incl.svg @@ -8933,9 +8730,6 @@ share/doc/gnuradio-${PKGVERSION}/html/packet__headerparser__b__pydoc__template_8 share/doc/gnuradio-${PKGVERSION}/html/packet__headerparser__b__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h.html share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h.js -share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/packet__headers_8h__incl.svg @@ -10604,7 +10398,6 @@ share/doc/gnuradio-${PKGVERSION}/html/search/variables_11.js share/doc/gnuradio-${PKGVERSION}/html/search/variables_12.js share/doc/gnuradio-${PKGVERSION}/html/search/variables_13.js share/doc/gnuradio-${PKGVERSION}/html/search/variables_14.js -share/doc/gnuradio-${PKGVERSION}/html/search/variables_15.js share/doc/gnuradio-${PKGVERSION}/html/search/variables_2.js share/doc/gnuradio-${PKGVERSION}/html/search/variables_3.js share/doc/gnuradio-${PKGVERSION}/html/search/variables_4.js @@ -10654,12 +10447,6 @@ share/doc/gnuradio-${PKGVERSION}/html/selector__pydoc__template_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/selector__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/selector__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/selector__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/setting__string__conversion_8h.html -share/doc/gnuradio-${PKGVERSION}/html/setting__string__conversion_8h.js -share/doc/gnuradio-${PKGVERSION}/html/setting__string__conversion_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/setting__string__conversion_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/setting__string__conversion_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/setting__string__conversion_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/short__to__char_8h.html share/doc/gnuradio-${PKGVERSION}/html/short__to__char_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/short__to__char_8h__incl.md5 @@ -10684,9 +10471,6 @@ share/doc/gnuradio-${PKGVERSION}/html/short__to__float__pydoc__template_8h__incl share/doc/gnuradio-${PKGVERSION}/html/short__to__float__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h.html share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h.js -share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/sig__source_8h__incl.svg @@ -10800,12 +10584,12 @@ share/doc/gnuradio-${PKGVERSION}/html/sink__f__pydoc__template_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/sink__f__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/sink__f__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/sink__f__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/sink__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/sink__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/sink__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/sink__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/sink__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/sink__impl_8h_source.html +share/doc/gnuradio-${PKGVERSION}/html/sink__pydoc__template_8h.html +share/doc/gnuradio-${PKGVERSION}/html/sink__pydoc__template_8h.js +share/doc/gnuradio-${PKGVERSION}/html/sink__pydoc__template_8h__incl.map +share/doc/gnuradio-${PKGVERSION}/html/sink__pydoc__template_8h__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/sink__pydoc__template_8h__incl.svg +share/doc/gnuradio-${PKGVERSION}/html/sink__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/sink__s_8h.html share/doc/gnuradio-${PKGVERSION}/html/sink__s_8h.js share/doc/gnuradio-${PKGVERSION}/html/sink__s_8h__incl.map @@ -10875,12 +10659,6 @@ share/doc/gnuradio-${PKGVERSION}/html/skiphead__pydoc__template_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/skiphead__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/skiphead__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/skiphead__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/soapy__common_8h.html -share/doc/gnuradio-${PKGVERSION}/html/soapy__common_8h.js -share/doc/gnuradio-${PKGVERSION}/html/soapy__common_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/soapy__common_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/soapy__common_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/soapy__common_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/soapy__types_8h.html share/doc/gnuradio-${PKGVERSION}/html/soapy__types_8h.js share/doc/gnuradio-${PKGVERSION}/html/soapy__types_8h__dep__incl.map @@ -10891,31 +10669,22 @@ share/doc/gnuradio-${PKGVERSION}/html/soapy__types_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/soapy__types_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/soapy__types_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h.html -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/socket__pdu_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__pydoc__template_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/socket__pdu__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/source__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/source__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/source__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/source__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/source__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/source__impl_8h_source.html +share/doc/gnuradio-${PKGVERSION}/html/source__pydoc__template_8h.html +share/doc/gnuradio-${PKGVERSION}/html/source__pydoc__template_8h.js +share/doc/gnuradio-${PKGVERSION}/html/source__pydoc__template_8h__incl.map +share/doc/gnuradio-${PKGVERSION}/html/source__pydoc__template_8h__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/source__pydoc__template_8h__incl.svg +share/doc/gnuradio-${PKGVERSION}/html/source__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/spectrumUpdateEvents_8h.html share/doc/gnuradio-${PKGVERSION}/html/spectrumUpdateEvents_8h.js share/doc/gnuradio-${PKGVERSION}/html/spectrumUpdateEvents_8h__dep__incl.map @@ -11025,15 +10794,6 @@ share/doc/gnuradio-${PKGVERSION}/html/stream__mux__pydoc__template_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/stream__mux__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/stream__mux__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/stream__mux__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h.html -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h.js -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h__dep__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/stream__pdu__base_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/stream__to__streams_8h.html share/doc/gnuradio-${PKGVERSION}/html/stream__to__streams_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/stream__to__streams_8h__incl.md5 @@ -11137,12 +10897,6 @@ share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1fft_1_1fft__outbuf.js share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1fft_1_1fft__outbuf_3_01float_00_01true_01_4-members.html share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1fft_1_1fft__outbuf_3_01float_00_01true_01_4.html share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1fft_1_1fft__outbuf_3_01float_00_01true_01_4.js -share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1iio_1_1ctxInfo-members.html -share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1iio_1_1ctxInfo.html -share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1iio_1_1ctxInfo.js -share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1soapy_1_1device__deleter-members.html -share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1soapy_1_1device__deleter.html -share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1soapy_1_1device__deleter.js share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1tag__t-members.html share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1tag__t.html share/doc/gnuradio-${PKGVERSION}/html/structgr_1_1tag__t.js @@ -11209,9 +10963,6 @@ share/doc/gnuradio-${PKGVERSION}/html/structrpcpmtconverter_1_1to__pmt__short__f share/doc/gnuradio-${PKGVERSION}/html/structrpcpmtconverter_1_1to__pmt__string__f-members.html share/doc/gnuradio-${PKGVERSION}/html/structrpcpmtconverter_1_1to__pmt__string__f.html share/doc/gnuradio-${PKGVERSION}/html/structrpcpmtconverter_1_1to__pmt__string__f.js -share/doc/gnuradio-${PKGVERSION}/html/structsetting__info-members.html -share/doc/gnuradio-${PKGVERSION}/html/structsetting__info.html -share/doc/gnuradio-${PKGVERSION}/html/structsetting__info.js share/doc/gnuradio-${PKGVERSION}/html/structv-members.html share/doc/gnuradio-${PKGVERSION}/html/structv.html share/doc/gnuradio-${PKGVERSION}/html/structv.js @@ -11515,30 +11266,12 @@ share/doc/gnuradio-${PKGVERSION}/html/take__skip__to__pdu__pydoc__template_8h__i share/doc/gnuradio-${PKGVERSION}/html/take__skip__to__pdu__pydoc__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/take__skip__to__pdu__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/take__skip__to__pdu__pydoc__template_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h.html -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h.js -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h__dep__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/tcp__connection_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h.html share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h.js -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/tcp__sink_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/tcp__sink__pydoc__template_8h__incl.map @@ -11613,9 +11346,6 @@ share/doc/gnuradio-${PKGVERSION}/html/thrift__server__template_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/thrift__server__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/thrift__server__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/throttle_8h.html -share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__incl.svg @@ -11680,9 +11410,6 @@ share/doc/gnuradio-${PKGVERSION}/html/time__sink__c__pydoc__template_8h__incl.md share/doc/gnuradio-${PKGVERSION}/html/time__sink__c__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/time__sink__c__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h.html -share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__incl.svg @@ -11744,9 +11471,6 @@ share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type__pydoc__temp share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/top__block_8h.html share/doc/gnuradio-${PKGVERSION}/html/top__block_8h.js -share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__incl.svg @@ -11853,19 +11577,10 @@ share/doc/gnuradio-${PKGVERSION}/html/tsb__vector__sink__pydoc__template_8h__inc share/doc/gnuradio-${PKGVERSION}/html/tsb__vector__sink__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/tsb__vector__sink__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h.html -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/tuntap__pdu__pydoc__template_8h__incl.map @@ -11900,19 +11615,10 @@ share/doc/gnuradio-${PKGVERSION}/html/udp__header__types_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/udp__header__types_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h.html share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h.js -share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/udp__sink_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/udp__sink__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/udp__sink__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/udp__sink__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/udp__sink__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/udp__sink__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/udp__sink__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/udp__sink__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/udp__sink__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/udp__sink__pydoc__template_8h__incl.map @@ -11921,19 +11627,10 @@ share/doc/gnuradio-${PKGVERSION}/html/udp__sink__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/udp__sink__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h.html share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h.js -share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/udp__source_8h_source.html -share/doc/gnuradio-${PKGVERSION}/html/udp__source__impl_8h.html -share/doc/gnuradio-${PKGVERSION}/html/udp__source__impl_8h.js -share/doc/gnuradio-${PKGVERSION}/html/udp__source__impl_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/udp__source__impl_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/udp__source__impl_8h__incl.svg -share/doc/gnuradio-${PKGVERSION}/html/udp__source__impl_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/udp__source__pydoc__template_8h.html share/doc/gnuradio-${PKGVERSION}/html/udp__source__pydoc__template_8h.js share/doc/gnuradio-${PKGVERSION}/html/udp__source__pydoc__template_8h__incl.map @@ -12208,9 +11905,6 @@ share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__c__pydoc__template_8h__in share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__c__pydoc__template_8h__incl.svg share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__c__pydoc__template_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h.html -share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__dep__incl.svg share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__incl.svg @@ -12440,13 +12134,10 @@ share/doc/gnuradio-${PKGVERSION}/xml/atsc__trellis__encoder__pydoc__template_8h. share/doc/gnuradio-${PKGVERSION}/xml/atsc__viterbi__decoder_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/atsc__viterbi__decoder__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/attr__sink_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/attr__sink__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/attr__sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/attr__source_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/attr__source__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/attr__source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/attr__updater_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/attr__updater__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/attr__updater__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/attributes_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/audio_8dox.xml @@ -12464,8 +12155,10 @@ share/doc/gnuradio-${PKGVERSION}/xml/binary__slicer__fb__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/block__detail_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/block__detail__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/block__gateway_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/block__impl_8h.xml +share/doc/gnuradio-${PKGVERSION}/xml/block__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/block__registry_8h.xml +share/doc/gnuradio-${PKGVERSION}/xml/blockinterleaver__xx_8h.xml +share/doc/gnuradio-${PKGVERSION}/xml/blockinterleaving_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/blocks_8dox.xml share/doc/gnuradio-${PKGVERSION}/xml/buffer_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/buffer__double__mapped_8h.xml @@ -12661,6 +12354,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1annotator__1to1.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1annotator__alltoall.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1annotator__raw.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1argmax.xml +share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1blockinterleaver__xx.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1burst__tagger.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1char__to__float.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1char__to__short.xml @@ -12704,6 +12398,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1float__to__int.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1float__to__short.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1float__to__uchar.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1head.xml +share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1host__buffer__copy.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1int__to__float.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1integrate.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1interleave.xml @@ -12711,6 +12406,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1interleaved__char__to_ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1interleaved__short__to__complex.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1keep__m__in__n.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1keep__one__in__n.xml +share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1kernel_1_1block__interleaving.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1kernel_1_1pack__k__bits.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1kernel_1_1unpack__k__bits.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1lfsr__15__1__0.xml @@ -13067,27 +12763,17 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1fxpt__vco.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1hier__block2.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1host__buffer.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1attr__sink.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1attr__sink__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1attr__source.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1attr__source__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1attr__updater.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1attr__updater__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1dds__control.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1dds__control__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1device__sink.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1device__sink__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1device__source.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1device__source__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms2__sink.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms2__sink__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms2__source.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms2__source__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms5__sink.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms5__sink__f32c.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms5__sink__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms5__source.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms5__source__f32c.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1fmcomms5__source__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1iio_1_1iio__param__t.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1io__signature.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1logger.xml @@ -13102,19 +12788,13 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1msg__edge.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1msg__endpoint.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1msg__handler.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1msg__queue.xml +share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1msg__queue__comparator.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1nco.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1socket__pdu.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1socket__pdu__impl.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1stream__pdu__base.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1tcp__connection.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1tcp__sink.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1tcp__sink__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1tuntap__pdu.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1tuntap__pdu__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1udp__sink.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1udp__sink__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1udp__source.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1network_1_1udp__source__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1pdu_1_1add__system__time.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1pdu_1_1pdu__filter.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1pdu_1_1pdu__remove.xml @@ -13148,11 +12828,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1waterfall__sink__c.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1waterfall__sink__f.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1random.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1soapy_1_1block.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1soapy_1_1block__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1soapy_1_1sink.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1soapy_1_1sink__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1soapy_1_1source.xml -share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1soapy_1_1source__impl.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1sync__block.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1sync__decimator.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1sync__interpolator.xml @@ -13230,7 +12907,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1zeromq_1_1sub__msg__source.xml share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1zeromq_1_1sub__source.xml share/doc/gnuradio-${PKGVERSION}/xml/classheader__seq__num.xml share/doc/gnuradio-${PKGVERSION}/xml/classheader__seq__plus__size.xml -share/doc/gnuradio-${PKGVERSION}/xml/classmywindow.xml share/doc/gnuradio-${PKGVERSION}/xml/classpmt_1_1comparator.xml share/doc/gnuradio-${PKGVERSION}/xml/classpmt_1_1exception.xml share/doc/gnuradio-${PKGVERSION}/xml/classpmt_1_1notimplemented.xml @@ -13418,7 +13094,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/dc__blocker__cc__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/dc__blocker__ff_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/dc__blocker__ff__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/dds__control_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/dds__control__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/dds__control__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/decision__feedback__equalizer_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/decision__feedback__equalizer__pydoc__template_8h.xml @@ -13435,10 +13110,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/depuncture__bb__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/descrambler__bb_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/descrambler__bb__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/device__sink_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/device__sink__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/device__sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/device__source_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/device__source__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/device__source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/diff__coding__type_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/diff__coding__type__pydoc__template_8h.xml @@ -13664,16 +13337,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/dir_000211.xml share/doc/gnuradio-${PKGVERSION}/xml/dir_000212.xml share/doc/gnuradio-${PKGVERSION}/xml/dir_000213.xml share/doc/gnuradio-${PKGVERSION}/xml/dir_000214.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000215.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000216.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000217.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000218.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000219.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000220.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000221.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000222.xml -share/doc/gnuradio-${PKGVERSION}/xml/dir_000223.xml -share/doc/gnuradio-${PKGVERSION}/xml/display__qt_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/displayform_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/displayform__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/divide_8h.xml @@ -13847,19 +13510,15 @@ share/doc/gnuradio-${PKGVERSION}/xml/flowgraph_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/flowgraph__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__sink_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__sink__f32c__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__sink__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__source_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__source__f32c__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__source__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms2__source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__sink_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__sink__f32c__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__sink__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__source_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__source__f32c__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__source__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmcomms5__source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmdet__cf_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/fmdet__cf__pydoc__template_8h.xml @@ -13920,7 +13579,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-logo.svg share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-runtime_2include_2gnuradio_2api_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-runtime_2include_2gnuradio_2block_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-runtime_2include_2pmt_2api_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-runtime_2python_2gnuradio_2gr_2bindings_2docstrings_2block__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/goertzel_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/goertzel__fc_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/goertzel__fc__pydoc__template_8h.xml @@ -13929,8 +13587,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/gr-analog_2include_2gnuradio_2analog_2api_8 share/doc/gnuradio-${PKGVERSION}/xml/gr-audio_2include_2gnuradio_2audio_2api_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-audio_2include_2gnuradio_2audio_2sink_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-audio_2include_2gnuradio_2audio_2source_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/gr-audio_2python_2audio_2bindings_2docstrings_2sink__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/gr-audio_2python_2audio_2bindings_2docstrings_2source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-blocks_2include_2gnuradio_2blocks_2api_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-channels_2include_2gnuradio_2channels_2api_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-digital_2include_2gnuradio_2digital_2api_8h.xml @@ -13950,9 +13606,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/gr-soapy_2include_2gnuradio_2soapy_2api_8h. share/doc/gnuradio-${PKGVERSION}/xml/gr-soapy_2include_2gnuradio_2soapy_2block_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-soapy_2include_2gnuradio_2soapy_2sink_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-soapy_2include_2gnuradio_2soapy_2source_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/gr-soapy_2python_2soapy_2bindings_2docstrings_2block__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/gr-soapy_2python_2soapy_2bindings_2docstrings_2sink__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/gr-soapy_2python_2soapy_2bindings_2docstrings_2source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-trellis_2include_2gnuradio_2trellis_2api_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-trellis_2include_2gnuradio_2trellis_2encoder_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/gr-trellis_2include_2gnuradio_2trellis_2viterbi_8h.xml @@ -14045,6 +13698,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/histogram__sink__f__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/histogramdisplayform_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/histogramdisplayform__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/host__buffer_8h.xml +share/doc/gnuradio-${PKGVERSION}/xml/host__buffer__copy_8h.xml +share/doc/gnuradio-${PKGVERSION}/xml/host__buffer__copy__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/iio__types_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/iir__filter_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/iir__filter__ccc_8h.xml @@ -14192,7 +13847,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/namespace_0d86.xml share/doc/gnuradio-${PKGVERSION}/xml/namespaceapache.xml share/doc/gnuradio-${PKGVERSION}/xml/namespaceapache_1_1thrift.xml share/doc/gnuradio-${PKGVERSION}/xml/namespaceapache_1_1thrift_1_1server.xml -share/doc/gnuradio-${PKGVERSION}/xml/namespaceboost.xml share/doc/gnuradio-${PKGVERSION}/xml/namespacefmt.xml share/doc/gnuradio-${PKGVERSION}/xml/namespacegnuradio.xml share/doc/gnuradio-${PKGVERSION}/xml/namespacegnuradio_1_1detail.xml @@ -14548,7 +14202,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/selective__fading__model_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/selective__fading__model__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/selector_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/selector__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/setting__string__conversion_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/short__to__char_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/short__to__char__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/short__to__float_8h.xml @@ -14572,7 +14225,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/sink__c_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sink__c__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sink__f_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sink__f__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/sink__impl_8h.xml +share/doc/gnuradio-${PKGVERSION}/xml/sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sink__s_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sink__s__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sink__uc_8h.xml @@ -14585,12 +14238,10 @@ share/doc/gnuradio-${PKGVERSION}/xml/siso__type_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/siso__type__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/skiphead_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/skiphead__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/soapy__common_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/soapy__types_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/socket__pdu_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/socket__pdu__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/socket__pdu__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/source__impl_8h.xml +share/doc/gnuradio-${PKGVERSION}/xml/source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/spectrumUpdateEvents_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/spectrumdisplayform_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sptr__magic_8h.xml @@ -14607,7 +14258,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/stream__demux_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/stream__demux__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/stream__mux_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/stream__mux__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/stream__pdu__base_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/stream__to__streams_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/stream__to__streams__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/stream__to__tagged__stream_8h.xml @@ -14632,8 +14282,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1fft_1_1fft__inbuf.xml share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1fft_1_1fft__inbuf_3_01float_00_01false_01_4.xml share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1fft_1_1fft__outbuf.xml share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1fft_1_1fft__outbuf_3_01float_00_01true_01_4.xml -share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1iio_1_1ctxInfo.xml -share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1soapy_1_1device__deleter.xml share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1tag__t.xml share/doc/gnuradio-${PKGVERSION}/xml/structgr_1_1tpb__detail.xml share/doc/gnuradio-${PKGVERSION}/xml/structpmt_1_1pmt__pool_1_1item.xml @@ -14668,7 +14316,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/structrpcserver__thrift_1_1get__f.xml share/doc/gnuradio-${PKGVERSION}/xml/structrpcserver__thrift_1_1properties__all__f.xml share/doc/gnuradio-${PKGVERSION}/xml/structrpcserver__thrift_1_1properties__f.xml share/doc/gnuradio-${PKGVERSION}/xml/structrpcserver__thrift_1_1set__f.xml -share/doc/gnuradio-${PKGVERSION}/xml/structsetting__info.xml share/doc/gnuradio-${PKGVERSION}/xml/structv.xml share/doc/gnuradio-${PKGVERSION}/xml/sub_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/sub__msg__source_8h.xml @@ -14718,9 +14365,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/tags__to__pdu_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/tags__to__pdu__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/take__skip__to__pdu_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/take__skip__to__pdu__pydoc__template_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/tcp__connection_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/tcp__sink_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/tcp__sink__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/tcp__sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/test__tag__variable__rate__ff_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/test__tag__variable__rate__ff__pydoc__template_8h.xml @@ -14771,17 +14416,14 @@ share/doc/gnuradio-${PKGVERSION}/xml/trigger__mode__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/tsb__vector__sink_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/tsb__vector__sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/tuntap__pdu_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/tuntap__pdu__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/tuntap__pdu__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/types_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/uchar__to__float_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/uchar__to__float__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/udp__header__types_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/udp__sink_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/udp__sink__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/udp__sink__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/udp__source_8h.xml -share/doc/gnuradio-${PKGVERSION}/xml/udp__source__impl_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/udp__source__pydoc__template_8h.xml share/doc/gnuradio-${PKGVERSION}/xml/uhd_8dox.xml share/doc/gnuradio-${PKGVERSION}/xml/uhd__types_8h.xml diff --git a/ham/gnuradio-dtv/Makefile b/ham/gnuradio-dtv/Makefile index 40fac1ff2c9..287a1fa46b0 100644 --- a/ham/gnuradio-dtv/Makefile +++ b/ham/gnuradio-dtv/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.42 2022/09/11 12:51:54 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2022/10/09 07:56:10 adam Exp $ PKGNAME= gnuradio-dtv-${VERSION} -PKGREVISION= 2 COMMENT= Various digital television standards 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_DTV=ON @@ -14,7 +13,6 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= fec companion -.include "../../ham/gnuradio-fec/buildlink3.mk" -.include "../../math/gsl/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" +.include "../../ham/gnuradio-fec/buildlink3.mk" +.include "../../math/gsl/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-fec/Makefile b/ham/gnuradio-fec/Makefile index 900837e3c01..f171e8f5954 100644 --- a/ham/gnuradio-fec/Makefile +++ b/ham/gnuradio-fec/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.41 2022/09/11 12:51:54 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2022/10/09 07:56:10 adam 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 "../../ham/gnuradio-core/Makefile.common" +.include "../../ham/gnuradio-core/Nocore.mk" CMAKE_ARGS+= -DENABLE_DEFAULT=OFF CMAKE_ARGS+= -DENABLE_GR_FEC=ON @@ -13,5 +12,5 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../math/gsl/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../math/gsl/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-network/Makefile b/ham/gnuradio-network/Makefile index b9486b3cb77..574ebddc0fc 100644 --- a/ham/gnuradio-network/Makefile +++ b/ham/gnuradio-network/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2022/10/09 07:56:10 adam Exp $ PKGNAME= gnuradio-network-${VERSION} -PKGREVISION= 2 COMMENT= Network blocks for 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_NETWORK=ON @@ -13,4 +12,4 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-pdu/Makefile b/ham/gnuradio-pdu/Makefile index 0e7ac60a3f3..03388d6d381 100644 --- a/ham/gnuradio-pdu/Makefile +++ b/ham/gnuradio-pdu/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.1 2022/01/16 18:06:26 tnn Exp $ +# $NetBSD: Makefile,v 1.2 2022/10/09 07:56:10 adam Exp $ PKGNAME= gnuradio-pdu-${VERSION} COMMENT= Protocol Data Units for 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" # link to libgnuradio-fft.so.${PKGVERSON_NOREV} -.include "../../ham/gnuradio-core/buildlink3.mk" +.include "../../ham/gnuradio-core/buildlink3.mk" CMAKE_ARGS+= -DENABLE_DEFAULT=OFF CMAKE_ARGS+= -DENABLE_GR_PDU=ON @@ -14,4 +14,4 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-qtgui/Makefile b/ham/gnuradio-qtgui/Makefile index c29188fa5b3..4fd501c0aca 100644 --- a/ham/gnuradio-qtgui/Makefile +++ b/ham/gnuradio-qtgui/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.50 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2022/10/09 07:56:10 adam Exp $ PKGNAME= gnuradio-qtgui-${VERSION} -PKGREVISION= 2 COMMENT= Qt GUI module 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" #CONF_FILES+= ${EGDIR}/gr-qtgui.conf ${PKG_SYSCONFDIR}/gr-qtgui.conf @@ -20,7 +19,7 @@ pre-configure: Qt5Qwt6.pc Qt5Qwt6.pc: ln -sf ${QWT_DIR}/lib/pkgconfig/Qt5Qwt6.pc ${BUILDLINK_DIR}/lib/pkgconfig/Qt5Qwt6.pc -.include "../../x11/py-qt5/buildlink3.mk" -.include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../x11/qwt6-qt5/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../x11/py-qt5/buildlink3.mk" +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../x11/qwt6-qt5/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-soapy-sdr/Makefile b/ham/gnuradio-soapy-sdr/Makefile index 2e23b7986f3..ca9fc9e1ba2 100644 --- a/ham/gnuradio-soapy-sdr/Makefile +++ b/ham/gnuradio-soapy-sdr/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2022/10/09 07:56:10 adam Exp $ PKGNAME= gnuradio-soapy-sdr-${VERSION} -PKGREVISION= 2 COMMENT= GNU Radio bindings for SoapySDR -.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_SOAPY=ON @@ -13,5 +12,5 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../ham/soapy-sdr/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../ham/soapy-sdr/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-trellis/Makefile b/ham/gnuradio-trellis/Makefile index fb604e3a9b0..6594b78bc46 100644 --- a/ham/gnuradio-trellis/Makefile +++ b/ham/gnuradio-trellis/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.58 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2022/10/09 07:56:11 adam 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 "../../ham/gnuradio-core/Makefile.common" +.include "../../ham/gnuradio-core/Nocore.mk" CMAKE_ARGS+= -DENABLE_DEFAULT=OFF CMAKE_ARGS+= -DENABLE_GR_TRELLIS=ON @@ -17,4 +16,4 @@ DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto PLIST_MINUS+= companion digital -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-uhd/Makefile b/ham/gnuradio-uhd/Makefile index 3dececf6bc2..604f89cbcd9 100644 --- a/ham/gnuradio-uhd/Makefile +++ b/ham/gnuradio-uhd/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.41 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2022/10/09 07:56:11 adam Exp $ PKGNAME= gnuradio-uhd-${VERSION} -PKGREVISION= 2 COMMENT= Uhd-based encoding and decoding algorithms for 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_UHD=ON @@ -23,6 +22,5 @@ CMAKE_ARGS+= -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so CMAKE_ARGS+= -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp .endif -.include "../../ham/uhd/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" +.include "../../ham/uhd/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-utils/Makefile b/ham/gnuradio-utils/Makefile index 08eb4cf04eb..4be4df66532 100644 --- a/ham/gnuradio-utils/Makefile +++ b/ham/gnuradio-utils/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.44 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2022/10/09 07:56:11 adam Exp $ PKGNAME= gnuradio-utils-${VERSION} -PKGREVISION= 2 COMMENT= Utilities in GNU Radio .include "../../ham/gnuradio-core/Makefile.common" diff --git a/ham/gnuradio-utils/PLIST b/ham/gnuradio-utils/PLIST index 0b929fd871a..d72a361c717 100644 --- a/ham/gnuradio-utils/PLIST +++ b/ham/gnuradio-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2022/05/26 15:20:10 mef Exp $ +@comment $NetBSD: PLIST,v 1.8 2022/10/09 07:56:11 adam Exp $ bin/gr_modtool bin/gr_plot bin/gr_plot_const @@ -172,6 +172,12 @@ ${PYSITELIB}/gnuradio/pyqt_plot.py ${PYSITELIB}/gnuradio/pyqt_plot.pyc ${PYSITELIB}/gnuradio/pyqt_plot.pyo share/gnuradio/examples/modtool.conf +share/gnuradio/modtool/templates/gr-newmod/.conda/README.md +share/gnuradio/modtool/templates/gr-newmod/.conda/conda-forge.yml +share/gnuradio/modtool/templates/gr-newmod/.conda/recipe/bld.bat +share/gnuradio/modtool/templates/gr-newmod/.conda/recipe/build.sh +share/gnuradio/modtool/templates/gr-newmod/.conda/recipe/conda_build_config.yaml +share/gnuradio/modtool/templates/gr-newmod/.conda/recipe/meta.yaml share/gnuradio/modtool/templates/gr-newmod/CMakeLists.txt share/gnuradio/modtool/templates/gr-newmod/MANIFEST.md share/gnuradio/modtool/templates/gr-newmod/apps/CMakeLists.txt @@ -211,4 +217,3 @@ share/gnuradio/modtool/templates/gr-newmod/python/howto/bindings/bind_oot_file.p share/gnuradio/modtool/templates/gr-newmod/python/howto/bindings/docstrings/README.md share/gnuradio/modtool/templates/gr-newmod/python/howto/bindings/header_utils.py share/gnuradio/modtool/templates/gr-newmod/python/howto/bindings/python_bindings.cc - diff --git a/ham/gnuradio-video-sdl/Makefile b/ham/gnuradio-video-sdl/Makefile index d66956eef4e..38a7366f14e 100644 --- a/ham/gnuradio-video-sdl/Makefile +++ b/ham/gnuradio-video-sdl/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.55 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2022/10/09 07:56:11 adam Exp $ PKGNAME= gnuradio-video-sdl-${VERSION} -PKGREVISION= 2 COMMENT= SDL (Simple DirectMedia Layer) bindings for 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_VIDEO_SDL=ON @@ -14,6 +13,5 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../devel/SDL/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" +.include "../../devel/SDL/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-vocoder/Makefile b/ham/gnuradio-vocoder/Makefile index 7edeb086456..02b4c26ebfc 100644 --- a/ham/gnuradio-vocoder/Makefile +++ b/ham/gnuradio-vocoder/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.40 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2022/10/09 07:56:11 adam 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 "../../ham/gnuradio-core/Makefile.common" +.include "../../ham/gnuradio-core/Nocore.mk" CMAKE_ARGS+= -DENABLE_DEFAULT=OFF CMAKE_ARGS+= -DENABLE_GR_VOCODER=ON @@ -13,7 +12,6 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -.include "../../devel/libusb1/buildlink3.mk" -.include "../../ham/codec2/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" +.include "../../devel/libusb1/buildlink3.mk" +.include "../../ham/codec2/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-wavelet/Makefile b/ham/gnuradio-wavelet/Makefile index 518e57a7a81..bf69bf998eb 100644 --- a/ham/gnuradio-wavelet/Makefile +++ b/ham/gnuradio-wavelet/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.39 2022/09/11 12:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2022/10/09 07:56:11 adam Exp $ PKGNAME= gnuradio-wavelet-${VERSION} -PKGREVISION= 2 COMMENT= Wavelet transform 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_WAVELET=ON -.include "../../math/gsl/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../math/gsl/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-zeromq/Makefile b/ham/gnuradio-zeromq/Makefile index d1e768f82be..d6c7b899bc0 100644 --- a/ham/gnuradio-zeromq/Makefile +++ b/ham/gnuradio-zeromq/Makefile @@ -1,19 +1,10 @@ -# $NetBSD: Makefile,v 1.42 2022/09/11 12:51:56 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2022/10/09 07:56:11 adam Exp $ PKGNAME= gnuradio-zeromq-${VERSION} -PKGREVISION= 2 COMMENT= All of the zeromq blocks, utilities, and examples -# zmq.hpp: No such file or directory -# https://github.com/zeromq/cppzmq.git - -#GIT_REPOSITORIES= master -#GIT_REPO.master= https://github.com/zeromq/cppzmq.git -#GIT_MODULE.master= cppzmq -# for work around, the file is copied to files directory - -.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_ZEROMQ=ON @@ -22,8 +13,5 @@ CMAKE_ARGS+= -DENABLE_GRC=ON PLIST_MINUS+= companion -post-patch: - ${CP} ${PKGDIR}/files/zmq.hpp ${WRKSRC}/gr-zeromq/include/ - -.include "../../net/zeromq/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../net/cppzmq/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-zeromq/files/zmq.hpp b/ham/gnuradio-zeromq/files/zmq.hpp deleted file mode 100644 index b4629b0f23a..00000000000 --- a/ham/gnuradio-zeromq/files/zmq.hpp +++ /dev/null @@ -1,2713 +0,0 @@ -/* - Copyright (c) 2016-2017 ZeroMQ community - Copyright (c) 2009-2011 250bpm s.r.o. - Copyright (c) 2011 Botond Ballo - Copyright (c) 2007-2009 iMatix Corporation - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - IN THE SOFTWARE. -*/ - -#ifndef __ZMQ_HPP_INCLUDED__ -#define __ZMQ_HPP_INCLUDED__ - -#ifdef _WIN32 -#ifndef NOMINMAX -#define NOMINMAX -#endif -#endif - -// included here for _HAS_CXX* macros -#include <zmq.h> - -#if defined(_MSVC_LANG) -#define CPPZMQ_LANG _MSVC_LANG -#else -#define CPPZMQ_LANG __cplusplus -#endif -// overwrite if specific language macros indicate higher version -#if defined(_HAS_CXX14) && _HAS_CXX14 && CPPZMQ_LANG < 201402L -#undef CPPZMQ_LANG -#define CPPZMQ_LANG 201402L -#endif -#if defined(_HAS_CXX17) && _HAS_CXX17 && CPPZMQ_LANG < 201703L -#undef CPPZMQ_LANG -#define CPPZMQ_LANG 201703L -#endif - -// macros defined if has a specific standard or greater -#if CPPZMQ_LANG >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900) -#define ZMQ_CPP11 -#endif -#if CPPZMQ_LANG >= 201402L -#define ZMQ_CPP14 -#endif -#if CPPZMQ_LANG >= 201703L -#define ZMQ_CPP17 -#endif - -#if defined(ZMQ_CPP14) && !defined(_MSC_VER) -#define ZMQ_DEPRECATED(msg) [[deprecated(msg)]] -#elif defined(_MSC_VER) -#define ZMQ_DEPRECATED(msg) __declspec(deprecated(msg)) -#elif defined(__GNUC__) -#define ZMQ_DEPRECATED(msg) __attribute__((deprecated(msg))) -#else -#define ZMQ_DEPRECATED(msg) -#endif - -#if defined(ZMQ_CPP17) -#define ZMQ_NODISCARD [[nodiscard]] -#else -#define ZMQ_NODISCARD -#endif - -#if defined(ZMQ_CPP11) -#define ZMQ_NOTHROW noexcept -#define ZMQ_EXPLICIT explicit -#define ZMQ_OVERRIDE override -#define ZMQ_NULLPTR nullptr -#define ZMQ_CONSTEXPR_FN constexpr -#define ZMQ_CONSTEXPR_VAR constexpr -#define ZMQ_CPP11_DEPRECATED(msg) ZMQ_DEPRECATED(msg) -#else -#define ZMQ_NOTHROW throw() -#define ZMQ_EXPLICIT -#define ZMQ_OVERRIDE -#define ZMQ_NULLPTR 0 -#define ZMQ_CONSTEXPR_FN -#define ZMQ_CONSTEXPR_VAR const -#define ZMQ_CPP11_DEPRECATED(msg) -#endif -#if defined(ZMQ_CPP14) && (!defined(_MSC_VER) || _MSC_VER > 1900) -#define ZMQ_EXTENDED_CONSTEXPR -#endif -#if defined(ZMQ_CPP17) -#define ZMQ_INLINE_VAR inline -#define ZMQ_CONSTEXPR_IF constexpr -#else -#define ZMQ_INLINE_VAR -#define ZMQ_CONSTEXPR_IF -#endif - -#include <cassert> -#include <cstring> - -#include <algorithm> -#include <exception> -#include <iomanip> -#include <sstream> -#include <string> -#include <vector> -#ifdef ZMQ_CPP11 -#include <array> -#include <chrono> -#include <tuple> -#include <memory> -#endif - -#if defined(__has_include) && defined(ZMQ_CPP17) -#define CPPZMQ_HAS_INCLUDE_CPP17(X) __has_include(X) -#else -#define CPPZMQ_HAS_INCLUDE_CPP17(X) 0 -#endif - -#if CPPZMQ_HAS_INCLUDE_CPP17(<optional>) && !defined(CPPZMQ_HAS_OPTIONAL) -#define CPPZMQ_HAS_OPTIONAL 1 -#endif -#ifndef CPPZMQ_HAS_OPTIONAL -#define CPPZMQ_HAS_OPTIONAL 0 -#elif CPPZMQ_HAS_OPTIONAL -#include <optional> -#endif - -#if CPPZMQ_HAS_INCLUDE_CPP17(<string_view>) && !defined(CPPZMQ_HAS_STRING_VIEW) -#define CPPZMQ_HAS_STRING_VIEW 1 -#endif -#ifndef CPPZMQ_HAS_STRING_VIEW -#define CPPZMQ_HAS_STRING_VIEW 0 -#elif CPPZMQ_HAS_STRING_VIEW -#include <string_view> -#endif - -/* Version macros for compile-time API version detection */ -#define CPPZMQ_VERSION_MAJOR 4 -#define CPPZMQ_VERSION_MINOR 8 -#define CPPZMQ_VERSION_PATCH 1 - -#define CPPZMQ_VERSION \ - ZMQ_MAKE_VERSION(CPPZMQ_VERSION_MAJOR, CPPZMQ_VERSION_MINOR, \ - CPPZMQ_VERSION_PATCH) - -// Detect whether the compiler supports C++11 rvalue references. -#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) \ - && defined(__GXX_EXPERIMENTAL_CXX0X__)) -#define ZMQ_HAS_RVALUE_REFS -#define ZMQ_DELETED_FUNCTION = delete -#elif defined(__clang__) -#if __has_feature(cxx_rvalue_references) -#define ZMQ_HAS_RVALUE_REFS -#endif - -#if __has_feature(cxx_deleted_functions) -#define ZMQ_DELETED_FUNCTION = delete -#else -#define ZMQ_DELETED_FUNCTION -#endif -#elif defined(_MSC_VER) && (_MSC_VER >= 1900) -#define ZMQ_HAS_RVALUE_REFS -#define ZMQ_DELETED_FUNCTION = delete -#elif defined(_MSC_VER) && (_MSC_VER >= 1600) -#define ZMQ_HAS_RVALUE_REFS -#define ZMQ_DELETED_FUNCTION -#else -#define ZMQ_DELETED_FUNCTION -#endif - -#if defined(ZMQ_CPP11) && !defined(__llvm__) && !defined(__INTEL_COMPILER) \ - && defined(__GNUC__) && __GNUC__ < 5 -#define ZMQ_CPP11_PARTIAL -#elif defined(__GLIBCXX__) && __GLIBCXX__ < 20160805 -//the date here is the last date of gcc 4.9.4, which -// effectively means libstdc++ from gcc 5.5 and higher won't trigger this branch -#define ZMQ_CPP11_PARTIAL -#endif - -#ifdef ZMQ_CPP11 -#ifdef ZMQ_CPP11_PARTIAL -#define ZMQ_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T) -#else -#include <type_traits> -#define ZMQ_IS_TRIVIALLY_COPYABLE(T) std::is_trivially_copyable<T>::value -#endif -#endif - -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 3, 0) -#define ZMQ_NEW_MONITOR_EVENT_LAYOUT -#endif - -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0) -#define ZMQ_HAS_PROXY_STEERABLE -/* Socket event data */ -typedef struct -{ - uint16_t event; // id of the event as bitfield - int32_t value; // value is either error code, fd or reconnect interval -} zmq_event_t; -#endif - -// Avoid using deprecated message receive function when possible -#if ZMQ_VERSION < ZMQ_MAKE_VERSION(3, 2, 0) -#define zmq_msg_recv(msg, socket, flags) zmq_recvmsg(socket, msg, flags) -#endif - - -// In order to prevent unused variable warnings when building in non-debug -// mode use this macro to make assertions. -#ifndef NDEBUG -#define ZMQ_ASSERT(expression) assert(expression) -#else -#define ZMQ_ASSERT(expression) (void) (expression) -#endif - -namespace zmq -{ -#ifdef ZMQ_CPP11 -namespace detail -{ -namespace ranges -{ -using std::begin; -using std::end; -template<class T> auto begin(T &&r) -> decltype(begin(std::forward<T>(r))) -{ - return begin(std::forward<T>(r)); -} -template<class T> auto end(T &&r) -> decltype(end(std::forward<T>(r))) -{ - return end(std::forward<T>(r)); -} -} // namespace ranges - -template<class T> using void_t = void; - -template<class Iter> -using iter_value_t = typename std::iterator_traits<Iter>::value_type; - -template<class Range> -using range_iter_t = decltype( - ranges::begin(std::declval<typename std::remove_reference<Range>::type &>())); - -template<class Range> using range_value_t = iter_value_t<range_iter_t<Range>>; - -template<class T, class = void> struct is_range : std::false_type -{ -}; - -template<class T> -struct is_range< - T, - void_t<decltype( - ranges::begin(std::declval<typename std::remove_reference<T>::type &>()) - == ranges::end(std::declval<typename std::remove_reference<T>::type &>()))>> - : std::true_type -{ -}; - -} // namespace detail -#endif - -typedef zmq_free_fn free_fn; -typedef zmq_pollitem_t pollitem_t; - -// duplicate definition from libzmq 4.3.3 -#if defined _WIN32 -#if defined _WIN64 -typedef unsigned __int64 fd_t; -#else -typedef unsigned int fd_t; -#endif -#else -typedef int fd_t; -#endif - -class error_t : public std::exception -{ - public: - error_t() ZMQ_NOTHROW : errnum(zmq_errno()) {} - explicit error_t(int err) ZMQ_NOTHROW : errnum(err) {} - virtual const char *what() const ZMQ_NOTHROW ZMQ_OVERRIDE - { - return zmq_strerror(errnum); - } - int num() const ZMQ_NOTHROW { return errnum; } - - private: - int errnum; -}; - -namespace detail { -inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_) -{ - int rc = zmq_poll(items_, static_cast<int>(nitems_), timeout_); - if (rc < 0) - throw error_t(); - return rc; -} -} - -#ifdef ZMQ_CPP11 -ZMQ_DEPRECATED("from 4.8.0, use poll taking std::chrono::duration instead of long") -inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_) -#else -inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_ = -1) -#endif -{ - return detail::poll(items_, nitems_, timeout_); -} - -ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items") -inline int poll(zmq_pollitem_t const *items_, size_t nitems_, long timeout_ = -1) -{ - return detail::poll(const_cast<zmq_pollitem_t *>(items_), nitems_, timeout_); -} - -#ifdef ZMQ_CPP11 -ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items") -inline int -poll(zmq_pollitem_t const *items, size_t nitems, std::chrono::milliseconds timeout) -{ - return detail::poll(const_cast<zmq_pollitem_t *>(items), nitems, - static_cast<long>(timeout.count())); -} - -ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items") -inline int poll(std::vector<zmq_pollitem_t> const &items, - std::chrono::milliseconds timeout) -{ - return detail::poll(const_cast<zmq_pollitem_t *>(items.data()), items.size(), - static_cast<long>(timeout.count())); -} - -ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items") -inline int poll(std::vector<zmq_pollitem_t> const &items, long timeout_ = -1) -{ - return detail::poll(const_cast<zmq_pollitem_t *>(items.data()), items.size(), timeout_); -} - -inline int -poll(zmq_pollitem_t *items, size_t nitems, std::chrono::milliseconds timeout = std::chrono::milliseconds{-1}) -{ - return detail::poll(items, nitems, static_cast<long>(timeout.count())); -} - -inline int poll(std::vector<zmq_pollitem_t> &items, - std::chrono::milliseconds timeout = std::chrono::milliseconds{-1}) -{ - return detail::poll(items.data(), items.size(), static_cast<long>(timeout.count())); -} - -ZMQ_DEPRECATED("from 4.3.1, use poll taking std::chrono::duration instead of long") -inline int poll(std::vector<zmq_pollitem_t> &items, long timeout_) -{ - return detail::poll(items.data(), items.size(), timeout_); -} - -template<std::size_t SIZE> -inline int poll(std::array<zmq_pollitem_t, SIZE> &items, - std::chrono::milliseconds timeout = std::chrono::milliseconds{-1}) -{ - return detail::poll(items.data(), items.size(), static_cast<long>(timeout.count())); -} -#endif - - -inline void version(int *major_, int *minor_, int *patch_) -{ - zmq_version(major_, minor_, patch_); -} - -#ifdef ZMQ_CPP11 -inline std::tuple<int, int, int> version() -{ - std::tuple<int, int, int> v; - zmq_version(&std::get<0>(v), &std::get<1>(v), &std::get<2>(v)); - return v; -} - -#if !defined(ZMQ_CPP11_PARTIAL) -namespace detail -{ -template<class T> struct is_char_type -{ - // true if character type for string literals in C++11 - static constexpr bool value = - std::is_same<T, char>::value || std::is_same<T, wchar_t>::value - || std::is_same<T, char16_t>::value || std::is_same<T, char32_t>::value; -}; -} -#endif - -#endif - -class message_t -{ - public: - message_t() ZMQ_NOTHROW - { - int rc = zmq_msg_init(&msg); - ZMQ_ASSERT(rc == 0); - } - - explicit message_t(size_t size_) - { - int rc = zmq_msg_init_size(&msg, size_); - if (rc != 0) - throw error_t(); - } - - template<class ForwardIter> message_t(ForwardIter first, ForwardIter last) - { - typedef typename std::iterator_traits<ForwardIter>::value_type value_t; - - assert(std::distance(first, last) >= 0); - size_t const size_ = - static_cast<size_t>(std::distance(first, last)) * sizeof(value_t); - int const rc = zmq_msg_init_size(&msg, size_); - if (rc != 0) - throw error_t(); - std::copy(first, last, data<value_t>()); - } - - message_t(const void *data_, size_t size_) - { - int rc = zmq_msg_init_size(&msg, size_); - if (rc != 0) - throw error_t(); - if (size_) { - // this constructor allows (nullptr, 0), - // memcpy with a null pointer is UB - memcpy(data(), data_, size_); - } - } - - message_t(void *data_, size_t size_, free_fn *ffn_, void *hint_ = ZMQ_NULLPTR) - { - int rc = zmq_msg_init_data(&msg, data_, size_, ffn_, hint_); - if (rc != 0) - throw error_t(); - } - - // overload set of string-like types and generic containers -#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL) - // NOTE this constructor will include the null terminator - // when called with a string literal. - // An overload taking const char* can not be added because - // it would be preferred over this function and break compatiblity. - template< - class Char, - size_t N, - typename = typename std::enable_if<detail::is_char_type<Char>::value>::type> - ZMQ_DEPRECATED("from 4.7.0, use constructors taking iterators, (pointer, size) " - "or strings instead") - explicit message_t(const Char (&data)[N]) : - message_t(detail::ranges::begin(data), detail::ranges::end(data)) - { - } - - template<class Range, - typename = typename std::enable_if< - detail::is_range<Range>::value - && ZMQ_IS_TRIVIALLY_COPYABLE(detail::range_value_t<Range>) - && !detail::is_char_type<detail::range_value_t<Range>>::value - && !std::is_same<Range, message_t>::value>::type> - explicit message_t(const Range &rng) : - message_t(detail::ranges::begin(rng), detail::ranges::end(rng)) - { - } - - explicit message_t(const std::string &str) : message_t(str.data(), str.size()) {} - -#if CPPZMQ_HAS_STRING_VIEW - explicit message_t(std::string_view str) : message_t(str.data(), str.size()) {} -#endif - -#endif - -#ifdef ZMQ_HAS_RVALUE_REFS - message_t(message_t &&rhs) ZMQ_NOTHROW : msg(rhs.msg) - { - int rc = zmq_msg_init(&rhs.msg); - ZMQ_ASSERT(rc == 0); - } - - message_t &operator=(message_t &&rhs) ZMQ_NOTHROW - { - std::swap(msg, rhs.msg); - return *this; - } -#endif - - ~message_t() ZMQ_NOTHROW - { - int rc = zmq_msg_close(&msg); - ZMQ_ASSERT(rc == 0); - } - - void rebuild() - { - int rc = zmq_msg_close(&msg); - if (rc != 0) - throw error_t(); - rc = zmq_msg_init(&msg); - ZMQ_ASSERT(rc == 0); - } - - void rebuild(size_t size_) - { - int rc = zmq_msg_close(&msg); - if (rc != 0) - throw error_t(); - rc = zmq_msg_init_size(&msg, size_); - if (rc != 0) - throw error_t(); - } - - void rebuild(const void *data_, size_t size_) - { - int rc = zmq_msg_close(&msg); - if (rc != 0) - throw error_t(); - rc = zmq_msg_init_size(&msg, size_); - if (rc != 0) - throw error_t(); - memcpy(data(), data_, size_); - } - - void rebuild(void *data_, size_t size_, free_fn *ffn_, void *hint_ = ZMQ_NULLPTR) - { - int rc = zmq_msg_close(&msg); - if (rc != 0) - throw error_t(); - rc = zmq_msg_init_data(&msg, data_, size_, ffn_, hint_); - if (rc != 0) - throw error_t(); - } - - ZMQ_DEPRECATED("from 4.3.1, use move taking non-const reference instead") - void move(message_t const *msg_) - { - int rc = zmq_msg_move(&msg, const_cast<zmq_msg_t *>(msg_->handle())); - if (rc != 0) - throw error_t(); - } - - void move(message_t &msg_) - { - int rc = zmq_msg_move(&msg, msg_.handle()); - if (rc != 0) - throw error_t(); - } - - ZMQ_DEPRECATED("from 4.3.1, use copy taking non-const reference instead") - void copy(message_t const *msg_) - { - int rc = zmq_msg_copy(&msg, const_cast<zmq_msg_t *>(msg_->handle())); - if (rc != 0) - throw error_t(); - } - - void copy(message_t &msg_) - { - int rc = zmq_msg_copy(&msg, msg_.handle()); - if (rc != 0) - throw error_t(); - } - - bool more() const ZMQ_NOTHROW - { - int rc = zmq_msg_more(const_cast<zmq_msg_t *>(&msg)); - return rc != 0; - } - - void *data() ZMQ_NOTHROW { return zmq_msg_data(&msg); } - - const void *data() const ZMQ_NOTHROW - { - return zmq_msg_data(const_cast<zmq_msg_t *>(&msg)); - } - - size_t size() const ZMQ_NOTHROW - { - return zmq_msg_size(const_cast<zmq_msg_t *>(&msg)); - } - - ZMQ_NODISCARD bool empty() const ZMQ_NOTHROW { return size() == 0u; } - - template<typename T> T *data() ZMQ_NOTHROW { return static_cast<T *>(data()); } - - template<typename T> T const *data() const ZMQ_NOTHROW - { - return static_cast<T const *>(data()); - } - - ZMQ_DEPRECATED("from 4.3.0, use operator== instead") - bool equal(const message_t *other) const ZMQ_NOTHROW { return *this == *other; } - - bool operator==(const message_t &other) const ZMQ_NOTHROW - { - const size_t my_size = size(); - return my_size == other.size() && 0 == memcmp(data(), other.data(), my_size); - } - - bool operator!=(const message_t &other) const ZMQ_NOTHROW - { - return !(*this == other); - } - -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 2, 0) - int get(int property_) - { - int value = zmq_msg_get(&msg, property_); - if (value == -1) - throw error_t(); - return value; - } -#endif - -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0) - const char *gets(const char *property_) - { - const char *value = zmq_msg_gets(&msg, property_); - if (value == ZMQ_NULLPTR) - throw error_t(); - return value; - } -#endif - -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0) - uint32_t routing_id() const - { - return zmq_msg_routing_id(const_cast<zmq_msg_t *>(&msg)); - } - - void set_routing_id(uint32_t routing_id) - { - int rc = zmq_msg_set_routing_id(&msg, routing_id); - if (rc != 0) - throw error_t(); - } - - const char *group() const - { - return zmq_msg_group(const_cast<zmq_msg_t *>(&msg)); - } - - void set_group(const char *group) - { - int rc = zmq_msg_set_group(&msg, group); - if (rc != 0) - throw error_t(); - } -#endif - - // interpret message content as a string - std::string to_string() const - { - return std::string(static_cast<const char *>(data()), size()); - } -#if CPPZMQ_HAS_STRING_VIEW - // interpret message content as a string - std::string_view to_string_view() const noexcept - { - return std::string_view(static_cast<const char *>(data()), size()); - } -#endif - - /** Dump content to string for debugging. - * Ascii chars are readable, the rest is printed as hex. - * Probably ridiculously slow. - * Use to_string() or to_string_view() for - * interpreting the message as a string. - */ - std::string str() const - { - // Partly mutuated from the same method in zmq::multipart_t - std::stringstream os; - - const unsigned char *msg_data = this->data<unsigned char>(); - unsigned char byte; - size_t size = this->size(); - int is_ascii[2] = {0, 0}; - - os << "zmq::message_t [size " << std::dec << std::setw(3) - << std::setfill('0') << size << "] ("; - // Totally arbitrary - if (size >= 1000) { - os << "... too big to print)"; - } else { - while (size--) { - byte = *msg_data++; - - is_ascii[1] = (byte >= 32 && byte < 127); - if (is_ascii[1] != is_ascii[0]) - os << " "; // Separate text/non text - - if (is_ascii[1]) { - os << byte; - } else { - os << std::hex << std::uppercase << std::setw(2) - << std::setfill('0') << static_cast<short>(byte); - } - is_ascii[0] = is_ascii[1]; - } - os << ")"; - } - return os.str(); - } - - void swap(message_t &other) ZMQ_NOTHROW - { - // this assumes zmq::msg_t from libzmq is trivially relocatable - std::swap(msg, other.msg); - } - - ZMQ_NODISCARD zmq_msg_t *handle() ZMQ_NOTHROW { return &msg; } - ZMQ_NODISCARD const zmq_msg_t *handle() const ZMQ_NOTHROW { return &msg; } - - private: - // The underlying message - zmq_msg_t msg; - - // Disable implicit message copying, so that users won't use shared - // messages (less efficient) without being aware of the fact. - message_t(const message_t &) ZMQ_DELETED_FUNCTION; - void operator=(const message_t &) ZMQ_DELETED_FUNCTION; -}; - -inline void swap(message_t &a, message_t &b) ZMQ_NOTHROW -{ - a.swap(b); -} - -#ifdef ZMQ_CPP11 -enum class ctxopt -{ -#ifdef ZMQ_BLOCKY - blocky = ZMQ_BLOCKY, -#endif -#ifdef ZMQ_IO_THREADS - io_threads = ZMQ_IO_THREADS, -#endif -#ifdef ZMQ_THREAD_SCHED_POLICY - thread_sched_policy = ZMQ_THREAD_SCHED_POLICY, -#endif -#ifdef ZMQ_THREAD_PRIORITY - thread_priority = ZMQ_THREAD_PRIORITY, -#endif -#ifdef ZMQ_THREAD_AFFINITY_CPU_ADD - thread_affinity_cpu_add = ZMQ_THREAD_AFFINITY_CPU_ADD, -#endif -#ifdef ZMQ_THREAD_AFFINITY_CPU_REMOVE - thread_affinity_cpu_remove = ZMQ_THREAD_AFFINITY_CPU_REMOVE, -#endif -#ifdef ZMQ_THREAD_NAME_PREFIX - thread_name_prefix = ZMQ_THREAD_NAME_PREFIX, -#endif -#ifdef ZMQ_MAX_MSGSZ - max_msgsz = ZMQ_MAX_MSGSZ, -#endif -#ifdef ZMQ_ZERO_COPY_RECV - zero_copy_recv = ZMQ_ZERO_COPY_RECV, -#endif -#ifdef ZMQ_MAX_SOCKETS - max_sockets = ZMQ_MAX_SOCKETS, -#endif -#ifdef ZMQ_SOCKET_LIMIT - socket_limit = ZMQ_SOCKET_LIMIT, -#endif -#ifdef ZMQ_IPV6 - ipv6 = ZMQ_IPV6, -#endif -#ifdef ZMQ_MSG_T_SIZE - msg_t_size = ZMQ_MSG_T_SIZE -#endif -}; -#endif - -class context_t -{ - public: - context_t() - { - ptr = zmq_ctx_new(); - if (ptr == ZMQ_NULLPTR) - throw error_t(); - } - - - explicit context_t(int io_threads_, int max_sockets_ = ZMQ_MAX_SOCKETS_DFLT) - { - ptr = zmq_ctx_new(); - if (ptr == ZMQ_NULLPTR) - throw error_t(); - - int rc = zmq_ctx_set(ptr, ZMQ_IO_THREADS, io_threads_); - ZMQ_ASSERT(rc == 0); - - rc = zmq_ctx_set(ptr, ZMQ_MAX_SOCKETS, max_sockets_); - ZMQ_ASSERT(rc == 0); - } - -#ifdef ZMQ_HAS_RVALUE_REFS - context_t(context_t &&rhs) ZMQ_NOTHROW : ptr(rhs.ptr) { rhs.ptr = ZMQ_NULLPTR; } - context_t &operator=(context_t &&rhs) ZMQ_NOTHROW - { - close(); - std::swap(ptr, rhs.ptr); - return *this; - } -#endif - - ~context_t() ZMQ_NOTHROW { close(); } - - ZMQ_CPP11_DEPRECATED("from 4.7.0, use set taking zmq::ctxopt instead") - int setctxopt(int option_, int optval_) - { - int rc = zmq_ctx_set(ptr, option_, optval_); - ZMQ_ASSERT(rc == 0); - return rc; - } - - ZMQ_CPP11_DEPRECATED("from 4.7.0, use get taking zmq::ctxopt instead") - int getctxopt(int option_) { return zmq_ctx_get(ptr, option_); } - -#ifdef ZMQ_CPP11 - void set(ctxopt option, int optval) - { - int rc = zmq_ctx_set(ptr, static_cast<int>(option), optval); - if (rc == -1) - throw error_t(); - } - - ZMQ_NODISCARD int get(ctxopt option) - { - int rc = zmq_ctx_get(ptr, static_cast<int>(option)); - // some options have a default value of -1 - // which is unfortunate, and may result in errors - // that don't make sense - if (rc == -1) - throw error_t(); - return rc; - } -#endif - - // Terminates context (see also shutdown()). - void close() ZMQ_NOTHROW - { - if (ptr == ZMQ_NULLPTR) - return; - - int rc; - do { - rc = zmq_ctx_term(ptr); - } while (rc == -1 && errno == EINTR); - - ZMQ_ASSERT(rc == 0); - ptr = ZMQ_NULLPTR; - } - - // Shutdown context in preparation for termination (close()). - // Causes all blocking socket operations and any further - // socket operations to return with ETERM. - void shutdown() ZMQ_NOTHROW - { - if (ptr == ZMQ_NULLPTR) - return; - int rc = zmq_ctx_shutdown(ptr); - ZMQ_ASSERT(rc == 0); - } - - // Be careful with this, it's probably only useful for - // using the C api together with an existing C++ api. - // Normally you should never need to use this. - ZMQ_EXPLICIT operator void *() ZMQ_NOTHROW { return ptr; } - - ZMQ_EXPLICIT operator void const *() const ZMQ_NOTHROW { return ptr; } - - ZMQ_NODISCARD void *handle() ZMQ_NOTHROW { return ptr; } - - ZMQ_DEPRECATED("from 4.7.0, use handle() != nullptr instead") - operator bool() const ZMQ_NOTHROW { return ptr != ZMQ_NULLPTR; } - - void swap(context_t &other) ZMQ_NOTHROW { std::swap(ptr, other.ptr); } - - private: - void *ptr; - - context_t(const context_t &) ZMQ_DELETED_FUNCTION; - void operator=(const context_t &) ZMQ_DELETED_FUNCTION; -}; - -inline void swap(context_t &a, context_t &b) ZMQ_NOTHROW -{ - a.swap(b); -} - -#ifdef ZMQ_CPP11 - -struct recv_buffer_size -{ - size_t size; // number of bytes written to buffer - size_t untruncated_size; // untruncated message size in bytes - - ZMQ_NODISCARD bool truncated() const noexcept - { - return size != untruncated_size; - } -}; - -#if CPPZMQ_HAS_OPTIONAL - -using send_result_t = std::optional<size_t>; -using recv_result_t = std::optional<size_t>; -using recv_buffer_result_t = std::optional<recv_buffer_size>; - -#else - -namespace detail -{ -// A C++11 type emulating the most basic -// operations of std::optional for trivial types -template<class T> class trivial_optional -{ - public: - static_assert(std::is_trivial<T>::value, "T must be trivial"); - using value_type = T; - - trivial_optional() = default; - trivial_optional(T value) noexcept : _value(value), _has_value(true) {} - - const T *operator->() const noexcept - { - assert(_has_value); - return &_value; - } - T *operator->() noexcept - { - assert(_has_value); - return &_value; - } - - const T &operator*() const noexcept - { - assert(_has_value); - return _value; - } - T &operator*() noexcept - { - assert(_has_value); - return _value; - } - - T &value() - { - if (!_has_value) - throw std::exception(); - return _value; - } - const T &value() const - { - if (!_has_value) - throw std::exception(); - return _value; - } - - explicit operator bool() const noexcept { return _has_value; } - bool has_value() const noexcept { return _has_value; } - - private: - T _value{}; - bool _has_value{false}; -}; -} // namespace detail - -using send_result_t = detail::trivial_optional<size_t>; -using recv_result_t = detail::trivial_optional<size_t>; -using recv_buffer_result_t = detail::trivial_optional<recv_buffer_size>; - -#endif - -namespace detail -{ -template<class T> constexpr T enum_bit_or(T a, T b) noexcept -{ - static_assert(std::is_enum<T>::value, "must be enum"); - using U = typename std::underlying_type<T>::type; - return static_cast<T>(static_cast<U>(a) | static_cast<U>(b)); -} -template<class T> constexpr T enum_bit_and(T a, T b) noexcept -{ - static_assert(std::is_enum<T>::value, "must be enum"); - using U = typename std::underlying_type<T>::type; - return static_cast<T>(static_cast<U>(a) & static_cast<U>(b)); -} -template<class T> constexpr T enum_bit_xor(T a, T b) noexcept -{ - static_assert(std::is_enum<T>::value, "must be enum"); - using U = typename std::underlying_type<T>::type; - return static_cast<T>(static_cast<U>(a) ^ static_cast<U>(b)); -} -template<class T> constexpr T enum_bit_not(T a) noexcept -{ - static_assert(std::is_enum<T>::value, "must be enum"); - using U = typename std::underlying_type<T>::type; - return static_cast<T>(~static_cast<U>(a)); -} -} // namespace detail - -// partially satisfies named requirement BitmaskType -enum class send_flags : int -{ - none = 0, - dontwait = ZMQ_DONTWAIT, - sndmore = ZMQ_SNDMORE -}; - -constexpr send_flags operator|(send_flags a, send_flags b) noexcept -{ - return detail::enum_bit_or(a, b); -} -constexpr send_flags operator&(send_flags a, send_flags b) noexcept -{ - return detail::enum_bit_and(a, b); -} -constexpr send_flags operator^(send_flags a, send_flags b) noexcept -{ - return detail::enum_bit_xor(a, b); -} -constexpr send_flags operator~(send_flags a) noexcept -{ - return detail::enum_bit_not(a); -} - -// partially satisfies named requirement BitmaskType -enum class recv_flags : int -{ - none = 0, - dontwait = ZMQ_DONTWAIT -}; - -constexpr recv_flags operator|(recv_flags a, recv_flags b) noexcept -{ - return detail::enum_bit_or(a, b); -} -constexpr recv_flags operator&(recv_flags a, recv_flags b) noexcept -{ - return detail::enum_bit_and(a, b); -} -constexpr recv_flags operator^(recv_flags a, recv_flags b) noexcept -{ - return detail::enum_bit_xor(a, b); -} -constexpr recv_flags operator~(recv_flags a) noexcept -{ - return detail::enum_bit_not(a); -} - - -// mutable_buffer, const_buffer and buffer are based on -// the Networking TS specification, draft: -// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/n4771.pdf - -class mutable_buffer -{ - public: - constexpr mutable_buffer() noexcept : _data(nullptr), _size(0) {} - constexpr mutable_buffer(void *p, size_t n) noexcept : _data(p), _size(n) - { -#ifdef ZMQ_EXTENDED_CONSTEXPR - assert(p != nullptr || n == 0); -#endif - } - - constexpr void *data() const noexcept { return _data; } - constexpr size_t size() const noexcept { return _size; } - mutable_buffer &operator+=(size_t n) noexcept - { - // (std::min) is a workaround for when a min macro is defined - const auto shift = (std::min)(n, _size); - _data = static_cast<char *>(_data) + shift; - _size -= shift; - return *this; - } - - private: - void *_data; - size_t _size; -}; - -inline mutable_buffer operator+(const mutable_buffer &mb, size_t n) noexcept -{ - return mutable_buffer(static_cast<char *>(mb.data()) + (std::min)(n, mb.size()), - mb.size() - (std::min)(n, mb.size())); -} -inline mutable_buffer operator+(size_t n, const mutable_buffer &mb) noexcept -{ - return mb + n; -} - -class const_buffer -{ - public: - constexpr const_buffer() noexcept : _data(nullptr), _size(0) {} - constexpr const_buffer(const void *p, size_t n) noexcept : _data(p), _size(n) - { -#ifdef ZMQ_EXTENDED_CONSTEXPR - assert(p != nullptr || n == 0); -#endif - } - constexpr const_buffer(const mutable_buffer &mb) noexcept : - _data(mb.data()), _size(mb.size()) - { - } - - constexpr const void *data() const noexcept { return _data; } - constexpr size_t size() const noexcept { return _size; } - const_buffer &operator+=(size_t n) noexcept - { - const auto shift = (std::min)(n, _size); - _data = static_cast<const char *>(_data) + shift; - _size -= shift; - return *this; - } - - private: - const void *_data; - size_t _size; -}; - -inline const_buffer operator+(const const_buffer &cb, size_t n) noexcept -{ - return const_buffer(static_cast<const char *>(cb.data()) - + (std::min)(n, cb.size()), - cb.size() - (std::min)(n, cb.size())); -} -inline const_buffer operator+(size_t n, const const_buffer &cb) noexcept -{ - return cb + n; -} - -// buffer creation - -constexpr mutable_buffer buffer(void *p, size_t n) noexcept -{ - return mutable_buffer(p, n); -} -constexpr const_buffer buffer(const void *p, size_t n) noexcept -{ - return const_buffer(p, n); -} -constexpr mutable_buffer buffer(const mutable_buffer &mb) noexcept -{ - return mb; -} -inline mutable_buffer buffer(const mutable_buffer &mb, size_t n) noexcept -{ - return mutable_buffer(mb.data(), (std::min)(mb.size(), n)); -} -constexpr const_buffer buffer(const const_buffer &cb) noexcept -{ - return cb; -} -inline const_buffer buffer(const const_buffer &cb, size_t n) noexcept -{ - return const_buffer(cb.data(), (std::min)(cb.size(), n)); -} - -namespace detail -{ -template<class T> struct is_buffer -{ - static constexpr bool value = - std::is_same<T, const_buffer>::value || std::is_same<T, mutable_buffer>::value; -}; - -template<class T> struct is_pod_like -{ - // NOTE: The networking draft N4771 section 16.11 requires - // T in the buffer functions below to be - // trivially copyable OR standard layout. - // Here we decide to be conservative and require both. - static constexpr bool value = - ZMQ_IS_TRIVIALLY_COPYABLE(T) && std::is_standard_layout<T>::value; -}; - -template<class C> constexpr auto seq_size(const C &c) noexcept -> decltype(c.size()) -{ - return c.size(); -} -template<class T, size_t N> -constexpr size_t seq_size(const T (&/*array*/)[N]) noexcept -{ - return N; -} - -template<class Seq> -auto buffer_contiguous_sequence(Seq &&seq) noexcept - -> decltype(buffer(std::addressof(*std::begin(seq)), size_t{})) -{ - using T = typename std::remove_cv< - typename std::remove_reference<decltype(*std::begin(seq))>::type>::type; - static_assert(detail::is_pod_like<T>::value, "T must be POD"); - - const auto size = seq_size(seq); - return buffer(size != 0u ? std::addressof(*std::begin(seq)) : nullptr, - size * sizeof(T)); -} -template<class Seq> -auto buffer_contiguous_sequence(Seq &&seq, size_t n_bytes) noexcept - -> decltype(buffer_contiguous_sequence(seq)) -{ - using T = typename std::remove_cv< - typename std::remove_reference<decltype(*std::begin(seq))>::type>::type; - static_assert(detail::is_pod_like<T>::value, "T must be POD"); - - const auto size = seq_size(seq); - return buffer(size != 0u ? std::addressof(*std::begin(seq)) : nullptr, - (std::min)(size * sizeof(T), n_bytes)); -} - -} // namespace detail - -// C array -template<class T, size_t N> mutable_buffer buffer(T (&data)[N]) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, size_t N> -mutable_buffer buffer(T (&data)[N], size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -template<class T, size_t N> const_buffer buffer(const T (&data)[N]) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, size_t N> -const_buffer buffer(const T (&data)[N], size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -// std::array -template<class T, size_t N> mutable_buffer buffer(std::array<T, N> &data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, size_t N> -mutable_buffer buffer(std::array<T, N> &data, size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -template<class T, size_t N> -const_buffer buffer(std::array<const T, N> &data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, size_t N> -const_buffer buffer(std::array<const T, N> &data, size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -template<class T, size_t N> -const_buffer buffer(const std::array<T, N> &data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, size_t N> -const_buffer buffer(const std::array<T, N> &data, size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -// std::vector -template<class T, class Allocator> -mutable_buffer buffer(std::vector<T, Allocator> &data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, class Allocator> -mutable_buffer buffer(std::vector<T, Allocator> &data, size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -template<class T, class Allocator> -const_buffer buffer(const std::vector<T, Allocator> &data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, class Allocator> -const_buffer buffer(const std::vector<T, Allocator> &data, size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -// std::basic_string -template<class T, class Traits, class Allocator> -mutable_buffer buffer(std::basic_string<T, Traits, Allocator> &data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, class Traits, class Allocator> -mutable_buffer buffer(std::basic_string<T, Traits, Allocator> &data, - size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -template<class T, class Traits, class Allocator> -const_buffer buffer(const std::basic_string<T, Traits, Allocator> &data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, class Traits, class Allocator> -const_buffer buffer(const std::basic_string<T, Traits, Allocator> &data, - size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} - -#if CPPZMQ_HAS_STRING_VIEW -// std::basic_string_view -template<class T, class Traits> -const_buffer buffer(std::basic_string_view<T, Traits> data) noexcept -{ - return detail::buffer_contiguous_sequence(data); -} -template<class T, class Traits> -const_buffer buffer(std::basic_string_view<T, Traits> data, size_t n_bytes) noexcept -{ - return detail::buffer_contiguous_sequence(data, n_bytes); -} -#endif - -// Buffer for a string literal (null terminated) -// where the buffer size excludes the terminating character. -// Equivalent to zmq::buffer(std::string_view("...")). -template<class Char, size_t N> -constexpr const_buffer str_buffer(const Char (&data)[N]) noexcept -{ - static_assert(detail::is_pod_like<Char>::value, "Char must be POD"); -#ifdef ZMQ_EXTENDED_CONSTEXPR - assert(data[N - 1] == Char{0}); -#endif - return const_buffer(static_cast<const Char *>(data), (N - 1) * sizeof(Char)); -} - -namespace literals -{ -constexpr const_buffer operator"" _zbuf(const char *str, size_t len) noexcept -{ - return const_buffer(str, len * sizeof(char)); -} -constexpr const_buffer operator"" _zbuf(const wchar_t *str, size_t len) noexcept -{ - return const_buffer(str, len * sizeof(wchar_t)); -} -constexpr const_buffer operator"" _zbuf(const char16_t *str, size_t len) noexcept -{ - return const_buffer(str, len * sizeof(char16_t)); -} -constexpr const_buffer operator"" _zbuf(const char32_t *str, size_t len) noexcept -{ - return const_buffer(str, len * sizeof(char32_t)); -} -} - -#ifdef ZMQ_CPP11 -enum class socket_type : int -{ - req = ZMQ_REQ, - rep = ZMQ_REP, - dealer = ZMQ_DEALER, - router = ZMQ_ROUTER, - pub = ZMQ_PUB, - sub = ZMQ_SUB, - xpub = ZMQ_XPUB, - xsub = ZMQ_XSUB, - push = ZMQ_PUSH, - pull = ZMQ_PULL, -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0) - server = ZMQ_SERVER, - client = ZMQ_CLIENT, - radio = ZMQ_RADIO, - dish = ZMQ_DISH, - gather = ZMQ_GATHER, - scatter = ZMQ_SCATTER, - dgram = ZMQ_DGRAM, -#endif -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3) - peer = ZMQ_PEER, - channel = ZMQ_CHANNEL, -#endif -#if ZMQ_VERSION_MAJOR >= 4 - stream = ZMQ_STREAM, -#endif - pair = ZMQ_PAIR -}; -#endif - -namespace sockopt -{ -// There are two types of options, -// integral type with known compiler time size (int, bool, int64_t, uint64_t) -// and arrays with dynamic size (strings, binary data). - -// BoolUnit: if true accepts values of type bool (but passed as T into libzmq) -template<int Opt, class T, bool BoolUnit = false> struct integral_option -{ -}; - -// NullTerm: -// 0: binary data -// 1: null-terminated string (`getsockopt` size includes null) -// 2: binary (size 32) or Z85 encoder string of size 41 (null included) -template<int Opt, int NullTerm = 1> struct array_option -{ -}; - -#define ZMQ_DEFINE_INTEGRAL_OPT(OPT, NAME, TYPE) \ - using NAME##_t = integral_option<OPT, TYPE, false>; \ - ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {} -#define ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(OPT, NAME, TYPE) \ - using NAME##_t = integral_option<OPT, TYPE, true>; \ - ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {} -#define ZMQ_DEFINE_ARRAY_OPT(OPT, NAME) \ - using NAME##_t = array_option<OPT>; \ - ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {} -#define ZMQ_DEFINE_ARRAY_OPT_BINARY(OPT, NAME) \ - using NAME##_t = array_option<OPT, 0>; \ - ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {} -#define ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(OPT, NAME) \ - using NAME##_t = array_option<OPT, 2>; \ - ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {} - -// deprecated, use zmq::fd_t -using cppzmq_fd_t = ::zmq::fd_t; - -#ifdef ZMQ_AFFINITY -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_AFFINITY, affinity, uint64_t); -#endif -#ifdef ZMQ_BACKLOG -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_BACKLOG, backlog, int); -#endif -#ifdef ZMQ_BINDTODEVICE -ZMQ_DEFINE_ARRAY_OPT_BINARY(ZMQ_BINDTODEVICE, bindtodevice); -#endif -#ifdef ZMQ_CONFLATE -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_CONFLATE, conflate, int); -#endif -#ifdef ZMQ_CONNECT_ROUTING_ID -ZMQ_DEFINE_ARRAY_OPT(ZMQ_CONNECT_ROUTING_ID, connect_routing_id); -#endif -#ifdef ZMQ_CONNECT_TIMEOUT -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_CONNECT_TIMEOUT, connect_timeout, int); -#endif -#ifdef ZMQ_CURVE_PUBLICKEY -ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_PUBLICKEY, curve_publickey); -#endif -#ifdef ZMQ_CURVE_SECRETKEY -ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_SECRETKEY, curve_secretkey); -#endif -#ifdef ZMQ_CURVE_SERVER -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_CURVE_SERVER, curve_server, int); -#endif -#ifdef ZMQ_CURVE_SERVERKEY -ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_SERVERKEY, curve_serverkey); -#endif -#ifdef ZMQ_EVENTS -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_EVENTS, events, int); -#endif -#ifdef ZMQ_FD -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_FD, fd, ::zmq::fd_t); -#endif -#ifdef ZMQ_GSSAPI_PLAINTEXT -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_GSSAPI_PLAINTEXT, gssapi_plaintext, int); -#endif -#ifdef ZMQ_GSSAPI_SERVER -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_GSSAPI_SERVER, gssapi_server, int); -#endif -#ifdef ZMQ_GSSAPI_SERVICE_PRINCIPAL -ZMQ_DEFINE_ARRAY_OPT(ZMQ_GSSAPI_SERVICE_PRINCIPAL, gssapi_service_principal); -#endif -#ifdef ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE, - gssapi_service_principal_nametype, - int); -#endif -#ifdef ZMQ_GSSAPI_PRINCIPAL -ZMQ_DEFINE_ARRAY_OPT(ZMQ_GSSAPI_PRINCIPAL, gssapi_principal); -#endif -#ifdef ZMQ_GSSAPI_PRINCIPAL_NAMETYPE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_GSSAPI_PRINCIPAL_NAMETYPE, - gssapi_principal_nametype, - int); -#endif -#ifdef ZMQ_HANDSHAKE_IVL -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HANDSHAKE_IVL, handshake_ivl, int); -#endif -#ifdef ZMQ_HEARTBEAT_IVL -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_IVL, heartbeat_ivl, int); -#endif -#ifdef ZMQ_HEARTBEAT_TIMEOUT -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_TIMEOUT, heartbeat_timeout, int); -#endif -#ifdef ZMQ_HEARTBEAT_TTL -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_TTL, heartbeat_ttl, int); -#endif -#ifdef ZMQ_IMMEDIATE -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_IMMEDIATE, immediate, int); -#endif -#ifdef ZMQ_INVERT_MATCHING -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_INVERT_MATCHING, invert_matching, int); -#endif -#ifdef ZMQ_IPV6 -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_IPV6, ipv6, int); -#endif -#ifdef ZMQ_LAST_ENDPOINT -ZMQ_DEFINE_ARRAY_OPT(ZMQ_LAST_ENDPOINT, last_endpoint); -#endif -#ifdef ZMQ_LINGER -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_LINGER, linger, int); -#endif -#ifdef ZMQ_MAXMSGSIZE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MAXMSGSIZE, maxmsgsize, int64_t); -#endif -#ifdef ZMQ_MECHANISM -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MECHANISM, mechanism, int); -#endif -#ifdef ZMQ_METADATA -ZMQ_DEFINE_ARRAY_OPT(ZMQ_METADATA, metadata); -#endif -#ifdef ZMQ_MULTICAST_HOPS -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MULTICAST_HOPS, multicast_hops, int); -#endif -#ifdef ZMQ_MULTICAST_LOOP -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_MULTICAST_LOOP, multicast_loop, int); -#endif -#ifdef ZMQ_MULTICAST_MAXTPDU -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MULTICAST_MAXTPDU, multicast_maxtpdu, int); -#endif -#ifdef ZMQ_PLAIN_SERVER -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_PLAIN_SERVER, plain_server, int); -#endif -#ifdef ZMQ_PLAIN_PASSWORD -ZMQ_DEFINE_ARRAY_OPT(ZMQ_PLAIN_PASSWORD, plain_password); -#endif -#ifdef ZMQ_PLAIN_USERNAME -ZMQ_DEFINE_ARRAY_OPT(ZMQ_PLAIN_USERNAME, plain_username); -#endif -#ifdef ZMQ_USE_FD -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_USE_FD, use_fd, int); -#endif -#ifdef ZMQ_PROBE_ROUTER -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_PROBE_ROUTER, probe_router, int); -#endif -#ifdef ZMQ_RATE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RATE, rate, int); -#endif -#ifdef ZMQ_RCVBUF -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RCVBUF, rcvbuf, int); -#endif -#ifdef ZMQ_RCVHWM -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RCVHWM, rcvhwm, int); -#endif -#ifdef ZMQ_RCVMORE -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_RCVMORE, rcvmore, int); -#endif -#ifdef ZMQ_RCVTIMEO -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RCVTIMEO, rcvtimeo, int); -#endif -#ifdef ZMQ_RECONNECT_IVL -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_IVL, reconnect_ivl, int); -#endif -#ifdef ZMQ_RECONNECT_IVL_MAX -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_IVL_MAX, reconnect_ivl_max, int); -#endif -#ifdef ZMQ_RECOVERY_IVL -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECOVERY_IVL, recovery_ivl, int); -#endif -#ifdef ZMQ_REQ_CORRELATE -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_REQ_CORRELATE, req_correlate, int); -#endif -#ifdef ZMQ_REQ_RELAXED -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_REQ_RELAXED, req_relaxed, int); -#endif -#ifdef ZMQ_ROUTER_HANDOVER -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_ROUTER_HANDOVER, router_handover, int); -#endif -#ifdef ZMQ_ROUTER_MANDATORY -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_ROUTER_MANDATORY, router_mandatory, int); -#endif -#ifdef ZMQ_ROUTER_NOTIFY -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_ROUTER_NOTIFY, router_notify, int); -#endif -#ifdef ZMQ_ROUTING_ID -ZMQ_DEFINE_ARRAY_OPT_BINARY(ZMQ_ROUTING_ID, routing_id); -#endif -#ifdef ZMQ_SNDBUF -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDBUF, sndbuf, int); -#endif -#ifdef ZMQ_SNDHWM -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDHWM, sndhwm, int); -#endif -#ifdef ZMQ_SNDTIMEO -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDTIMEO, sndtimeo, int); -#endif -#ifdef ZMQ_SOCKS_PROXY -ZMQ_DEFINE_ARRAY_OPT(ZMQ_SOCKS_PROXY, socks_proxy); -#endif -#ifdef ZMQ_STREAM_NOTIFY -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_STREAM_NOTIFY, stream_notify, int); -#endif -#ifdef ZMQ_SUBSCRIBE -ZMQ_DEFINE_ARRAY_OPT(ZMQ_SUBSCRIBE, subscribe); -#endif -#ifdef ZMQ_TCP_KEEPALIVE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE, tcp_keepalive, int); -#endif -#ifdef ZMQ_TCP_KEEPALIVE_CNT -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE_CNT, tcp_keepalive_cnt, int); -#endif -#ifdef ZMQ_TCP_KEEPALIVE_IDLE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE_IDLE, tcp_keepalive_idle, int); -#endif -#ifdef ZMQ_TCP_KEEPALIVE_INTVL -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE_INTVL, tcp_keepalive_intvl, int); -#endif -#ifdef ZMQ_TCP_MAXRT -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_MAXRT, tcp_maxrt, int); -#endif -#ifdef ZMQ_THREAD_SAFE -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_THREAD_SAFE, thread_safe, int); -#endif -#ifdef ZMQ_TOS -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TOS, tos, int); -#endif -#ifdef ZMQ_TYPE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TYPE, type, int); -#ifdef ZMQ_CPP11 -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TYPE, socket_type, socket_type); -#endif // ZMQ_CPP11 -#endif // ZMQ_TYPE -#ifdef ZMQ_UNSUBSCRIBE -ZMQ_DEFINE_ARRAY_OPT(ZMQ_UNSUBSCRIBE, unsubscribe); -#endif -#ifdef ZMQ_VMCI_BUFFER_SIZE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_BUFFER_SIZE, vmci_buffer_size, uint64_t); -#endif -#ifdef ZMQ_VMCI_BUFFER_MIN_SIZE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_BUFFER_MIN_SIZE, vmci_buffer_min_size, uint64_t); -#endif -#ifdef ZMQ_VMCI_BUFFER_MAX_SIZE -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_BUFFER_MAX_SIZE, vmci_buffer_max_size, uint64_t); -#endif -#ifdef ZMQ_VMCI_CONNECT_TIMEOUT -ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_CONNECT_TIMEOUT, vmci_connect_timeout, int); -#endif -#ifdef ZMQ_XPUB_VERBOSE -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_VERBOSE, xpub_verbose, int); -#endif -#ifdef ZMQ_XPUB_VERBOSER -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_VERBOSER, xpub_verboser, int); -#endif -#ifdef ZMQ_XPUB_MANUAL -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_MANUAL, xpub_manual, int); -#endif -#ifdef ZMQ_XPUB_NODROP -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_NODROP, xpub_nodrop, int); -#endif -#ifdef ZMQ_XPUB_WELCOME_MSG -ZMQ_DEFINE_ARRAY_OPT(ZMQ_XPUB_WELCOME_MSG, xpub_welcome_msg); -#endif -#ifdef ZMQ_ZAP_ENFORCE_DOMAIN -ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_ZAP_ENFORCE_DOMAIN, zap_enforce_domain, int); -#endif -#ifdef ZMQ_ZAP_DOMAIN -ZMQ_DEFINE_ARRAY_OPT(ZMQ_ZAP_DOMAIN, zap_domain); -#endif - -} // namespace sockopt -#endif // ZMQ_CPP11 - - -namespace detail -{ -class socket_base -{ - public: - socket_base() ZMQ_NOTHROW : _handle(ZMQ_NULLPTR) {} - ZMQ_EXPLICIT socket_base(void *handle) ZMQ_NOTHROW : _handle(handle) {} - - template<typename T> - ZMQ_CPP11_DEPRECATED("from 4.7.0, use `set` taking option from zmq::sockopt") - void setsockopt(int option_, T const &optval) - { - setsockopt(option_, &optval, sizeof(T)); - } - - ZMQ_CPP11_DEPRECATED("from 4.7.0, use `set` taking option from zmq::sockopt") - void setsockopt(int option_, const void *optval_, size_t optvallen_) - { - int rc = zmq_setsockopt(_handle, option_, optval_, optvallen_); - if (rc != 0) - throw error_t(); - } - - ZMQ_CPP11_DEPRECATED("from 4.7.0, use `get` taking option from zmq::sockopt") - void getsockopt(int option_, void *optval_, size_t *optvallen_) const - { - int rc = zmq_getsockopt(_handle, option_, optval_, optvallen_); - if (rc != 0) - throw error_t(); - } - - template<typename T> - ZMQ_CPP11_DEPRECATED("from 4.7.0, use `get` taking option from zmq::sockopt") - T getsockopt(int option_) const - { - T optval; - size_t optlen = sizeof(T); - getsockopt(option_, &optval, &optlen); - return optval; - } - -#ifdef ZMQ_CPP11 - // Set integral socket option, e.g. - // `socket.set(zmq::sockopt::linger, 0)` - template<int Opt, class T, bool BoolUnit> - void set(sockopt::integral_option<Opt, T, BoolUnit>, const T &val) - { - static_assert(std::is_integral<T>::value, "T must be integral"); - set_option(Opt, &val, sizeof val); - } - - // Set integral socket option from boolean, e.g. - // `socket.set(zmq::sockopt::immediate, false)` - template<int Opt, class T> - void set(sockopt::integral_option<Opt, T, true>, bool val) - { - static_assert(std::is_integral<T>::value, "T must be integral"); - T rep_val = val; - set_option(Opt, &rep_val, sizeof rep_val); - } - - // Set array socket option, e.g. - // `socket.set(zmq::sockopt::plain_username, "foo123")` - template<int Opt, int NullTerm> - void set(sockopt::array_option<Opt, NullTerm>, const char *buf) - { - set_option(Opt, buf, std::strlen(buf)); - } - - // Set array socket option, e.g. - // `socket.set(zmq::sockopt::routing_id, zmq::buffer(id))` - template<int Opt, int NullTerm> - void set(sockopt::array_option<Opt, NullTerm>, const_buffer buf) - { - set_option(Opt, buf.data(), buf.size()); - } - - // Set array socket option, e.g. - // `socket.set(zmq::sockopt::routing_id, id_str)` - template<int Opt, int NullTerm> - void set(sockopt::array_option<Opt, NullTerm>, const std::string &buf) - { - set_option(Opt, buf.data(), buf.size()); - } - -#if CPPZMQ_HAS_STRING_VIEW - // Set array socket option, e.g. - // `socket.set(zmq::sockopt::routing_id, id_str)` - template<int Opt, int NullTerm> - void set(sockopt::array_option<Opt, NullTerm>, std::string_view buf) - { - set_option(Opt, buf.data(), buf.size()); - } -#endif - - // Get scalar socket option, e.g. - // `auto opt = socket.get(zmq::sockopt::linger)` - template<int Opt, class T, bool BoolUnit> - ZMQ_NODISCARD T get(sockopt::integral_option<Opt, T, BoolUnit>) const - { - static_assert(std::is_scalar<T>::value, "T must be scalar"); - T val; - size_t size = sizeof val; - get_option(Opt, &val, &size); - assert(size == sizeof val); - return val; - } - - // Get array socket option, writes to buf, returns option size in bytes, e.g. - // `size_t optsize = socket.get(zmq::sockopt::routing_id, zmq::buffer(id))` - template<int Opt, int NullTerm> - ZMQ_NODISCARD size_t get(sockopt::array_option<Opt, NullTerm>, - mutable_buffer buf) const - { - size_t size = buf.size(); - get_option(Opt, buf.data(), &size); - return size; - } - - // Get array socket option as string (initializes the string buffer size to init_size) e.g. - // `auto s = socket.get(zmq::sockopt::routing_id)` - // Note: removes the null character from null-terminated string options, - // i.e. the string size excludes the null character. - template<int Opt, int NullTerm> - ZMQ_NODISCARD std::string get(sockopt::array_option<Opt, NullTerm>, - size_t init_size = 1024) const - { - if ZMQ_CONSTEXPR_IF (NullTerm == 2) { - if (init_size == 1024) { - init_size = 41; // get as Z85 string - } - } - std::string str(init_size, '\0'); - size_t size = get(sockopt::array_option<Opt>{}, buffer(str)); - if ZMQ_CONSTEXPR_IF (NullTerm == 1) { - if (size > 0) { - assert(str[size - 1] == '\0'); - --size; - } - } else if ZMQ_CONSTEXPR_IF (NullTerm == 2) { - assert(size == 32 || size == 41); - if (size == 41) { - assert(str[size - 1] == '\0'); - --size; - } - } - str.resize(size); - return str; - } -#endif - - void bind(std::string const &addr) { bind(addr.c_str()); } - - void bind(const char *addr_) - { - int rc = zmq_bind(_handle, addr_); - if (rc != 0) - throw error_t(); - } - - void unbind(std::string const &addr) { unbind(addr.c_str()); } - - void unbind(const char *addr_) - { - int rc = zmq_unbind(_handle, addr_); - if (rc != 0) - throw error_t(); - } - - void connect(std::string const &addr) { connect(addr.c_str()); } - - void connect(const char *addr_) - { - int rc = zmq_connect(_handle, addr_); - if (rc != 0) - throw error_t(); - } - - void disconnect(std::string const &addr) { disconnect(addr.c_str()); } - - void disconnect(const char *addr_) - { - int rc = zmq_disconnect(_handle, addr_); - if (rc != 0) - throw error_t(); - } - - ZMQ_DEPRECATED("from 4.7.1, use handle() != nullptr or operator bool") - bool connected() const ZMQ_NOTHROW { return (_handle != ZMQ_NULLPTR); } - - ZMQ_CPP11_DEPRECATED("from 4.3.1, use send taking a const_buffer and send_flags") - size_t send(const void *buf_, size_t len_, int flags_ = 0) - { - int nbytes = zmq_send(_handle, buf_, len_, flags_); - if (nbytes >= 0) - return static_cast<size_t>(nbytes); - if (zmq_errno() == EAGAIN) - return 0; - throw error_t(); - } - - ZMQ_CPP11_DEPRECATED("from 4.3.1, use send taking message_t and send_flags") - bool send(message_t &msg_, - int flags_ = 0) // default until removed - { - int nbytes = zmq_msg_send(msg_.handle(), _handle, flags_); - if (nbytes >= 0) - return true; - if (zmq_errno() == EAGAIN) - return false; - throw error_t(); - } - - template<typename T> - ZMQ_CPP11_DEPRECATED( - "from 4.4.1, use send taking message_t or buffer (for contiguous " - "ranges), and send_flags") - bool send(T first, T last, int flags_ = 0) - { - zmq::message_t msg(first, last); - int nbytes = zmq_msg_send(msg.handle(), _handle, flags_); - if (nbytes >= 0) - return true; - if (zmq_errno() == EAGAIN) - return false; - throw error_t(); - } - -#ifdef ZMQ_HAS_RVALUE_REFS - ZMQ_CPP11_DEPRECATED("from 4.3.1, use send taking message_t and send_flags") - bool send(message_t &&msg_, - int flags_ = 0) // default until removed - { -#ifdef ZMQ_CPP11 - return send(msg_, static_cast<send_flags>(flags_)).has_value(); -#else - return send(msg_, flags_); -#endif - } -#endif - -#ifdef ZMQ_CPP11 - send_result_t send(const_buffer buf, send_flags flags = send_flags::none) - { - const int nbytes = - zmq_send(_handle, buf.data(), buf.size(), static_cast<int>(flags)); - if (nbytes >= 0) - return static_cast<size_t>(nbytes); - if (zmq_errno() == EAGAIN) - return {}; - throw error_t(); - } - - send_result_t send(message_t &msg, send_flags flags) - { - int nbytes = zmq_msg_send(msg.handle(), _handle, static_cast<int>(flags)); - if (nbytes >= 0) - return static_cast<size_t>(nbytes); - if (zmq_errno() == EAGAIN) - return {}; - throw error_t(); - } - - send_result_t send(message_t &&msg, send_flags flags) - { - return send(msg, flags); - } -#endif - - ZMQ_CPP11_DEPRECATED( - "from 4.3.1, use recv taking a mutable_buffer and recv_flags") - size_t recv(void *buf_, size_t len_, int flags_ = 0) - { - int nbytes = zmq_recv(_handle, buf_, len_, flags_); - if (nbytes >= 0) - return static_cast<size_t>(nbytes); - if (zmq_errno() == EAGAIN) - return 0; - throw error_t(); - } - - ZMQ_CPP11_DEPRECATED( - "from 4.3.1, use recv taking a reference to message_t and recv_flags") - bool recv(message_t *msg_, int flags_ = 0) - { - int nbytes = zmq_msg_recv(msg_->handle(), _handle, flags_); - if (nbytes >= 0) - return true; - if (zmq_errno() == EAGAIN) - return false; - throw error_t(); - } - -#ifdef ZMQ_CPP11 - ZMQ_NODISCARD - recv_buffer_result_t recv(mutable_buffer buf, - recv_flags flags = recv_flags::none) - { - const int nbytes = - zmq_recv(_handle, buf.data(), buf.size(), static_cast<int>(flags)); - if (nbytes >= 0) { - return recv_buffer_size{ - (std::min)(static_cast<size_t>(nbytes), buf.size()), - static_cast<size_t>(nbytes)}; - } - if (zmq_errno() == EAGAIN) - return {}; - throw error_t(); - } - - ZMQ_NODISCARD - recv_result_t recv(message_t &msg, recv_flags flags = recv_flags::none) - { - const int nbytes = - zmq_msg_recv(msg.handle(), _handle, static_cast<int>(flags)); - if (nbytes >= 0) { - assert(msg.size() == static_cast<size_t>(nbytes)); - return static_cast<size_t>(nbytes); - } - if (zmq_errno() == EAGAIN) - return {}; - throw error_t(); - } -#endif - -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0) - void join(const char *group) - { - int rc = zmq_join(_handle, group); - if (rc != 0) - throw error_t(); - } - - void leave(const char *group) - { - int rc = zmq_leave(_handle, group); - if (rc != 0) - throw error_t(); - } -#endif - - ZMQ_NODISCARD void *handle() ZMQ_NOTHROW { return _handle; } - ZMQ_NODISCARD const void *handle() const ZMQ_NOTHROW { return _handle; } - - ZMQ_EXPLICIT operator bool() const ZMQ_NOTHROW { return _handle != ZMQ_NULLPTR; } - // note: non-const operator bool can be removed once - // operator void* is removed from socket_t - ZMQ_EXPLICIT operator bool() ZMQ_NOTHROW { return _handle != ZMQ_NULLPTR; } - - protected: - void *_handle; - - private: - void set_option(int option_, const void *optval_, size_t optvallen_) - { - int rc = zmq_setsockopt(_handle, option_, optval_, optvallen_); - if (rc != 0) - throw error_t(); - } - - void get_option(int option_, void *optval_, size_t *optvallen_) const - { - int rc = zmq_getsockopt(_handle, option_, optval_, optvallen_); - if (rc != 0) - throw error_t(); - } -}; -} // namespace detail - -struct from_handle_t -{ - struct _private - { - }; // disabling use other than with from_handle - ZMQ_CONSTEXPR_FN ZMQ_EXPLICIT from_handle_t(_private /*p*/) ZMQ_NOTHROW {} -}; - -ZMQ_CONSTEXPR_VAR from_handle_t from_handle = - from_handle_t(from_handle_t::_private()); - -// A non-owning nullable reference to a socket. -// The reference is invalidated on socket close or destruction. -class socket_ref : public detail::socket_base -{ - public: - socket_ref() ZMQ_NOTHROW : detail::socket_base() {} -#ifdef ZMQ_CPP11 - socket_ref(std::nullptr_t) ZMQ_NOTHROW : detail::socket_base() {} -#endif - socket_ref(from_handle_t /*fh*/, void *handle) ZMQ_NOTHROW - : detail::socket_base(handle) - { - } -}; - -#ifdef ZMQ_CPP11 -inline bool operator==(socket_ref sr, std::nullptr_t /*p*/) ZMQ_NOTHROW -{ - return sr.handle() == nullptr; -} -inline bool operator==(std::nullptr_t /*p*/, socket_ref sr) ZMQ_NOTHROW -{ - return sr.handle() == nullptr; -} -inline bool operator!=(socket_ref sr, std::nullptr_t /*p*/) ZMQ_NOTHROW -{ - return !(sr == nullptr); -} -inline bool operator!=(std::nullptr_t /*p*/, socket_ref sr) ZMQ_NOTHROW -{ - return !(sr == nullptr); -} -#endif - -inline bool operator==(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW -{ - return std::equal_to<const void *>()(a.handle(), b.handle()); -} -inline bool operator!=(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW -{ - return !(a == b); -} -inline bool operator<(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW -{ - return std::less<const void *>()(a.handle(), b.handle()); -} -inline bool operator>(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW -{ - return b < a; -} -inline bool operator<=(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW -{ - return !(a > b); -} -inline bool operator>=(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW -{ - return !(a < b); -} - -} // namespace zmq - -#ifdef ZMQ_CPP11 -namespace std -{ -template<> struct hash<zmq::socket_ref> -{ - size_t operator()(zmq::socket_ref sr) const ZMQ_NOTHROW - { - return hash<void *>()(sr.handle()); - } -}; -} // namespace std -#endif - -namespace zmq -{ -class socket_t : public detail::socket_base -{ - friend class monitor_t; - - public: - socket_t() ZMQ_NOTHROW : detail::socket_base(ZMQ_NULLPTR), ctxptr(ZMQ_NULLPTR) {} - - socket_t(context_t &context_, int type_) : - detail::socket_base(zmq_socket(context_.handle(), type_)), - ctxptr(context_.handle()) - { - if (_handle == ZMQ_NULLPTR) - throw error_t(); - } - -#ifdef ZMQ_CPP11 - socket_t(context_t &context_, socket_type type_) : - socket_t(context_, static_cast<int>(type_)) - { - } -#endif - -#ifdef ZMQ_HAS_RVALUE_REFS - socket_t(socket_t &&rhs) ZMQ_NOTHROW : detail::socket_base(rhs._handle), - ctxptr(rhs.ctxptr) - { - rhs._handle = ZMQ_NULLPTR; - rhs.ctxptr = ZMQ_NULLPTR; - } - socket_t &operator=(socket_t &&rhs) ZMQ_NOTHROW - { - close(); - std::swap(_handle, rhs._handle); - std::swap(ctxptr, rhs.ctxptr); - return *this; - } -#endif - - ~socket_t() ZMQ_NOTHROW { close(); } - - operator void *() ZMQ_NOTHROW { return _handle; } - - operator void const *() const ZMQ_NOTHROW { return _handle; } - - void close() ZMQ_NOTHROW - { - if (_handle == ZMQ_NULLPTR) - // already closed - return; - int rc = zmq_close(_handle); - ZMQ_ASSERT(rc == 0); - _handle = ZMQ_NULLPTR; - ctxptr = ZMQ_NULLPTR; - } - - void swap(socket_t &other) ZMQ_NOTHROW - { - std::swap(_handle, other._handle); - std::swap(ctxptr, other.ctxptr); - } - - operator socket_ref() ZMQ_NOTHROW { return socket_ref(from_handle, _handle); } - - private: - void *ctxptr; - - socket_t(const socket_t &) ZMQ_DELETED_FUNCTION; - void operator=(const socket_t &) ZMQ_DELETED_FUNCTION; - - // used by monitor_t - socket_t(void *context_, int type_) : - detail::socket_base(zmq_socket(context_, type_)), ctxptr(context_) - { - if (_handle == ZMQ_NULLPTR) - throw error_t(); - if (ctxptr == ZMQ_NULLPTR) - throw error_t(); - } -}; - -inline void swap(socket_t &a, socket_t &b) ZMQ_NOTHROW -{ - a.swap(b); -} - -ZMQ_DEPRECATED("from 4.3.1, use proxy taking socket_t objects") -inline void proxy(void *frontend, void *backend, void *capture) -{ - int rc = zmq_proxy(frontend, backend, capture); - if (rc != 0) - throw error_t(); -} - -inline void -proxy(socket_ref frontend, socket_ref backend, socket_ref capture = socket_ref()) -{ - int rc = zmq_proxy(frontend.handle(), backend.handle(), capture.handle()); - if (rc != 0) - throw error_t(); -} - -#ifdef ZMQ_HAS_PROXY_STEERABLE -ZMQ_DEPRECATED("from 4.3.1, use proxy_steerable taking socket_t objects") -inline void -proxy_steerable(void *frontend, void *backend, void *capture, void *control) -{ - int rc = zmq_proxy_steerable(frontend, backend, capture, control); - if (rc != 0) - throw error_t(); -} - -inline void proxy_steerable(socket_ref frontend, - socket_ref backend, - socket_ref capture, - socket_ref control) -{ - int rc = zmq_proxy_steerable(frontend.handle(), backend.handle(), - capture.handle(), control.handle()); - if (rc != 0) - throw error_t(); -} -#endif - -class monitor_t -{ - public: - monitor_t() : _socket(), _monitor_socket() {} - - virtual ~monitor_t() { close(); } - -#ifdef ZMQ_HAS_RVALUE_REFS - monitor_t(monitor_t &&rhs) ZMQ_NOTHROW : _socket(), _monitor_socket() - { - std::swap(_socket, rhs._socket); - std::swap(_monitor_socket, rhs._monitor_socket); - } - - monitor_t &operator=(monitor_t &&rhs) ZMQ_NOTHROW - { - close(); - _socket = socket_ref(); - std::swap(_socket, rhs._socket); - std::swap(_monitor_socket, rhs._monitor_socket); - return *this; - } -#endif - - - void - monitor(socket_t &socket, std::string const &addr, int events = ZMQ_EVENT_ALL) - { - monitor(socket, addr.c_str(), events); - } - - void monitor(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL) - { - init(socket, addr_, events); - while (true) { - check_event(-1); - } - } - - void init(socket_t &socket, std::string const &addr, int events = ZMQ_EVENT_ALL) - { - init(socket, addr.c_str(), events); - } - - void init(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL) - { - int rc = zmq_socket_monitor(socket.handle(), addr_, events); - if (rc != 0) - throw error_t(); - - _socket = socket; - _monitor_socket = socket_t(socket.ctxptr, ZMQ_PAIR); - _monitor_socket.connect(addr_); - - on_monitor_started(); - } - - bool check_event(int timeout = 0) - { - assert(_monitor_socket); - - zmq::message_t eventMsg; - - zmq::pollitem_t items[] = { - {_monitor_socket.handle(), 0, ZMQ_POLLIN, 0}, - }; - - #ifdef ZMQ_CPP11 - zmq::poll(&items[0], 1, std::chrono::milliseconds(timeout)); - #else - zmq::poll(&items[0], 1, timeout); - #endif - - if (items[0].revents & ZMQ_POLLIN) { - int rc = zmq_msg_recv(eventMsg.handle(), _monitor_socket.handle(), 0); - if (rc == -1 && zmq_errno() == ETERM) - return false; - assert(rc != -1); - - } else { - return false; - } - -#if ZMQ_VERSION_MAJOR >= 4 - const char *data = static_cast<const char *>(eventMsg.data()); - zmq_event_t msgEvent; - memcpy(&msgEvent.event, data, sizeof(uint16_t)); - data += sizeof(uint16_t); - memcpy(&msgEvent.value, data, sizeof(int32_t)); - zmq_event_t *event = &msgEvent; -#else - zmq_event_t *event = static_cast<zmq_event_t *>(eventMsg.data()); -#endif - -#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT - zmq::message_t addrMsg; - int rc = zmq_msg_recv(addrMsg.handle(), _monitor_socket.handle(), 0); - if (rc == -1 && zmq_errno() == ETERM) { - return false; - } - - assert(rc != -1); - std::string address = addrMsg.to_string(); -#else - // Bit of a hack, but all events in the zmq_event_t union have the same layout so this will work for all event types. - std::string address = event->data.connected.addr; -#endif - -#ifdef ZMQ_EVENT_MONITOR_STOPPED - if (event->event == ZMQ_EVENT_MONITOR_STOPPED) { - return false; - } - -#endif - - switch (event->event) { - case ZMQ_EVENT_CONNECTED: - on_event_connected(*event, address.c_str()); - break; - case ZMQ_EVENT_CONNECT_DELAYED: - on_event_connect_delayed(*event, address.c_str()); - break; - case ZMQ_EVENT_CONNECT_RETRIED: - on_event_connect_retried(*event, address.c_str()); - break; - case ZMQ_EVENT_LISTENING: - on_event_listening(*event, address.c_str()); - break; - case ZMQ_EVENT_BIND_FAILED: - on_event_bind_failed(*event, address.c_str()); - break; - case ZMQ_EVENT_ACCEPTED: - on_event_accepted(*event, address.c_str()); - break; - case ZMQ_EVENT_ACCEPT_FAILED: - on_event_accept_failed(*event, address.c_str()); - break; - case ZMQ_EVENT_CLOSED: - on_event_closed(*event, address.c_str()); - break; - case ZMQ_EVENT_CLOSE_FAILED: - on_event_close_failed(*event, address.c_str()); - break; - case ZMQ_EVENT_DISCONNECTED: - on_event_disconnected(*event, address.c_str()); - break; -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 0) || (defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 3)) - case ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL: - on_event_handshake_failed_no_detail(*event, address.c_str()); - break; - case ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL: - on_event_handshake_failed_protocol(*event, address.c_str()); - break; - case ZMQ_EVENT_HANDSHAKE_FAILED_AUTH: - on_event_handshake_failed_auth(*event, address.c_str()); - break; - case ZMQ_EVENT_HANDSHAKE_SUCCEEDED: - on_event_handshake_succeeded(*event, address.c_str()); - break; -#elif defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 1) - case ZMQ_EVENT_HANDSHAKE_FAILED: - on_event_handshake_failed(*event, address.c_str()); - break; - case ZMQ_EVENT_HANDSHAKE_SUCCEED: - on_event_handshake_succeed(*event, address.c_str()); - break; -#endif - default: - on_event_unknown(*event, address.c_str()); - break; - } - - return true; - } - -#ifdef ZMQ_EVENT_MONITOR_STOPPED - void abort() - { - if (_socket) - zmq_socket_monitor(_socket.handle(), ZMQ_NULLPTR, 0); - - _socket = socket_ref(); - } -#endif - virtual void on_monitor_started() {} - virtual void on_event_connected(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_connect_delayed(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_connect_retried(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_listening(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_bind_failed(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_accepted(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_accept_failed(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_closed(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_close_failed(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_disconnected(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 3) - virtual void on_event_handshake_failed_no_detail(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_handshake_failed_protocol(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_handshake_failed_auth(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_handshake_succeeded(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } -#elif ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 1) - virtual void on_event_handshake_failed(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } - virtual void on_event_handshake_succeed(const zmq_event_t &event_, - const char *addr_) - { - (void) event_; - (void) addr_; - } -#endif - virtual void on_event_unknown(const zmq_event_t &event_, const char *addr_) - { - (void) event_; - (void) addr_; - } - - private: - monitor_t(const monitor_t &) ZMQ_DELETED_FUNCTION; - void operator=(const monitor_t &) ZMQ_DELETED_FUNCTION; - - socket_ref _socket; - socket_t _monitor_socket; - - void close() ZMQ_NOTHROW - { - if (_socket) - zmq_socket_monitor(_socket.handle(), ZMQ_NULLPTR, 0); - _monitor_socket.close(); - } -}; - -#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER) - -// polling events -enum class event_flags : short -{ - none = 0, - pollin = ZMQ_POLLIN, - pollout = ZMQ_POLLOUT, - pollerr = ZMQ_POLLERR, - pollpri = ZMQ_POLLPRI -}; - -constexpr event_flags operator|(event_flags a, event_flags b) noexcept -{ - return detail::enum_bit_or(a, b); -} -constexpr event_flags operator&(event_flags a, event_flags b) noexcept -{ - return detail::enum_bit_and(a, b); -} -constexpr event_flags operator^(event_flags a, event_flags b) noexcept -{ - return detail::enum_bit_xor(a, b); -} -constexpr event_flags operator~(event_flags a) noexcept -{ - return detail::enum_bit_not(a); -} - -struct no_user_data; - -// layout compatible with zmq_poller_event_t -template<class T = no_user_data> struct poller_event -{ - socket_ref socket; - ::zmq::fd_t fd; - T *user_data; - event_flags events; -}; - -template<typename T = no_user_data> class poller_t -{ - public: - using event_type = poller_event<T>; - - poller_t() : poller_ptr(zmq_poller_new()) - { - if (!poller_ptr) - throw error_t(); - } - - template< - typename Dummy = void, - typename = - typename std::enable_if<!std::is_same<T, no_user_data>::value, Dummy>::type> - void add(zmq::socket_ref socket, event_flags events, T *user_data) - { - add_impl(socket, events, user_data); - } - - void add(zmq::socket_ref socket, event_flags events) - { - add_impl(socket, events, nullptr); - } - - void remove(zmq::socket_ref socket) - { - if (0 != zmq_poller_remove(poller_ptr.get(), socket.handle())) { - throw error_t(); - } - } - - void modify(zmq::socket_ref socket, event_flags events) - { - if (0 - != zmq_poller_modify(poller_ptr.get(), socket.handle(), - static_cast<short>(events))) { - throw error_t(); - } - } - - size_t wait_all(std::vector<event_type> &poller_events, - const std::chrono::milliseconds timeout) - { - int rc = zmq_poller_wait_all( - poller_ptr.get(), - reinterpret_cast<zmq_poller_event_t *>(poller_events.data()), - static_cast<int>(poller_events.size()), - static_cast<long>(timeout.count())); - if (rc > 0) - return static_cast<size_t>(rc); - -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 3) - if (zmq_errno() == EAGAIN) -#else - if (zmq_errno() == ETIMEDOUT) -#endif - return 0; - - throw error_t(); - } - -#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3) - size_t size() const noexcept - { - int rc = zmq_poller_size(const_cast<void *>(poller_ptr.get())); - ZMQ_ASSERT(rc >= 0); - return static_cast<size_t>(std::max(rc, 0)); - } -#endif - - private: - struct destroy_poller_t - { - void operator()(void *ptr) noexcept - { - int rc = zmq_poller_destroy(&ptr); - ZMQ_ASSERT(rc == 0); - } - }; - - std::unique_ptr<void, destroy_poller_t> poller_ptr; - - void add_impl(zmq::socket_ref socket, event_flags events, T *user_data) - { - if (0 - != zmq_poller_add(poller_ptr.get(), socket.handle(), user_data, - static_cast<short>(events))) { - throw error_t(); - } - } -}; -#endif // defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER) - -inline std::ostream &operator<<(std::ostream &os, const message_t &msg) -{ - return os << msg.str(); -} - -} // namespace zmq - -#endif // __ZMQ_HPP_INCLUDED__ |