gnuradio-core: sync w/ pkgsrc to use external volk

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 04:46:16 2020 +0200
Changeset:	c6b90ac5a0930a3dbe8741a07bdbc0ca39a7cb8c

Modified Files:
	gnuradio-core/Makefile.common
	gnuradio-core/PLIST
	gnuradio-core/replace-python.mk

Log Message:
gnuradio-core: sync w/ pkgsrc to use external volk

(untested due to unrelated build errors)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c6b90ac5a0930a3dbe8741a07bdbc0ca39a7cb8c

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

diffstat:
 gnuradio-core/Makefile.common   |   6 +-
 gnuradio-core/PLIST             | 160 ----------------------------------------
 gnuradio-core/replace-python.mk |   7 +-
 3 files changed, 3 insertions(+), 170 deletions(-)

diffs:
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index fd5771b18f..48e4e19e4f 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -47,7 +47,6 @@ LDFLAGS.NetBSD+=	-lrt
 
 
 DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
-DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 # gr_filter_design in gnuradio-core ask for:
 DEPENDS+=	${PYPKGPREFIX}-qwt-qt5-[0-9]*:../../wip/py-qwt-qt5
@@ -86,7 +85,7 @@ CMAKE_ARGS+=	-DENABLE_GR_BLOCKS=ON
 CMAKE_ARGS+=	-DENABLE_GR_FFT=ON
 CMAKE_ARGS+=	-DENABLE_GR_FILTER=ON
 CMAKE_ARGS+=	-DENABLE_PYTHON=ON
-CMAKE_ARGS+=	-DENABLE_VOLK=ON
+CMAKE_ARGS+=	-DENABLE_VOLK=ON -DENABLE_INTERNAL_VOLK=OFF
 CMAKE_ARGS+=	-DCMAKE_HAVE_PTHREADS_CREATE=OFF
 
 # Default setting (for pkgsrc)
@@ -140,10 +139,9 @@ do-install:
 .include	"../../devel/boost-headers/buildlink3.mk"
 .include	"../../devel/boost-libs/buildlink3.mk"
 .include	"../../devel/cppunit/buildlink3.mk"
-# VOLK needs orc.h, so in the common
-.include	"../../devel/orc/buildlink3.mk"
 .include	"../../devel/swig2/buildlink3.mk"
 
 .include	"../../lang/python/application.mk"
 .include	"../../math/fftwf/buildlink3.mk"
 .include	"../../math/gsl/buildlink3.mk"
+.include	"../../math/volk/buildlink3.mk"
diff --git a/gnuradio-core/PLIST b/gnuradio-core/PLIST
index e24b112577..fa27923d8b 100644
--- a/gnuradio-core/PLIST
+++ b/gnuradio-core/PLIST
@@ -1,9 +1,6 @@
 @comment $NetBSD: PLIST,v 1.28 2018/08/13 05:56:29 dbj Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
-bin/volk-config-info
-bin/volk_modtool
-bin/volk_profile
 include/gnuradio/analog/agc.h
 include/gnuradio/analog/agc2.h
 include/gnuradio/analog/agc2_cc.h
@@ -500,149 +497,6 @@ include/pmt/pmt.h
 include/pmt/pmt_pool.h
 include/pmt/pmt_serial_tags.h
 include/pmt/pmt_sugar.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_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/CMakeMacroLibtoolFile.cmake
 lib/cmake/gnuradio/CMakeOverloads.cmake
 lib/cmake/gnuradio/CMakeParseArgumentsCopy.cmake
@@ -678,8 +532,6 @@ lib/cmake/gnuradio/GrTest.cmake
 lib/cmake/gnuradio/GrVersion.cmake
 lib/cmake/gnuradio/LibFindMacros.cmake
 lib/cmake/gnuradio/UseSWIG.cmake
-lib/cmake/volk/VolkConfig.cmake
-lib/cmake/volk/VolkConfigVersion.cmake
 lib/libgnuradio-analog.so
 lib/libgnuradio-analog.so.${PKGVERSION}
 lib/libgnuradio-audio.so
@@ -694,15 +546,12 @@ lib/libgnuradio-pmt.so
 lib/libgnuradio-pmt.so.${PKGVERSION}
 lib/libgnuradio-runtime.so
 lib/libgnuradio-runtime.so.${PKGVERSION}
-lib/libvolk.so
-lib/libvolk.so.1.4
 lib/pkgconfig/gnuradio-analog.pc
 lib/pkgconfig/gnuradio-audio.pc
 lib/pkgconfig/gnuradio-blocks.pc
 lib/pkgconfig/gnuradio-fft.pc
 lib/pkgconfig/gnuradio-filter.pc
 lib/pkgconfig/gnuradio-runtime.pc
-lib/pkgconfig/volk.pc
 ${PYSITELIB}/gnuradio/__init__.py
 ${PYSITELIB}/gnuradio/__init__.pyc
 ${PYSITELIB}/gnuradio/__init__.pyo
@@ -972,15 +821,6 @@ ${PYSITELIB}/pmt/pmt_swig.pyo
 ${PYSITELIB}/pmt/pmt_to_python.py
 ${PYSITELIB}/pmt/pmt_to_python.pyc
 ${PYSITELIB}/pmt/pmt_to_python.pyo
-${PYSITELIB}/volk_modtool/__init__.py
-${PYSITELIB}/volk_modtool/__init__.pyc
-${PYSITELIB}/volk_modtool/__init__.pyo
-${PYSITELIB}/volk_modtool/cfg.py
-${PYSITELIB}/volk_modtool/cfg.pyc
-${PYSITELIB}/volk_modtool/cfg.pyo
-${PYSITELIB}/volk_modtool/volk_modtool_generate.py
-${PYSITELIB}/volk_modtool/volk_modtool_generate.pyc
-${PYSITELIB}/volk_modtool/volk_modtool_generate.pyo
 share/doc/gnuradio-${PKGVERSION}/CHANGELOG.md
 share/doc/gnuradio-${PKGVERSION}/README.analog
 share/doc/gnuradio-${PKGVERSION}/README.audio
diff --git a/gnuradio-core/replace-python.mk b/gnuradio-core/replace-python.mk
index 92238e86ea..feb1d65193 100644
--- a/gnuradio-core/replace-python.mk
+++ b/gnuradio-core/replace-python.mk
@@ -380,9 +380,4 @@
     grc/blocks/variable_struct.block.yml.py  \
     grc/core/schema_checker/domain.py  \
     tools/clang_format.py  \
-    tools/template_convert.py  \
-    volk/apps/plot_best_vs_generic.py  \
-    volk/gen/volk_compile_utils.py  \
-    volk/gen/volk_tmpl_utils.py  \
-    volk/python/volk_modtool/__init__.py  \
-    volk/python/volk_modtool/cfg.py  \
+    tools/template_convert.py