From ce1fbec7c0b9178845367ee78a21e94078b8df69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:18:19 -0400
Subject: [PATCH] volk: rebuild for Python 3.10, update to 2.5.0.

---
 common/shlibs         |  2 +-
 srcpkgs/volk/template | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 458f7dfcd1..b0b813ffc0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3224,7 +3224,7 @@ libarcan_a12.so.0.1 arcan-0.6.0_1
 liblwipv6.so.2 lwipv6-1.5a_1
 libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1
 libpipewire-0.3.so.0 libpipewire-0.3.6_1
-libvolk.so.2.2.1 volk-2.2.1_1
+libvolk.so.2.5 volk-2.5.0_1
 libgnuradio-runtime.so.3.8.0 gnuradio-3.8.0.0_1
 libgnuradio-pmt.so.3.8.0 gnuradio-3.8.0.0_1
 libgnuradio-blocks.so.3.8.0 gnuradio-3.8.0.0_1
diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template
index 2bbdd5b9b7..60de1486cf 100644
--- a/srcpkgs/volk/template
+++ b/srcpkgs/volk/template
@@ -1,23 +1,30 @@
 # Template file for 'volk'
 pkgname=volk
-version=2.2.1
-revision=2
+version=2.5.0
+revision=1
+_cpu_features_gitrev="a8397ba4591237c17d18e4acc091f5f3ebe7391e"
 build_style=cmake
 hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six"
-makedepends="boost-devel python3-cheetah3 python3-devel python3-Mako
- python3-six"
+makedepends="boost-devel python3-cheetah3 python3-devel python3-Mako python3-six"
 short_desc="Vector-Optimized Library of Kernels"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://libvolk.org/"
-distfiles="https://github.com/gnuradio/volk/archive/v${version}.tar.gz"
-checksum=283d088f93774a55cb8be058b3d3b4a06d8bd44d6bc0016416f5a7818dd05db4
+distfiles="https://github.com/gnuradio/volk/archive/v${version}.tar.gz
+ https://github.com/google/cpu_features/archive/${_cpu_features_gitrev}.tar.gz"
+checksum="468bebdb8c2ae9b82837ad08abd146dd9a9a48d3de7bea2d0095e4b1557b5299
+ b47031a2a9ab04cb6514285103e51ba92c8f0bf28470cce911ac0c9af781c307"
 
 case "$XBPS_TARGET_MACHINE" in
 	armv6l*)
 		configure_args="-Dhave_mfpu_neon=0";;
 esac
 
+post_extract() {
+	rm -rf cpu_features
+	mv ../cpu_features-${_cpu_features_gitrev} cpu_features
+}
+
 volk-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"