CVS commit: pkgsrc/math/volk

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Dec 11 14:03:21 UTC 2021

Modified Files:
        pkgsrc/math/volk: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/math/volk/patches: patch-include_volk_volk__complex.h

Log Message:
volk: update to 2.5.0

Kernels
    volk_32f_stddev_and_mean_32f_x2: implemented Young and Cramer's algorithm
    volk_32fc_accumulator_s32fc: Add new kernel
    volk_16ic_x2_dot_prod_16ic_u_avx2: Fix Typo, was _axv2.
    Remove _mm256_zeroupper() calls
    Enforce consistent function prototypes
    32fc_index_max: Improve speed of AVX2 version
    conv_k7_r2: Disable broken AVX2 code
    improve volk_8i_s32f_convert_32f for ARM NEON
    Calculate cos in AVX512F
    Calculate sin using AVX512F
Build
    Fix python version detection
    cmake: Check that 'distutils' is available
    c11: Remove pre-C11 preprocessor instructions


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/volk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/volk/PLIST \
    pkgsrc/math/volk/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/volk/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/math/volk/patches/patch-include_volk_volk__complex.h

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

Modified files:

Index: pkgsrc/math/volk/Makefile
diff -u pkgsrc/math/volk/Makefile:1.7 pkgsrc/math/volk/Makefile:1.8
--- pkgsrc/math/volk/Makefile:1.7       Wed Sep 29 19:00:59 2021
+++ pkgsrc/math/volk/Makefile   Sat Dec 11 14:03:21 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2021/09/29 19:00:59 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/11 14:03:21 tnn Exp $
 
-DISTNAME=      volk-2.4.1
-PKGREVISION=   2
+DISTNAME=      volk-2.5.0
 CATEGORIES=    math ham
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gnuradio/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/math/volk/PLIST
diff -u pkgsrc/math/volk/PLIST:1.2 pkgsrc/math/volk/PLIST:1.3
--- pkgsrc/math/volk/PLIST:1.2  Mon Dec 14 19:04:40 2020
+++ pkgsrc/math/volk/PLIST      Sat Dec 11 14:03:21 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/12/14 19:04:40 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/12/11 14:03:21 tnn Exp $
 bin/volk-config-info
 bin/volk_modtool
 bin/volk_profile
@@ -78,6 +78,7 @@ include/volk/volk_32f_x3_sum_of_poly_32f
 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
@@ -158,7 +159,8 @@ lib/cmake/volk/VolkConfigVersion.cmake
 lib/cmake/volk/VolkTargets-release.cmake
 lib/cmake/volk/VolkTargets.cmake
 lib/libvolk.so
-lib/libvolk.so.2.4
+lib/libvolk.so.2.5
+lib/libvolk.so.${PKGVERSION}
 lib/pkgconfig/volk.pc
 ${PYSITELIB}/volk_modtool/__init__.py
 ${PYSITELIB}/volk_modtool/__init__.pyc
Index: pkgsrc/math/volk/buildlink3.mk
diff -u pkgsrc/math/volk/buildlink3.mk:1.2 pkgsrc/math/volk/buildlink3.mk:1.3
--- pkgsrc/math/volk/buildlink3.mk:1.2  Mon Dec 14 19:04:40 2020
+++ pkgsrc/math/volk/buildlink3.mk      Sat Dec 11 14:03:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/12/14 19:04:40 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/12/11 14:03:21 tnn Exp $
 
 BUILDLINK_TREE+=       volk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        volk
 VOLK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.volk+=   volk>=2.3.0
-BUILDLINK_ABI_DEPENDS.volk+=   volk>=2.4.0
+BUILDLINK_ABI_DEPENDS.volk+=   volk>=2.5.0
 BUILDLINK_PKGSRCDIR.volk?=     ../../math/volk
 
 .include "../../devel/orc/buildlink3.mk"

Index: pkgsrc/math/volk/distinfo
diff -u pkgsrc/math/volk/distinfo:1.5 pkgsrc/math/volk/distinfo:1.6
--- pkgsrc/math/volk/distinfo:1.5       Tue Oct 26 10:56:11 2021
+++ pkgsrc/math/volk/distinfo   Sat Dec 11 14:03:21 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:56:11 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/12/11 14:03:21 tnn Exp $
 
-BLAKE2s (volk-2.4.1.tar.gz) = afb9fb2b121b2cb5e222b741f6a37a9db61d395fd211dbad6019ee3678a415f4
-SHA512 (volk-2.4.1.tar.gz) = 11b4d6428692e759eb634adb8df5cd1603dc45def3d0985f77249fb93c364be30da9d37d325da5e455409f376a88ef2cd6d6e878a1ece4a204f0dded4fbc4d3c
-Size (volk-2.4.1.tar.gz) = 347313 bytes
+BLAKE2s (volk-2.5.0.tar.gz) = 17b4532c0bb6596aae8b4b83f877ab553957e6f909efe5755c9adb96b8f9c11c
+SHA512 (volk-2.5.0.tar.gz) = 60b9d3aae57a3c0b40d5d5830f585b141245eb61e3d9991576f2bd8daad93bbe9938c963427e150edaff8f93b5e3d851a5736950d6573a955c4516255f43c00d
+Size (volk-2.5.0.tar.gz) = 357828 bytes
 SHA1 (patch-CMakeLists.txt) = dbae634e6db7e70132dd3e62593fe8ee0ee096c7
 SHA1 (patch-include_volk_volk__common.h) = 53e7aa38deaa9cdf68ca12fff6c176be471cf162
-SHA1 (patch-include_volk_volk__complex.h) = 248bf10c03364f7338f03cbaa4ddc8047da9c775
+SHA1 (patch-include_volk_volk__complex.h) = a7b161754abcc0433e93c79c78db8bfde71a4ba2
 SHA1 (patch-lib_CMakeLists.txt) = feb42e616834ff1f4cec7e38c608cba7716fcf94

Index: pkgsrc/math/volk/patches/patch-include_volk_volk__complex.h
diff -u pkgsrc/math/volk/patches/patch-include_volk_volk__complex.h:1.1 pkgsrc/math/volk/patches/patch-include_volk_volk__complex.h:1.2
--- pkgsrc/math/volk/patches/patch-include_volk_volk__complex.h:1.1     Sat Aug  1 04:35:09 2020
+++ pkgsrc/math/volk/patches/patch-include_volk_volk__complex.h Sat Dec 11 14:03:21 2021
@@ -1,19 +1,18 @@
-$NetBSD: patch-include_volk_volk__complex.h,v 1.1 2020/08/01 04:35:09 tnn Exp $
+$NetBSD: patch-include_volk_volk__complex.h,v 1.2 2021/12/11 14:03:21 tnn Exp $
 
 For some reason <tgmath.h> is only available in C++ mode ...
 
---- include/volk/volk_complex.h.orig   2020-05-09 10:58:32.000000000 +0000
+--- include/volk/volk_complex.h.orig   2021-06-05 11:01:46.000000000 +0000
 +++ include/volk/volk_complex.h
-@@ -58,7 +58,12 @@ inline T lv_conj(const T& x)
- #if __STDC_VERSION__ >= 199901L /* C99 check */
- /* this allows us to conj in lv_conj without the double detour for single-precision floats
-  */
-+#if defined(__NetBSD__) && !defined(__cplusplus)
+@@ -56,7 +56,11 @@ inline T lv_conj(const T& x)
+ #else /* __cplusplus */
+ 
+ #include <complex.h>
++#if defined(__NetBSD__)
 +#include <math.h>
-+#include <complex.h> 
 +#else
  #include <tgmath.h>
 +#endif
- #endif /* C99 check */
  
- #include <complex.h>
+ typedef char complex lv_8sc_t;
+ typedef short complex lv_16sc_t;