[arch-commits] Commit in lib32-openal/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, December 2, 2019 @ 22:31:53
  Author: heftig
Revision: 534896

1.20.0-1

Modified:
  lib32-openal/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-02 22:31:44 UTC (rev 534895)
+++ PKGBUILD	2019-12-02 22:31:53 UTC (rev 534896)
@@ -3,7 +3,7 @@
 # Contributor: Jason Chu <jchu at xentac.net>
 
 pkgname=lib32-openal
-pkgver=1.19.1
+pkgver=1.20.0
 pkgrel=1
 pkgdesc="Cross-platform 3D audio library, software implementation (32-bit)"
 arch=(x86_64)
@@ -10,9 +10,9 @@
 url="https://github.com/kcat/openal-soft"
 license=(LGPL)
 depends=(lib32-glibc openal)
-makedepends=(lib32-alsa-lib lib32-libpulse lib32-fluidsynth lib32-portaudio lib32-jack
-             git cmake ninja gcc-multilib)
-_commit=6761218e51699f46bf25c377e65b3e9ea5e434b9  # tags/openal-soft-1.19.1
+makedepends=(lib32-alsa-lib lib32-libpulse lib32-fluidsynth lib32-portaudio
+             lib32-jack git cmake)
+_commit=c0cf323e1d56ce605e90927324d2fdafcfbb564a  # tags/openal-soft-1.20.0
 source=("git+https://github.com/kcat/openal-soft#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -22,27 +22,24 @@
 }
 
 prepare() {
-  mkdir build
   cd openal-soft
-  git cherry-pick -n 8bacb5dfb8ef910586fcf5b5cd89526ec81061e8
 }
 
 build() {
   export CC="gcc -m32 -mstackrealign"
   export CXX="g++ -m32 -mstackrealign"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
-  cd build
-  cmake ../openal-soft -G Ninja \
+  cmake -Hopenal-soft -Bbuild \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_LIBDIR=lib32
-  ninja
+  cmake --build build
 }
 
 package() {
   optdepends=('lib32-fluidsynth: MIDI rendering')
 
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" cmake --build build --target install
   rm -rv "$pkgdir"/usr/{include,share,bin}
 }