volk: update to 2.5.1

Now correctly detects external devel/cpu_features package, so remove
patches for that. Also remove boost dependency since the package was
changed to use C++17 instead of boost.

5 files changed, 11 insertions, 53 deletions

diff --git a/math/volk/Makefile b/math/volk/Makefile
index 568aefa4bc1..73f446968d0 100644
--- a/math/volk/Makefile
+++ b/math/volk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2022/01/10 01:46:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2022/03/11 20:59:42 tnn Exp $
 
-DISTNAME=	volk-2.5.0
-PKGREVISION=	1
+DISTNAME=	volk-2.5.1
 CATEGORIES=	math ham
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gnuradio/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -28,7 +27,6 @@ USE_TOOLS+=	pkg-config
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 
 .include "../../devel/orc/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
 .if	${MACHINE_ARCH:M*arm*} ||		\
 	${MACHINE_ARCH} == "aarch64" ||		\
 	${MACHINE_ARCH} == "i386" ||		\
diff --git a/math/volk/PLIST b/math/volk/PLIST
index e6d88cdbc07..d4e5b8b05f7 100644
--- a/math/volk/PLIST
+++ b/math/volk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/12/11 14:03:21 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/03/11 20:59:42 tnn Exp $
 bin/volk-config-info
 bin/volk_modtool
 bin/volk_profile
@@ -42,6 +42,8 @@ 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_index_min_16u.h
+include/volk/volk_32f_index_min_32u.h
 include/volk/volk_32f_invsqrt_32f.h
 include/volk/volk_32f_log2_32f.h
 include/volk/volk_32f_null_32f.h
@@ -88,6 +90,8 @@ 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_index_min_16u.h
+include/volk/volk_32fc_index_min_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
diff --git a/math/volk/distinfo b/math/volk/distinfo
index 0429351c5d8..ad718de06b2 100644
--- a/math/volk/distinfo
+++ b/math/volk/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/12/11 14:03:21 tnn Exp $
+$NetBSD: distinfo,v 1.7 2022/03/11 20:59:42 tnn Exp $
 
-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
+BLAKE2s (volk-2.5.1.tar.gz) = d9e7d750c196691e9a5963f62393aef8b52d48cf7f4f6016c27cdc711ad837b9
+SHA512 (volk-2.5.1.tar.gz) = cc2029fd401761549b5095c72d193a7636af4589508e6a5dad24ea46515fddd957e010ccefdbfe86ff479dbf979c9e0d9de1d7789f28703ac27c7c195a4f7f5e
+Size (volk-2.5.1.tar.gz) = 388203 bytes
 SHA1 (patch-include_volk_volk__common.h) = 53e7aa38deaa9cdf68ca12fff6c176be471cf162
 SHA1 (patch-include_volk_volk__complex.h) = a7b161754abcc0433e93c79c78db8bfde71a4ba2
-SHA1 (patch-lib_CMakeLists.txt) = feb42e616834ff1f4cec7e38c608cba7716fcf94
diff --git a/math/volk/patches/patch-CMakeLists.txt b/math/volk/patches/patch-CMakeLists.txt
deleted file mode 100644
index e9c0811fae0..00000000000
--- a/math/volk/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2021/04/05 11:58:57 tnn Exp $
-
-Use devel/cpu_features from pkgsrc since the volk release tarball doesn't
-bundle it and we need to patch cpu_features anyway.
-
---- CMakeLists.txt.orig	2020-12-17 15:49:06.000000000 +0000
-+++ CMakeLists.txt
-@@ -122,17 +122,8 @@ else()
-   option(VOLK_CPU_FEATURES "Volk uses cpu_features" OFF)
- endif()
- if (VOLK_CPU_FEATURES)
--  if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cpu_features/CMakeLists.txt" )
--    message(FATAL_ERROR "cpu_features/CMakeLists.txt not found. Did you forget to git clone recursively?\nFix with: git submodule update --init")
--  endif()
-   message(STATUS "Building Volk with cpu_features")
--  set(BUILD_PIC ON CACHE BOOL
--    "Build cpu_features with Position Independent Code (PIC)."
--    FORCE)
--  set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
--  set(BUILD_SHARED_LIBS OFF)
--  add_subdirectory(cpu_features)
--  set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
-+  find_package(CpuFeatures)
- else()
-   message(STATUS "Building Volk without cpu_features")
- endif()
diff --git a/math/volk/patches/patch-lib_CMakeLists.txt b/math/volk/patches/patch-lib_CMakeLists.txt
deleted file mode 100644
index b44a6abe577..00000000000
--- a/math/volk/patches/patch-lib_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lib_CMakeLists.txt,v 1.2 2021/04/05 11:58:57 tnn Exp $
-
-Use devel/cpu_features from pkgsrc since the volk release tarball doesn't
-bundle it and we need to patch cpu_features anyway.
-
---- lib/CMakeLists.txt.orig	2020-12-17 15:49:06.000000000 +0000
-+++ lib/CMakeLists.txt
-@@ -517,7 +517,7 @@ target_include_directories(volk_obj
- if(VOLK_CPU_FEATURES)
-   set_source_files_properties(volk_cpu.c PROPERTIES COMPILE_DEFINITIONS "VOLK_CPU_FEATURES=1")
-   target_include_directories(volk_obj
--    PRIVATE $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
-+    PRIVATE $<TARGET_PROPERTY:CpuFeatures::cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
- )
- endif()
-