From f075dabefeb64cd118fe758804ef2c1a5e6afadf Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 24 Feb 2021 12:59:58 +0000
Subject: [PATCH] extra/openal to 1.21.1-1

---
 extra/openal/PKGBUILD | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index a4a2ddd73..8af8ff7de 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgbase=openal
 pkgname=(openal openal-examples)
-pkgver=1.21.0
+pkgver=1.21.1
 pkgrel=1
 pkgdesc="Cross-platform 3D audio library, software implementation"
 arch=(x86_64)
@@ -19,7 +19,7 @@ makedepends=(alsa-lib libpulse fluidsynth portaudio jack qt5-base sdl2
 optdepends=('qt5-base: alsoft-config GUI Configurator'
             'fluidsynth: MIDI rendering'
             'libmysofa: makemhr tool')
-_commit=c0cbe602ce66481a822ba16856052a47154f5cc5  # tags/openal-soft-1.21.0
+_commit=ae4eacf147e2c2340cc4e02a790df04c793ed0a9  # tags/1.21.1
 source=("git+https://github.com/kcat/openal-soft#commit=$_commit")
 sha512sums=('SKIP')
 
@@ -41,24 +41,28 @@ build() {
   cmake --build build
 }
 
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
 package_openal() {
   DESTDIR="$pkgdir" cmake --install build
   install -Dt "$pkgdir/usr/share/doc/openal" -m644 openal-soft/docs/*
 
-### Split openal-examples
-  mkdir -p examples/usr/bin
-  for f in \
-    alffplay alhrtf allatency alloopback almultireverb alplay alrecord \
-    alreverb alstream altonegen
-  do
-    mv -v "$pkgdir/usr/bin/$f" examples/usr/bin/$f
-  done
+  cd "$pkgdir"
+  _pick examples usr/bin/al{ffplay,hrtf,latency,loopback,multireverb}
+  _pick examples usr/bin/al{play,record,reverb,stream,tonegen}
 }
 
 package_openal-examples() {
   pkgdesc+=" (example programs)"
   depends=("openal=$pkgver-$pkgrel" sdl2 libsndfile ffmpeg)
   optdepends=()
-
   mv examples/* "$pkgdir"
 }