From 9e65edad424c3221c1f3d0f5a7468f2b692ae7fa Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 17 Sep 2024 10:50:59 +0000
Subject: [PATCH] extra/libvolk to 3.1.2-3

---
 extra/libvolk/.SRCINFO        | 17 +++++----
 extra/libvolk/.nvchecker.toml |  4 ++
 extra/libvolk/PKGBUILD        | 69 +++++++++++++++++++----------------
 3 files changed, 51 insertions(+), 39 deletions(-)
 create mode 100644 extra/libvolk/.nvchecker.toml

diff --git a/extra/libvolk/.SRCINFO b/extra/libvolk/.SRCINFO
index 2f6d2dfd5..ac584657d 100644
--- a/extra/libvolk/.SRCINFO
+++ b/extra/libvolk/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = libvolk
 	pkgdesc = The Vector-Optimized Library of Kernels from Gnuradio
 	pkgver = 3.1.2
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 2
 	url = https://www.libvolk.org/
 	arch = x86_64
-	license = GPL3
+	license = LGPL-3.0-or-later
 	makedepends = cmake
+	makedepends = git
 	makedepends = python-mako
 	depends = gcc-libs
+	depends = glibc
 	depends = orc
 	depends = python
-	source = volk-3.1.2.tgz::https://github.com/gnuradio/volk/archive/v3.1.2.tar.gz
-	source = cpufeatures-0.9.0.tgz::https://github.com/google/cpu_features/archive/v0.9.0.tar.gz
-	validpgpkeys = 09E749D885FA881A7E84E823385323EE6402091D
-	validpgpkeys = D74F9F146E7F755783583158B343B2BA293E5174
-	sha256sums = 90082bf68d76d00aa6c35f8bff0e93891b4204d817e1a3ba829486b445f715dc
-	sha256sums = bdb3484de8297c49b59955c3b22dba834401bc2df984ef5cfc17acbe69c5018e
+	provides = libvolk.so
+	source = git+https://github.com/gnuradio/volk.git#tag=v3.1.2
+	source = git+https://github.com/google/cpu_features.git
+	sha256sums = 9b3b30f8428ae7813e1d0d22896b717b8dd802027869065c42d552157652e288
+	sha256sums = SKIP
 
 pkgname = libvolk
diff --git a/extra/libvolk/.nvchecker.toml b/extra/libvolk/.nvchecker.toml
new file mode 100644
index 000000000..d84afdf89
--- /dev/null
+++ b/extra/libvolk/.nvchecker.toml
@@ -0,0 +1,4 @@
+[libvolk]
+source = "git"
+git = "https://github.com/gnuradio/volk.git"
+prefix = "v"
diff --git a/extra/libvolk/PKGBUILD b/extra/libvolk/PKGBUILD
index 83340b248..87ff14f29 100644
--- a/extra/libvolk/PKGBUILD
+++ b/extra/libvolk/PKGBUILD
@@ -1,54 +1,61 @@
-# Maintainer:
+# Maintainer: Carl Smedstad <carsme@archlinux.org>
 # Contributor: Kyle Keen <keenerd@gmail.com>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - build v7 without neon to fix FTBFS
 
-_name=volk
 pkgname=libvolk
-epoch=2
+_pkgname=volk
 pkgver=3.1.2
-_cpuver=0.9.0
-pkgrel=2
+pkgrel=3
+epoch=2
 pkgdesc="The Vector-Optimized Library of Kernels from Gnuradio"
-arch=('x86_64')
+arch=(x86_64)
 url="https://www.libvolk.org/"
-license=('GPL3')
-depends=('gcc-libs' 'orc' 'python')
-makedepends=('cmake' 'python-mako')
-source=("volk-$pkgver.tgz::https://github.com/gnuradio/volk/archive/v$pkgver.tar.gz"
-        "cpufeatures-$_cpuver.tgz::https://github.com/google/cpu_features/archive/v$_cpuver.tar.gz")
-sha256sums=('90082bf68d76d00aa6c35f8bff0e93891b4204d817e1a3ba829486b445f715dc'
-            'bdb3484de8297c49b59955c3b22dba834401bc2df984ef5cfc17acbe69c5018e')
-validpgpkeys=('09E749D885FA881A7E84E823385323EE6402091D'
-              'D74F9F146E7F755783583158B343B2BA293E5174')
+license=(LGPL-3.0-or-later)
+depends=(
+  gcc-libs
+  glibc
+  orc
+  python
+)
+makedepends=(
+  cmake
+  git
+  python-mako
+)
+provides=(libvolk.so)
+source=(
+  "git+https://github.com/gnuradio/volk.git#tag=v$pkgver"
+  "git+https://github.com/google/cpu_features.git"
+)
+sha256sums=('9b3b30f8428ae7813e1d0d22896b717b8dd802027869065c42d552157652e288'
+            'SKIP')
 
 prepare() {
-  cd $_name-$pkgver
-  rmdir cpu_features
-  ln -sf "$srcdir/cpu_features-$_cpuver" cpu_features
+  cd $_pkgname
+  git submodule init
+  git config submodule.cpu_features.url "$srcdir/cpu_features"
+  git -c protocol.file.allow=always submodule update
 }
 
 build() {
-  local cmake_options=(
-    -B build
-    -D PYTHON_EXECUTABLE=/usr/bin/python
-    -D CMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects"
-    -D CMAKE_INSTALL_PREFIX=/usr
-    -W no-dev
-    -S $_name-$pkgver
-  )
-
+  cd $_pkgname
   [[ $CARCH == "armv7h" ]] && CFLAGS=`echo $CFLAGS | sed -e 's/neon/vfpv3/'` && CXXFLAGS="$CFLAGS"
-  export PYTHON_EXECUTABLE=/usr/bin/python
-  cmake "${cmake_options[@]}"
-  cmake --build build --verbose
+  cmake -S . -B build \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -Wno-dev
+  cmake --build build
 }
 
 check() {
-  ctest --test-dir build --output-on-failure -E 'check_lgpl'
+  cd $_pkgname
+  ctest --test-dir build --output-on-failure
 }
 
 package() {
+  cd $_pkgname
   DESTDIR="$pkgdir" cmake --install build
+  rm -vr "$pkgdir/usr/include/volk/asm"
 }