From 3c8a72de323b95699aeeba37340f9ba599ca6b70 Mon Sep 17 00:00:00 2001
From: Zach Bacon <zachbacon@vba-m.com>
Date: Sun, 4 Jul 2021 02:48:03 -0400
Subject: [PATCH] openal: Let's change the cmake generator from msys makefiles
 to ninja

---
 mingw-w64-openal/PKGBUILD | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mingw-w64-openal/PKGBUILD b/mingw-w64-openal/PKGBUILD
index 3f905e92f0..0ee5d86a04 100644
--- a/mingw-w64-openal/PKGBUILD
+++ b/mingw-w64-openal/PKGBUILD
@@ -4,7 +4,7 @@ _realname=openal
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.21.0
-pkgrel=2
+pkgrel=3
 pkgdesc="OpenAL audio library for use with opengl (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -13,6 +13,7 @@ license=('GPL2')
 depends=("${MINGW_PACKAGE_PREFIX}-libmysofa")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-fluidsynth"
              "${MINGW_PACKAGE_PREFIX}-portaudio")
 options=('strip' 'staticlibs')
@@ -55,7 +56,7 @@ build() {
   DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST} \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     "${extra_config[@]}" \
     -DALSOFT_EXAMPLES=OFF \
@@ -66,7 +67,7 @@ build() {
     -DDSOUND_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libdsound.a \
     -DWINMM_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libwinmm.a \
     ../openal-soft-openal-soft-${pkgver}
-  make
+  ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   [[ -d "${srcdir}"/static-${MINGW_CHOST} ]] && rm -rf ${srcdir}/static-${MINGW_CHOST}
   mkdir -p "${srcdir}/static-${MINGW_CHOST}" && cd "${srcdir}/static-${MINGW_CHOST}"
@@ -75,7 +76,7 @@ build() {
   DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST} \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     "${extra_config[@]}" \
     -DALSOFT_EXAMPLES=OFF \
@@ -86,13 +87,13 @@ build() {
     -DDSOUND_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libdsound.a \
     -DWINMM_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libwinmm.a \
     ../openal-soft-openal-soft-${pkgver}
-  make
+  ${MINGW_PREFIX}/bin/cmake.exe --build ./
 }
 
 package() {
   cd "${srcdir}/static-${MINGW_CHOST}"
-  make DESTDIR=${pkgdir} install
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   cd "${srcdir}/shared-${MINGW_CHOST}"
-  make DESTDIR=${pkgdir} install
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 }