Attachment 231039 Details for Bug 261245 – patch to update from 2.2.1 to 2.5.0, and fix python shebang

[patch] patch to update from 2.2.1 to 2.5.0, and fix python shebang

patch-devel_volk_2.2.1-2.5.0.diff (text/plain), 3.71 KB, created by Rainer Hurling on 2022-01-16 12:17:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2022-01-16 12:17:12 UTC

Size: 3.71 KB

patch

obsolete

>diff --git a/devel/volk/Makefile b/devel/volk/Makefile
>index 11a8063d61..58eff16818 100644
>--- a/devel/volk/Makefile
>+++ b/devel/volk/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	volk
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.2.1
>+DISTVERSION=	2.5.0
> CATEGORIES=	devel comms hamradio
> 
> MAINTAINER=	hamradio@FreeBSD.org
>@@ -8,11 +8,15 @@ COMMENT=	Vector-Optimized Library of Kernels
> 
> LICENSE=	GPLv3
> 
>-LIB_DEPENDS=	liborc-0.4.so:devel/orc
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR}
>+LIB_DEPENDS=	liborc-0.4.so:devel/orc
> 
> USES=		cmake compiler:c++11-lang python:3.5+
> 
>+# The tarball does not contain sources for cpu_features
>+# and CMakeLists.txt does not handle external cpu_features
>+CMAKE_OFF=	VOLK_CPU_FEATURES
>+
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == armv7
>@@ -24,4 +28,15 @@ GH_ACCOUNT=	gnuradio
> 
> USE_LDCONFIG=	yes
> 
>+# Otherwise the shebang doubles in installed version.
>+# Found by running Q/A tests (stage-qa) with 'DEVELOPER=yes' in /etc/make.conf
>+post-patch:
>+	@${REINPLACE_CMD} -e '1d' \
>+		${WRKSRC}/python/volk_modtool/volk_modtool
>+
>+# Replace by full version
>+pre-install:
>+	@${REINPLACE_CMD} -e 's|#!/usr/local/bin/python3|#!/usr/local/bin/python${PYTHON_VER}|' \
>+		${WRKDIR}/.build/python/volk_modtool/volk_modtool.exe
>+
> .include <bsd.port.post.mk>
>diff --git a/devel/volk/distinfo b/devel/volk/distinfo
>index 14a6a5bc1c..e73e3d9569 100644
>--- a/devel/volk/distinfo
>+++ b/devel/volk/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1585921652
>-SHA256 (gnuradio-volk-v2.2.1_GH0.tar.gz) = 283d088f93774a55cb8be058b3d3b4a06d8bd44d6bc0016416f5a7818dd05db4
>-SIZE (gnuradio-volk-v2.2.1_GH0.tar.gz) = 330676
>+TIMESTAMP = 1642317684
>+SHA256 (gnuradio-volk-v2.5.0_GH0.tar.gz) = 468bebdb8c2ae9b82837ad08abd146dd9a9a48d3de7bea2d0095e4b1557b5299
>+SIZE (gnuradio-volk-v2.5.0_GH0.tar.gz) = 357828
>diff --git a/devel/volk/pkg-plist b/devel/volk/pkg-plist
>index e7431b6483..215cde463d 100644
>--- a/devel/volk/pkg-plist
>+++ b/devel/volk/pkg-plist
>@@ -37,6 +37,7 @@ 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_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
>@@ -44,6 +45,7 @@ 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_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
>@@ -75,6 +77,7 @@ 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_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
>@@ -90,6 +93,7 @@ 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_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
>@@ -154,7 +158,8 @@ lib/cmake/volk/VolkConfigVersion.cmake
> lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/volk/VolkTargets.cmake
> lib/libvolk.so
>-lib/libvolk.so.2.2.1
>+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

Actions: View | Diff

Attachments on bug 261245: 231039 | 233021