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

[Jan Steffens]

    Date: Monday, November 15, 2021 @ 20:24:18
  Author: heftig
Revision: 1048503

1.21.1-2

Modified:
  lib32-openal/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-15 20:23:18 UTC (rev 1048502)
+++ PKGBUILD	2021-11-15 20:24:18 UTC (rev 1048503)
@@ -4,7 +4,7 @@
 
 pkgname=lib32-openal
 pkgver=1.21.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform 3D audio library, software implementation (32-bit)"
 arch=(x86_64)
 url="https://github.com/kcat/openal-soft"
@@ -11,7 +11,7 @@
 license=(LGPL)
 depends=(lib32-gcc-libs openal)
 makedepends=(lib32-alsa-lib lib32-libpulse lib32-fluidsynth lib32-portaudio
-             lib32-jack git cmake)
+             lib32-jack git cmake ninja)
 optdepends=('lib32-fluidsynth: MIDI rendering')
 _commit=ae4eacf147e2c2340cc4e02a790df04c793ed0a9  # tags/1.21.1
 source=("git+https://github.com/kcat/openal-soft#commit=$_commit")
@@ -24,6 +24,12 @@
 
 prepare() {
   cd openal-soft
+
+  # Missing include
+  git cherry-pick -n 302e88dbf0f10224a5b87be4ce43b3fdd9d20184
+
+  # https://bugs.archlinux.org/task/72729
+  git cherry-pick -n b7ff1de48efda9ad54e6a3b4c1526722c371e832
 }
 
 build() {
@@ -31,7 +37,7 @@
   export CXX="g++ -m32 -mstackrealign"
   export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
-  cmake -S openal-soft -B build \
+  cmake -S openal-soft -B build -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_LIBDIR=lib32
@@ -39,6 +45,8 @@
 }
 
 package() {
+  provides+=(libopenal.so)
+
   DESTDIR="$pkgdir" cmake --install build
   rm -rv "$pkgdir"/usr/{include,share,bin}
 }