Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Apr 2020 13:08:01 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r530370 - in head/comms/gnuradio: . files
Message-ID:  <202004021308.032D81kJ085662@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Thu Apr  2 13:08:01 2020
New Revision: 530370
URL: https://svnweb.freebsd.org/changeset/ports/530370

Log:
  - Removed zombie dependancy on clang since system clang now works
  - Now uses python3 by default remove python2 dependancy
  - split the VOLK project into separate port
  
  Change log from upstream follows
  ## [3.8.1.0-rc1] - 2020-02-16
  
  ### Changed
  
  #### Project Scope
  
  - clang-tidy improvements
    - Throw exceptions by value, catch by reference
    - `emplace_back` where applicable
    - `empty()` instead of `vector::size() == 0`
  
  ### Fixed
  
  #### Project scope
  
  - FindQwt paths
  - floatAlmostEqual unittest assert function wrongly passing on sequence types
  - Only require boost unittest when testing is enabled
  - FindLOG4CPP typo
  
  #### gnuradio-runtime
  
  - block gateway shadowed system port
  - Flaky message passing unit test contained timeout (not the test's job)
  - ctrlport/`rpcaggregator` & Co: removed storage of references to scope-lifetime objects
  - Sine table generation python was wrong
  - `get_tags_in_range` for delay < (end-start)
  - premature tag pruning
  
  #### gr_modtool
  
  - wrong use of `input` -> `raw_input`
  - allow empty argument list
  - testing
  - check for and deny TSB under Python
  - QA addition bugs
  
  #### gr-analog
  
  - clipping in FM receiver: remove superfluous gain
  - C++ generation for multiple blocks
  
  #### gr-audio
  
  - portaudio source: lock acquisition
  
  #### gr-blocks
  
  - broken `rotator` workaround
  
  #### gr-digital
  
  - `map_bb` buffer overflow
  - `map_bb` thread safety
  - `additive_scrambler `count based reset
  
  #### gr-fec
  
  - heap corruption in `async_decoder`
  - `cc_encoder` was broken for constraint lengths > 8
  
  #### gr-fft
  
  - restore Boost 1.53 compat
  
  #### gr-qtgui
  
  - no longer requiring unnecessary key in `edit_box_msg`
  
  #### gr-uhd
  
  - fixed examples under Py3
  - multichannel objects not populating channels
  
  #### GRC
  
  - several issues with YAML files
  - nested objects now properly populate namespaces
  - comments now included in block bounds calculation
  - Wiki documentation link removed from OOT blocks' docs tab
  - Dragging connections to auto-hide ports works now
  
  ### Added
  
  #### Project Scope
  
  - Codec2 development branch / future compat
  - Boost 1.71 compat
  - CI now checks for formatting
  
  #### gnuradio-runtime
  
  - dot graphs now contain message edges
  
  #### gr-uhd
  
  - UHD Filter API
  
  #### GRC
  
  - block affinity, buffer sizes available as advanced options for blocks
  - testing

Deleted:
  head/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake
Modified:
  head/comms/gnuradio/Makefile
  head/comms/gnuradio/distinfo
  head/comms/gnuradio/files/patch-CMakeLists.txt
  head/comms/gnuradio/files/patch-cmake_Modules_FindQwt.cmake
  head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
  head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
  head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
  head/comms/gnuradio/pkg-plist

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/Makefile	Thu Apr  2 13:08:01 2020	(r530370)
@@ -1,38 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.8.0.0
-PORTREVISION=	6
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.8.1.0-rc1
 CATEGORIES=	comms astro hamradio
-MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
-BROKEN_aarch64=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
-BROKEN_armv6=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
-BROKEN_armv7=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+BUILD_DEPENDS=	volk>0:devel/volk \
+		doxygen>0:devel/doxygen \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
+		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
-		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
-		cheetah:devel/py-cheetah@${PY_FLAVOR} \
+		cheetah:devel/py-cheetah3@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
 		guile:lang/guile \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
 		swig3.0:devel/swig30 \
-		xdg-open:devel/xdg-utils \
-		${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+		mpir>0:math/mpir \
+		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
@@ -51,8 +49,12 @@ LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake desktop-file-utils fortran gnome iconv \
-		perl5 pkgconfig pyqt:5 python:2.7 qt:5 shared-mime-info shebangfix
+		perl5 pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info shebangfix
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnuradio
+GH_PROJECT=	gnuradio
+
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
@@ -65,7 +67,8 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
-		-DXMLTO_EXECUTABLE:STRING=minixmlto
+		-DXMLTO_EXECUTABLE:STRING=minixmlto \
+		-DENABLE_INTERNAL_VOLK:STRING="OFF"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
@@ -73,9 +76,6 @@ USE_GNOME=	pygtk2
 USE_PYQT=	core gui opengl
 USE_WX=		3.0
 USE_QT=		buildtools core gui xml qmake widgets
-CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
-CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
@@ -90,6 +90,7 @@ OPTIONS_EXCLUDE=	DOXYGEN
 OPTIONS_SUB=		yes
 UHD_DESC=	Include UHD support from Ettus
 TESTING_DESC=	Include testing support
+INSTALLS_ICONS=		yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
@@ -118,21 +119,5 @@ PLIST_SUB+=	UHD=""
 .else
 PLIST_SUB+=	UHD="@comment "
 .endif
-
-PATCH_FILES=	docs/doxygen/Doxyfile.in \
-		gr-fec/lib/CMakeLists.txt
-
-post-patch:
-	@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
-	    ${XARGS} ${REINPLACE_CMD} -e \
-		 "s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g"
-
-.for p in ${PATCH_FILES}
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/${p}
-.endfor
-
-post-install:
-	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} include/volk/asm/neon include/volk/asm/orc include/volk/asm
 
 .include <bsd.port.post.mk>

Modified: head/comms/gnuradio/distinfo
==============================================================================
--- head/comms/gnuradio/distinfo	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/distinfo	Thu Apr  2 13:08:01 2020	(r530370)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565539118
-SHA256 (gnuradio-3.8.0.0.tar.gz) = 3a9c90111f22f2f6f30450731dc671ad28ce824fc1a7bc8ea0783da9b95a7092
-SIZE (gnuradio-3.8.0.0.tar.gz) = 3557884
+TIMESTAMP = 1585761142
+SHA256 (gnuradio-gnuradio-v3.8.1.0-rc1_GH0.tar.gz) = 27eb9af0bce272f63a0dc181edf5fff4a98e46d8d717a3e00310c5914babeefc
+SIZE (gnuradio-gnuradio-v3.8.1.0-rc1_GH0.tar.gz) = 3373463

Modified: head/comms/gnuradio/files/patch-CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-CMakeLists.txt	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/files/patch-CMakeLists.txt	Thu Apr  2 13:08:01 2020	(r530370)
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2019-05-29 03:34:08 UTC
+--- CMakeLists.txt.orig	2020-02-16 18:48:02 UTC
 +++ CMakeLists.txt
 @@ -31,6 +31,7 @@ cmake_minimum_required(VERSION 3.8)
  project(gnuradio CXX C)
@@ -8,7 +8,7 @@
  
  # Make sure our local CMake Modules path comes first
  list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
-@@ -64,6 +65,15 @@ set(GCC_MIN_VERSION "4.8.4")
+@@ -67,6 +68,15 @@ set(GCC_MIN_VERSION "4.8.4")
  set(CLANG_MIN_VERSION "3.4.0")
  set(APPLECLANG_MIN_VERSION "500")
  set(MSVC_MIN_VERSION "1800")

Modified: head/comms/gnuradio/files/patch-cmake_Modules_FindQwt.cmake
==============================================================================
--- head/comms/gnuradio/files/patch-cmake_Modules_FindQwt.cmake	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/files/patch-cmake_Modules_FindQwt.cmake	Thu Apr  2 13:08:01 2020	(r530370)
@@ -1,26 +1,22 @@
---- cmake/Modules/FindQwt.cmake.orig	2019-03-09 13:28:14 UTC
+--- cmake/Modules/FindQwt.cmake.orig	2020-04-01 19:08:22 UTC
 +++ cmake/Modules/FindQwt.cmake
-@@ -15,10 +15,11 @@ find_path(QWT_INCLUDE_DIRS
+@@ -15,6 +15,7 @@ find_path(QWT_INCLUDE_DIRS
    ${CMAKE_INSTALL_PREFIX}/include/qwt
    ${CMAKE_PREFIX_PATH}/include/qwt
    PATHS
 +  /usr/local/include/qt5/qwt6
    /usr/local/include/qwt-${QWT_QT_VERSION}
-+  /usr/include/qt5/qwt
    /usr/local/include/qwt
    /usr/include/qwt6
--  /usr/include/qt5/qwt
-   /usr/include/qwt-${QWT_QT_VERSION}
-   /usr/include/qwt
-   /usr/include/${QWT_QT_VERSION}/qwt
-@@ -29,8 +30,9 @@ find_path(QWT_INCLUDE_DIRS
+@@ -29,9 +30,10 @@ find_path(QWT_INCLUDE_DIRS
  )
  
  find_library (QWT_LIBRARIES
--  NAMES ${PC_QWT_LIBRARIES} qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION}
-+  NAMES ${PC_QWT_LIBRARIES} qwt6 qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION}
+-  NAMES ${PC_QWT_LIBRARIES} qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION} qwt
++  NAMES ${PC_QWT_LIBRARIES} qwt6 qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION} qwt
    HINTS
-+  /usr/local/lib/qt5
    ${PC_QWT_LIBDIR}
++  /usr/local/lib/qt5
    ${CMAKE_INSTALL_PREFIX}/lib
    ${CMAKE_INSTALL_PREFIX}/lib64
+   ${CMAKE_PREFIX_PATH}/lib

Modified: head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
==============================================================================
--- head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	Thu Apr  2 13:08:01 2020	(r530370)
@@ -1,4 +1,4 @@
---- docs/doxygen/Doxyfile.in.orig	2019-08-09 21:40:34 UTC
+--- docs/doxygen/Doxyfile.in.orig	2020-02-16 18:48:02 UTC
 +++ docs/doxygen/Doxyfile.in
 @@ -1848,7 +1848,7 @@ DOT_FONTSIZE           = 10
  # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to

Modified: head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
==============================================================================
--- head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h	Thu Apr  2 13:08:01 2020	(r530370)
@@ -1,4 +1,4 @@
---- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig	2019-08-09 21:40:34 UTC
+--- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig	2020-02-16 18:48:02 UTC
 +++ gr-vocoder/lib/gsm_fr_decode_ps_impl.h
 @@ -26,7 +26,11 @@
  #include <gnuradio/vocoder/gsm_fr_decode_ps.h>

Modified: head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
==============================================================================
--- head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h	Thu Apr  2 13:08:01 2020	(r530370)
@@ -1,4 +1,4 @@
---- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig	2019-08-11 18:52:58 UTC
+--- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig	2020-02-16 18:48:02 UTC
 +++ gr-vocoder/lib/gsm_fr_encode_sp_impl.h
 @@ -26,7 +26,11 @@
  #include <gnuradio/vocoder/gsm_fr_encode_sp.h>

Modified: head/comms/gnuradio/pkg-plist
==============================================================================
--- head/comms/gnuradio/pkg-plist	Thu Apr  2 13:07:22 2020	(r530369)
+++ head/comms/gnuradio/pkg-plist	Thu Apr  2 13:08:01 2020	(r530370)
@@ -18,9 +18,6 @@ bin/polar_channel_construction
 %%UHD%%bin/uhd_rx_nogui
 %%UHD%%bin/uhd_siggen
 %%UHD%%bin/uhd_siggen_gui
-bin/volk-config-info
-bin/volk_modtool
-bin/volk_profile
 %%ETCDIR%%/conf.d/00-grc-docs.conf
 %%ETCDIR%%/conf.d/gnuradio-runtime.conf
 %%ETCDIR%%/conf.d/gr-audio-alsa.conf
@@ -757,151 +754,6 @@ include/pmt/pmt.h
 include/pmt/pmt_pool.h
 include/pmt/pmt_serial_tags.h
 include/pmt/pmt_sugar.h
-include/volk/constants.h
-include/volk/saturation_arithmetic.h
-include/volk/volk.h
-include/volk/volk_16i_32fc_dot_prod_32fc.h
-include/volk/volk_16i_branch_4_state_8.h
-include/volk/volk_16i_convert_8i.h
-include/volk/volk_16i_max_star_16i.h
-include/volk/volk_16i_max_star_horizontal_16i.h
-include/volk/volk_16i_permute_and_scalar_add.h
-include/volk/volk_16i_s32f_convert_32f.h
-include/volk/volk_16i_x4_quad_max_star_16i.h
-include/volk/volk_16i_x5_add_quad_16i_x4.h
-include/volk/volk_16ic_convert_32fc.h
-include/volk/volk_16ic_deinterleave_16i_x2.h
-include/volk/volk_16ic_deinterleave_real_16i.h
-include/volk/volk_16ic_deinterleave_real_8i.h
-include/volk/volk_16ic_magnitude_16i.h
-include/volk/volk_16ic_s32f_deinterleave_32f_x2.h
-include/volk/volk_16ic_s32f_deinterleave_real_32f.h
-include/volk/volk_16ic_s32f_magnitude_32f.h
-include/volk/volk_16ic_x2_dot_prod_16ic.h
-include/volk/volk_16ic_x2_multiply_16ic.h
-include/volk/volk_16u_byteswap.h
-include/volk/volk_16u_byteswappuppet_16u.h
-include/volk/volk_32f_64f_add_64f.h
-include/volk/volk_32f_64f_multiply_64f.h
-include/volk/volk_32f_8u_polarbutterfly_32f.h
-include/volk/volk_32f_8u_polarbutterflypuppet_32f.h
-include/volk/volk_32f_accumulator_s32f.h
-include/volk/volk_32f_acos_32f.h
-include/volk/volk_32f_asin_32f.h
-include/volk/volk_32f_atan_32f.h
-include/volk/volk_32f_binary_slicer_32i.h
-include/volk/volk_32f_binary_slicer_8i.h
-include/volk/volk_32f_convert_64f.h
-include/volk/volk_32f_cos_32f.h
-include/volk/volk_32f_expfast_32f.h
-include/volk/volk_32f_index_max_16u.h
-include/volk/volk_32f_index_max_32u.h
-include/volk/volk_32f_invsqrt_32f.h
-include/volk/volk_32f_log2_32f.h
-include/volk/volk_32f_null_32f.h
-include/volk/volk_32f_s32f_32f_fm_detect_32f.h
-include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
-include/volk/volk_32f_s32f_convert_16i.h
-include/volk/volk_32f_s32f_convert_32i.h
-include/volk/volk_32f_s32f_convert_8i.h
-include/volk/volk_32f_s32f_mod_rangepuppet_32f.h
-include/volk/volk_32f_s32f_multiply_32f.h
-include/volk/volk_32f_s32f_normalize.h
-include/volk/volk_32f_s32f_power_32f.h
-include/volk/volk_32f_s32f_s32f_mod_range_32f.h
-include/volk/volk_32f_s32f_stddev_32f.h
-include/volk/volk_32f_sin_32f.h
-include/volk/volk_32f_sqrt_32f.h
-include/volk/volk_32f_stddev_and_mean_32f_x2.h
-include/volk/volk_32f_tan_32f.h
-include/volk/volk_32f_tanh_32f.h
-include/volk/volk_32f_x2_add_32f.h
-include/volk/volk_32f_x2_divide_32f.h
-include/volk/volk_32f_x2_dot_prod_16i.h
-include/volk/volk_32f_x2_dot_prod_32f.h
-include/volk/volk_32f_x2_fm_detectpuppet_32f.h
-include/volk/volk_32f_x2_interleave_32fc.h
-include/volk/volk_32f_x2_max_32f.h
-include/volk/volk_32f_x2_min_32f.h
-include/volk/volk_32f_x2_multiply_32f.h
-include/volk/volk_32f_x2_pow_32f.h
-include/volk/volk_32f_x2_s32f_interleave_16ic.h
-include/volk/volk_32f_x2_subtract_32f.h
-include/volk/volk_32f_x3_sum_of_poly_32f.h
-include/volk/volk_32fc_32f_add_32fc.h
-include/volk/volk_32fc_32f_dot_prod_32fc.h
-include/volk/volk_32fc_32f_multiply_32fc.h
-include/volk/volk_32fc_conjugate_32fc.h
-include/volk/volk_32fc_convert_16ic.h
-include/volk/volk_32fc_deinterleave_32f_x2.h
-include/volk/volk_32fc_deinterleave_64f_x2.h
-include/volk/volk_32fc_deinterleave_imag_32f.h
-include/volk/volk_32fc_deinterleave_real_32f.h
-include/volk/volk_32fc_deinterleave_real_64f.h
-include/volk/volk_32fc_index_max_16u.h
-include/volk/volk_32fc_index_max_32u.h
-include/volk/volk_32fc_magnitude_32f.h
-include/volk/volk_32fc_magnitude_squared_32f.h
-include/volk/volk_32fc_s32f_atan2_32f.h
-include/volk/volk_32fc_s32f_deinterleave_real_16i.h
-include/volk/volk_32fc_s32f_magnitude_16i.h
-include/volk/volk_32fc_s32f_power_32fc.h
-include/volk/volk_32fc_s32f_power_spectrum_32f.h
-include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h
-include/volk/volk_32fc_s32fc_multiply_32fc.h
-include/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
-include/volk/volk_32fc_s32fc_x2_rotator_32fc.h
-include/volk/volk_32fc_x2_add_32fc.h
-include/volk/volk_32fc_x2_conjugate_dot_prod_32fc.h
-include/volk/volk_32fc_x2_divide_32fc.h
-include/volk/volk_32fc_x2_dot_prod_32fc.h
-include/volk/volk_32fc_x2_multiply_32fc.h
-include/volk/volk_32fc_x2_multiply_conjugate_32fc.h
-include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f.h
-include/volk/volk_32fc_x2_square_dist_32f.h
-include/volk/volk_32i_s32f_convert_32f.h
-include/volk/volk_32i_x2_and_32i.h
-include/volk/volk_32i_x2_or_32i.h
-include/volk/volk_32u_byteswap.h
-include/volk/volk_32u_byteswappuppet_32u.h
-include/volk/volk_32u_popcnt.h
-include/volk/volk_32u_popcntpuppet_32u.h
-include/volk/volk_32u_reverse_32u.h
-include/volk/volk_64f_convert_32f.h
-include/volk/volk_64f_x2_add_64f.h
-include/volk/volk_64f_x2_max_64f.h
-include/volk/volk_64f_x2_min_64f.h
-include/volk/volk_64f_x2_multiply_64f.h
-include/volk/volk_64u_byteswap.h
-include/volk/volk_64u_byteswappuppet_64u.h
-include/volk/volk_64u_popcnt.h
-include/volk/volk_64u_popcntpuppet_64u.h
-include/volk/volk_8i_convert_16i.h
-include/volk/volk_8i_s32f_convert_32f.h
-include/volk/volk_8ic_deinterleave_16i_x2.h
-include/volk/volk_8ic_deinterleave_real_16i.h
-include/volk/volk_8ic_deinterleave_real_8i.h
-include/volk/volk_8ic_s32f_deinterleave_32f_x2.h
-include/volk/volk_8ic_s32f_deinterleave_real_32f.h
-include/volk/volk_8ic_x2_multiply_conjugate_16ic.h
-include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc.h
-include/volk/volk_8u_conv_k7_r2puppet_8u.h
-include/volk/volk_8u_x2_encodeframepolar_8u.h
-include/volk/volk_8u_x3_encodepolar_8u_x2.h
-include/volk/volk_8u_x3_encodepolarpuppet_8u.h
-include/volk/volk_8u_x4_conv_k7_r2_8u.h
-include/volk/volk_avx2_intrinsics.h
-include/volk/volk_avx_intrinsics.h
-include/volk/volk_common.h
-include/volk/volk_complex.h
-include/volk/volk_config_fixed.h
-include/volk/volk_cpu.h
-include/volk/volk_malloc.h
-include/volk/volk_neon_intrinsics.h
-include/volk/volk_prefs.h
-include/volk/volk_sse3_intrinsics.h
-include/volk/volk_sse_intrinsics.h
-include/volk/volk_typedefs.h
 lib/cmake/gnuradio/CMakeOverloads.cmake
 lib/cmake/gnuradio/CMakeParseArgumentsCopy.cmake
 lib/cmake/gnuradio/CodeCoverage.cmake
@@ -993,66 +845,60 @@ lib/cmake/gnuradio/gnuradio-zeromqTargets-%%CMAKE_BUIL
 lib/cmake/gnuradio/gnuradio-zeromqTargets.cmake
 lib/cmake/gnuradio/runtime_swigTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/gnuradio/runtime_swigTargets.cmake
-lib/cmake/volk/VolkConfig.cmake
-lib/cmake/volk/VolkConfigVersion.cmake
-lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/volk/VolkTargets.cmake
 lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.3.8.0
-lib/libgnuradio-analog.so.3.8.0.0
+lib/libgnuradio-analog.so.3.8.1
+lib/libgnuradio-analog.so.3.8.1.0
 lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.3.8.0
-lib/libgnuradio-audio.so.3.8.0.0
+lib/libgnuradio-audio.so.3.8.1
+lib/libgnuradio-audio.so.3.8.1.0
 lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.3.8.0
-lib/libgnuradio-blocks.so.3.8.0.0
+lib/libgnuradio-blocks.so.3.8.1
+lib/libgnuradio-blocks.so.3.8.1.0
 lib/libgnuradio-channels.so
-lib/libgnuradio-channels.so.3.8.0
-lib/libgnuradio-channels.so.3.8.0.0
+lib/libgnuradio-channels.so.3.8.1
+lib/libgnuradio-channels.so.3.8.1.0
 lib/libgnuradio-digital.so
-lib/libgnuradio-digital.so.3.8.0
-lib/libgnuradio-digital.so.3.8.0.0
+lib/libgnuradio-digital.so.3.8.1
+lib/libgnuradio-digital.so.3.8.1.0
 lib/libgnuradio-dtv.so
-lib/libgnuradio-dtv.so.3.8.0
-lib/libgnuradio-dtv.so.3.8.0.0
+lib/libgnuradio-dtv.so.3.8.1
+lib/libgnuradio-dtv.so.3.8.1.0
 lib/libgnuradio-fec.so
-lib/libgnuradio-fec.so.3.8.0
-lib/libgnuradio-fec.so.3.8.0.0
+lib/libgnuradio-fec.so.3.8.1
+lib/libgnuradio-fec.so.3.8.1.0
 lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.3.8.0
-lib/libgnuradio-fft.so.3.8.0.0
+lib/libgnuradio-fft.so.3.8.1
+lib/libgnuradio-fft.so.3.8.1.0
 lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.3.8.0
-lib/libgnuradio-filter.so.3.8.0.0
+lib/libgnuradio-filter.so.3.8.1
+lib/libgnuradio-filter.so.3.8.1.0
 lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.3.8.0
-lib/libgnuradio-pmt.so.3.8.0.0
+lib/libgnuradio-pmt.so.3.8.1
+lib/libgnuradio-pmt.so.3.8.1.0
 lib/libgnuradio-qtgui.so
-lib/libgnuradio-qtgui.so.3.8.0
-lib/libgnuradio-qtgui.so.3.8.0.0
+lib/libgnuradio-qtgui.so.3.8.1
+lib/libgnuradio-qtgui.so.3.8.1.0
 lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.3.8.0
-lib/libgnuradio-runtime.so.3.8.0.0
+lib/libgnuradio-runtime.so.3.8.1
+lib/libgnuradio-runtime.so.3.8.1.0
 lib/libgnuradio-trellis.so
-lib/libgnuradio-trellis.so.3.8.0
-lib/libgnuradio-trellis.so.3.8.0.0
+lib/libgnuradio-trellis.so.3.8.1
+lib/libgnuradio-trellis.so.3.8.1.0
 %%UHD%%lib/libgnuradio-uhd.so
-%%UHD%%lib/libgnuradio-uhd.so.3.8.0
-%%UHD%%lib/libgnuradio-uhd.so.3.8.0.0
+%%UHD%%lib/libgnuradio-uhd.so.3.8.1
+%%UHD%%lib/libgnuradio-uhd.so.3.8.1.0
 lib/libgnuradio-video-sdl.so
-lib/libgnuradio-video-sdl.so.3.8.0
-lib/libgnuradio-video-sdl.so.3.8.0.0
+lib/libgnuradio-video-sdl.so.3.8.1
+lib/libgnuradio-video-sdl.so.3.8.1.0
 lib/libgnuradio-vocoder.so
-lib/libgnuradio-vocoder.so.3.8.0
-lib/libgnuradio-vocoder.so.3.8.0.0
+lib/libgnuradio-vocoder.so.3.8.1
+lib/libgnuradio-vocoder.so.3.8.1.0
 lib/libgnuradio-wavelet.so
-lib/libgnuradio-wavelet.so.3.8.0
-lib/libgnuradio-wavelet.so.3.8.0.0
+lib/libgnuradio-wavelet.so.3.8.1
+lib/libgnuradio-wavelet.so.3.8.1.0
 lib/libgnuradio-zeromq.so
-lib/libgnuradio-zeromq.so.3.8.0
-lib/libgnuradio-zeromq.so.3.8.0.0
-lib/libvolk.so
-lib/libvolk.so.2.0
+lib/libgnuradio-zeromq.so.3.8.1
+lib/libgnuradio-zeromq.so.3.8.1.0
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo
@@ -2028,15 +1874,6 @@ lib/libvolk.so.2.0
 %%PYTHON_SITELIBDIR%%/pmt/pmt_to_python.py
 %%PYTHON_SITELIBDIR%%/pmt/pmt_to_python.pyc
 %%PYTHON_SITELIBDIR%%/pmt/pmt_to_python.pyo
-%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.py
-%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyc
-%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyo
-%%PYTHON_SITELIBDIR%%/volk_modtool/cfg.py
-%%PYTHON_SITELIBDIR%%/volk_modtool/cfg.pyc
-%%PYTHON_SITELIBDIR%%/volk_modtool/cfg.pyo
-%%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.py
-%%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.pyc
-%%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.pyo
 libdata/pkgconfig/gnuradio-analog.pc
 libdata/pkgconfig/gnuradio-audio.pc
 libdata/pkgconfig/gnuradio-blocks.pc
@@ -2054,7 +1891,6 @@ libdata/pkgconfig/gnuradio-video-sdl.pc
 libdata/pkgconfig/gnuradio-vocoder.pc
 libdata/pkgconfig/gnuradio-wavelet.pc
 libdata/pkgconfig/gnuradio-zeromq.pc
-libdata/pkgconfig/volk.pc
 libexec/gnuradio/grc_setup_freedesktop
 share/applications/gnuradio-grc.desktop
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
@@ -2846,19 +2682,15 @@ share/applications/gnuradio-grc.desktop
 %%DATADIR%%/grc/freedesktop/grc-icon-48.png
 %%DATADIR%%/grc/freedesktop/grc-icon-64.png
 %%DATADIR%%/modtool/templates/gr-newmod/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/MANIFEST.md
 %%DATADIR%%/modtool/templates/gr-newmod/apps/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/apps/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake
 %%DATADIR%%/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake
 %%DATADIR%%/modtool/templates/gr-newmod/cmake/Modules/targetConfig.cmake.in
 %%DATADIR%%/modtool/templates/gr-newmod/cmake/cmake_uninstall.cmake.in
 %%DATADIR%%/modtool/templates/gr-newmod/docs/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/docs/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/docs/README.howto
 %%DATADIR%%/modtool/templates/gr-newmod/docs/doxygen/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/docs/doxygen/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in
 %%DATADIR%%/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
 %%DATADIR%%/modtool/templates/gr-newmod/docs/doxygen/doxyxml/__init__.py
@@ -2875,17 +2707,12 @@ share/applications/gnuradio-grc.desktop
 %%DATADIR%%/modtool/templates/gr-newmod/docs/doxygen/swig_doc.py
 %%DATADIR%%/modtool/templates/gr-newmod/examples/README
 %%DATADIR%%/modtool/templates/gr-newmod/grc/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/grc/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/include/howto/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/include/howto/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/include/howto/api.h
 %%DATADIR%%/modtool/templates/gr-newmod/lib/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/lib/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/python/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/python/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/python/__init__.py
 %%DATADIR%%/modtool/templates/gr-newmod/swig/CMakeLists.txt
-%%DATADIR%%/modtool/templates/gr-newmod/swig/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/swig/howto_swig.i
 %%DATADIR%%/themes/alt.qss
 %%DATADIR%%/themes/dark.qss



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004021308.032D81kJ085662>