Update to 1.23.1

2 files changed, 29 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c444a99454a..d25cb88116fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = mingw-w64-openal
 	pkgdesc = Cross-platform 3D audio library, software implementation (mingw-w64)
-	pkgver = 1.20.1
+	pkgver = 1.23.1
 	pkgrel = 1
 	url = https://github.com/kcat/openal-soft
 	arch = any
 	license = LGPL
 	makedepends = mingw-w64-cmake
+	makedepends = ninja
 	depends = mingw-w64-crt
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/kcat/openal-soft/archive/openal-soft-1.20.1.tar.gz
-	sha256sums = c32d10473457a8b545aab50070fe84be2b5b041e1f2099012777ee6be0057c13
+	source = https://openal-soft.org/openal-releases/openal-soft-1.23.1.tar.bz2
+	sha256sums = 796f4b89134c4e57270b7f0d755f0fa3435b90da437b745160a49bd41c845b21
 
 pkgname = mingw-w64-openal
-
diff --git a/PKGBUILD b/PKGBUILD
index 917973e52f6e..e99d299ade00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,46 @@
 pkgname=mingw-w64-openal
-pkgver=1.20.1
+pkgver=1.23.1
 pkgrel=1
 pkgdesc="Cross-platform 3D audio library, software implementation (mingw-w64)"
 arch=(any)
 url="https://github.com/kcat/openal-soft"
 license=('LGPL')
 depends=('mingw-w64-crt')
-makedepends=('mingw-w64-cmake')
+makedepends=('mingw-w64-cmake' 'ninja')
 options=(!strip !buildflags staticlibs)
-source=("https://github.com/kcat/openal-soft/archive/openal-soft-$pkgver.tar.gz")
-sha256sums=('c32d10473457a8b545aab50070fe84be2b5b041e1f2099012777ee6be0057c13')
+source=("https://openal-soft.org/openal-releases/openal-soft-${pkgver}.tar.bz2")
+sha256sums=('796f4b89134c4e57270b7f0d755f0fa3435b90da437b745160a49bd41c845b21')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-  cd "${srcdir}/openal-soft-openal-soft-$pkgver"
-
-  # static
   for _arch in ${_architectures}; do
-    mkdir -p build-static-${_arch} && pushd build-static-${_arch}
-    ${_arch}-cmake -DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DCMAKE_BUILD_TYPE=Release -DLIBTYPE=STATIC ..
-    make
-    popd
-  done
+    BUILD_OPTS=("-DCMAKE_INSTALL_PREFIX=/usr/${_arch}"
+      '-DCMAKE_BUILD_TYPE=Release'
+      '-DALSOFT_EXAMPLES=OFF'
+      '-DALSOFT_UTILS=OFF')
 
-  # shared
-  for _arch in ${_architectures}; do
-    mkdir -p build-shared-${_arch} && pushd build-shared-${_arch}
-    ${_arch}-cmake -DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DCMAKE_BUILD_TYPE=Release -DLIBTYPE=SHARED ..
-    make
-    popd
+    ${_arch}-cmake -S openal-soft-${pkgver} -B build/${_arch}-static -G Ninja \
+      -DBUILD_SHARED_LIBS=OFF \
+      -DLIBTYPE=STATIC \
+      ${BUILD_OPTS[@]}
+
+    ${_arch}-cmake -S openal-soft-${pkgver} -B build/${_arch} -G Ninja \
+      -DBUILD_SHARED_LIBS=ON \
+      -DLIBTYPE=SHARED \
+      ${BUILD_OPTS[@]}
+
+    cmake --build build/${_arch}-static
+    cmake --build build/${_arch}
   done
 }
 
 package() {
-  # static
-  for _arch in ${_architectures}; do
-    cd "${srcdir}/openal-soft-openal-soft-$pkgver/build-static-${_arch}"
-    make DESTDIR="${pkgdir}" install
-    rm -r "$pkgdir"/usr/${_arch}/share
-    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
-  done
-
-  # shared
   for _arch in ${_architectures}; do
-    cd "${srcdir}/openal-soft-openal-soft-$pkgver/build-shared-${_arch}"
-    make DESTDIR="${pkgdir}" install
-    rm -r "$pkgdir"/usr/${_arch}/share
-    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    DESTDIR="${pkgdir}" cmake --install build/${_arch}-static
+    DESTDIR="${pkgdir}" cmake --install build/${_arch}
+    rm -r "${pkgdir}"/usr/${_arch}/share
+    ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
   done
 }