Sync with extra/openal

2 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d280df5c1f7..8b463d6f0c12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = openal-git
 	pkgdesc = Cross-platform 3D audio library, software implementation
-	pkgver = 1.18.1.r0.gbf9c3640
+	pkgver = 1.18.1.r4.g8a735d0b
 	pkgrel = 1
 	url = https://github.com/kcat/openal-soft
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	makedepends = alsa-lib
-	makedepends = pkgconfig
-	makedepends = cmake
 	makedepends = libpulse
-	makedepends = qt5-base
 	makedepends = fluidsynth
 	makedepends = portaudio
 	makedepends = jack
+	makedepends = qt5-base
 	makedepends = sdl2
 	makedepends = sdl_sound
 	makedepends = ffmpeg
 	makedepends = git
+	makedepends = cmake
+	makedepends = ninja
 	depends = glibc
 	source = git+https://github.com/kcat/openal-soft
 	md5sums = SKIP
@@ -25,15 +25,15 @@ pkgbase = openal-git
 pkgname = openal-git
 	optdepends = qt5-base: alsoft-config GUI Configurator
 	optdepends = fluidsynth: MIDI rendering
-	provides = openal=1.18.1.r0.gbf9c3640
+	provides = openal=1.18.1.r4.g8a735d0b
 	conflicts = openal
 
 pkgname = openal-examples-git
 	pkgdesc = Cross-platform 3D audio library, software implementation (example programs)
-	depends = openal-git=1.18.1.r0.gbf9c3640-1
+	depends = openal-git=1.18.1.r4.g8a735d0b-1
 	depends = sdl2
 	depends = sdl_sound
 	depends = ffmpeg
-	provides = openal-examples=1.18.1.r0.gbf9c3640
+	provides = openal-examples=1.18.1.r4.g8a735d0b
 	conflicts = openal-examples
 
diff --git a/PKGBUILD b/PKGBUILD
index c8e5544db354..e8a8595ad175 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,15 @@
 
 pkgbase=openal-git
 pkgname=(openal-git openal-examples-git)
-pkgver=1.18.1.r0.gbf9c3640
+pkgver=1.18.1.r4.g8a735d0b
 pkgrel=1
 pkgdesc="Cross-platform 3D audio library, software implementation"
 arch=(i686 x86_64)
 url="https://github.com/kcat/openal-soft"
 license=(LGPL)
 depends=(glibc)
-makedepends=(alsa-lib pkgconfig cmake libpulse qt5-base fluidsynth portaudio jack sdl2 sdl_sound
-             ffmpeg git)
+makedepends=(alsa-lib libpulse fluidsynth portaudio jack qt5-base sdl2 sdl_sound ffmpeg
+             git cmake ninja)
 source=("git+https://github.com/kcat/openal-soft")
 md5sums=('SKIP')
 
@@ -23,13 +23,14 @@ pkgver() {
 }
 
 build() {
-  mkdir -p build examples
+  rm -rf build examples
+  mkdir build examples
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        ../openal-soft
-  make
+  cmake ../openal-soft -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  ninja
 }
 
 package_openal-git() {
@@ -38,8 +39,7 @@ package_openal-git() {
   provides=("openal=$pkgver")
   conflicts=("openal")
 
-  make -C build DESTDIR="$pkgdir" install
-
+  DESTDIR="$pkgdir" ninja -C build install
   install -Dt "$pkgdir/usr/share/doc/openal" -m644 openal-soft/docs/*
 
 ### Split openal-examples