Attachment #231039 for bug #261245

Lines 1-6 Link Here

(-)b/devel/volk/Makefile (-2 / +17 lines)
1	PORTNAME= volk	1	PORTNAME= volk
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.2.1	3	DISTVERSION= 2.5.0
4	CATEGORIES= devel comms hamradio	4	CATEGORIES= devel comms hamradio
5		5
6	MAINTAINER= hamradio@FreeBSD.org	6	MAINTAINER= hamradio@FreeBSD.org
Lines 8-18 COMMENT= Vector-Optimized Library of Kernels Link Here
8		8
9	LICENSE= GPLv3	9	LICENSE= GPLv3
10		10
11	LIB_DEPENDS= liborc-0.4.so:devel/orc
12	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR}	11	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR}
		12	LIB_DEPENDS= liborc-0.4.so:devel/orc
13		13
14	USES= cmake compiler:c++11-lang python:3.5+	14	USES= cmake compiler:c++11-lang python:3.5+
15		15
		16	# The tarball does not contain sources for cpu_features
		17	# and CMakeLists.txt does not handle external cpu_features
		18	CMAKE_OFF= VOLK_CPU_FEATURES
		19
16	.include <bsd.port.pre.mk>	20	.include <bsd.port.pre.mk>
17		21
18	.if ${ARCH} == armv7	22	.if ${ARCH} == armv7
Lines 24-27 GH_ACCOUNT= gnuradio Link Here
24		28
25	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
26		30
		31	# Otherwise the shebang doubles in installed version.
		32	# Found by running Q/A tests (stage-qa) with 'DEVELOPER=yes' in /etc/make.conf
		33	post-patch:
		34	@${REINPLACE_CMD} -e '1d' \
		35	${WRKSRC}/python/volk_modtool/volk_modtool
		36
		37	# Replace by full version
		38	pre-install:
		39	@${REINPLACE_CMD} -e 's\|#!/usr/local/bin/python3\|#!/usr/local/bin/python${PYTHON_VER}\|' \
		40	${WRKDIR}/.build/python/volk_modtool/volk_modtool.exe
		41
27	.include <bsd.port.post.mk>	42	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/devel/volk/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1585921652	1	TIMESTAMP = 1642317684
2	SHA256 (gnuradio-volk-v2.2.1_GH0.tar.gz) = 283d088f93774a55cb8be058b3d3b4a06d8bd44d6bc0016416f5a7818dd05db4	2	SHA256 (gnuradio-volk-v2.5.0_GH0.tar.gz) = 468bebdb8c2ae9b82837ad08abd146dd9a9a48d3de7bea2d0095e4b1557b5299
3	SIZE (gnuradio-volk-v2.2.1_GH0.tar.gz) = 330676	3	SIZE (gnuradio-volk-v2.5.0_GH0.tar.gz) = 357828




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_exp_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_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_add_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_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_accumulator_s32fc.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_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_spectral_densitypuppet_32f.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

lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/volk/VolkTargets.cmake
lib/libvolk.so
lib/libvolk.so.2.5
lib/libvolk.so.2.5.0
%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.py
%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyc
%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyo

Return to bug 261245

Lines 37-42 include/volk/volk_32f_binary_slicer_32i.h Link Here

(-)b/devel/volk/pkg-plist (-1 / +6 lines)
37	include/volk/volk_32f_binary_slicer_8i.h	37	include/volk/volk_32f_binary_slicer_8i.h
38	include/volk/volk_32f_convert_64f.h	38	include/volk/volk_32f_convert_64f.h
39	include/volk/volk_32f_cos_32f.h	39	include/volk/volk_32f_cos_32f.h
		40	include/volk/volk_32f_exp_32f.h
40	include/volk/volk_32f_expfast_32f.h	41	include/volk/volk_32f_expfast_32f.h
41	include/volk/volk_32f_index_max_16u.h	42	include/volk/volk_32f_index_max_16u.h
42	include/volk/volk_32f_index_max_32u.h	43	include/volk/volk_32f_index_max_32u.h
Lines 44-49 include/volk/volk_32f_invsqrt_32f.h Link Here
44	include/volk/volk_32f_log2_32f.h	45	include/volk/volk_32f_log2_32f.h
45	include/volk/volk_32f_null_32f.h	46	include/volk/volk_32f_null_32f.h
46	include/volk/volk_32f_s32f_32f_fm_detect_32f.h	47	include/volk/volk_32f_s32f_32f_fm_detect_32f.h
		48	include/volk/volk_32f_s32f_add_32f.h
47	include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h	49	include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
48	include/volk/volk_32f_s32f_convert_16i.h	50	include/volk/volk_32f_s32f_convert_16i.h
49	include/volk/volk_32f_s32f_convert_32i.h	51	include/volk/volk_32f_s32f_convert_32i.h
Lines 75-80 include/volk/volk_32f_x3_sum_of_poly_32f.h Link Here
75	include/volk/volk_32fc_32f_add_32fc.h	77	include/volk/volk_32fc_32f_add_32fc.h
76	include/volk/volk_32fc_32f_dot_prod_32fc.h	78	include/volk/volk_32fc_32f_dot_prod_32fc.h
77	include/volk/volk_32fc_32f_multiply_32fc.h	79	include/volk/volk_32fc_32f_multiply_32fc.h
		80	include/volk/volk_32fc_accumulator_s32fc.h
78	include/volk/volk_32fc_conjugate_32fc.h	81	include/volk/volk_32fc_conjugate_32fc.h
79	include/volk/volk_32fc_convert_16ic.h	82	include/volk/volk_32fc_convert_16ic.h
80	include/volk/volk_32fc_deinterleave_32f_x2.h	83	include/volk/volk_32fc_deinterleave_32f_x2.h
Lines 90-95 include/volk/volk_32fc_s32f_atan2_32f.h Link Here
90	include/volk/volk_32fc_s32f_deinterleave_real_16i.h	93	include/volk/volk_32fc_s32f_deinterleave_real_16i.h
91	include/volk/volk_32fc_s32f_magnitude_16i.h	94	include/volk/volk_32fc_s32f_magnitude_16i.h
92	include/volk/volk_32fc_s32f_power_32fc.h	95	include/volk/volk_32fc_s32f_power_32fc.h
		96	include/volk/volk_32fc_s32f_power_spectral_densitypuppet_32f.h
93	include/volk/volk_32fc_s32f_power_spectrum_32f.h	97	include/volk/volk_32fc_s32f_power_spectrum_32f.h
94	include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h	98	include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h
95	include/volk/volk_32fc_s32fc_multiply_32fc.h	99	include/volk/volk_32fc_s32fc_multiply_32fc.h
Lines 154-160 lib/cmake/volk/VolkConfigVersion.cmake Link Here
154	lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake	158	lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
155	lib/cmake/volk/VolkTargets.cmake	159	lib/cmake/volk/VolkTargets.cmake
156	lib/libvolk.so	160	lib/libvolk.so
157	lib/libvolk.so.2.2.1	161	lib/libvolk.so.2.5
		162	lib/libvolk.so.2.5.0
158	%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.py	163	%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.py
159	%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyc	164	%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyc
160	%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyo	165	%%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyo