From 753d2165588b8c0afffadd005dbb2e89f573ddbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
 <4973094+kmilos@users.noreply.github.com>
Date: Wed, 23 Feb 2022 16:56:17 +0100
Subject: [PATCH] highway: update to 0.16.0

---
 mingw-w64-highway/PKGBUILD | 45 +++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/mingw-w64-highway/PKGBUILD b/mingw-w64-highway/PKGBUILD
index 0b919ce9c9..5d6992ccd4 100644
--- a/mingw-w64-highway/PKGBUILD
+++ b/mingw-w64-highway/PKGBUILD
@@ -3,28 +3,26 @@
 _realname=highway
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.15.0
+pkgver=0.16.0
 pkgrel=1
 pkgdesc="C++ library for SIMD (Single Instruction, Multiple Data) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/google/highway'
 license=('Apache-2.0')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 #checkdepends=("${MINGW_PACKAGE_PREFIX}-gtest")
 source=("${_realname}-${pkgver}.tar.gz"::"${url}/archive/refs/tags/${pkgver}.tar.gz")
-sha256sums=('4bbd4439eae08cf038f1c5cc5d9ebc6a1a50f2c610c13a1483adccacfa24c150')
+sha256sums=('746c9578446be6c5286e8846c5f0d4118c0c1f04219c401abadcb8a5f2051893')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
-
   declare -a extra_config
   if check_option "debug" "n"; then
     extra_config+=("-DCMAKE_BUILD_TYPE=Release")
@@ -32,12 +30,33 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
+  # Static build
+  [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
+
   CXXFLAGS+=" -DHWY_COMPILE_ALL_ATTAINABLE"
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       "${extra_config[@]}" \
+      -DBUILD_SHARED_LIBS=OFF \
+      -DBUILD_TESTING=OFF \
+      ../${_realname}-${pkgver}
+
+  ${MINGW_PREFIX}/bin/cmake --build .
+
+  # Shared build
+  [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared
+  mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
+
+  CXXFLAGS+=" -DHWY_COMPILE_ALL_ATTAINABLE"
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+    ${MINGW_PREFIX}/bin/cmake \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      "${extra_config[@]}" \
+      -DBUILD_SHARED_LIBS=ON \
       -DBUILD_TESTING=OFF \
       ../${_realname}-${pkgver}
 
@@ -46,13 +65,19 @@ build() {
 
 # Must build w/ -DBUILD_TESTING=ON and -DHWY_SYSTEM_GTEST=ON above
 #check() {
-#  cd "${srcdir}"/build-${MSYSTEM}
+#  cd "${srcdir}"/build-${MSYSTEM}-static
 #
 #  cmake --build . --target test
 #}
 
 package() {
-  cd "${srcdir}"/build-${MSYSTEM}
+  # Static install
+  cd "${srcdir}"/build-${MSYSTEM}-static
+
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+
+  # Shared install
+  cd "${srcdir}"/build-${MSYSTEM}-shared
 
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .