Update PKGBUILD to match community package

3 files changed, 30 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72051f896055..37e3d5e32823 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = lib32-faudio-git
-	pkgdesc = Accuracy-focused XAudio reimplementation for open platforms
-	pkgver = r1121.3dd4e04
+	pkgdesc = XAudio2 reimplementation
+	pkgver = 19.05.r13.g3dd4e04
 	pkgrel = 1
-	url = https://github.com/FNA-XNA/FAudio
+	url = https://github.com/FNA-XNA/FAudio/
 	arch = x86_64
-	license = custom
+	license = custom:zlib
 	makedepends = git
 	makedepends = cmake
 	depends = faudio
@@ -15,7 +15,7 @@ pkgbase = lib32-faudio-git
 	source = faudio.pc
 	source = force-lib32-sdl2.patch
 	sha256sums = SKIP
-	sha256sums = 371d1dfdfa335a354f41376807848ba0cc448890d6da60d0b5c9478033b7e54c
+	sha256sums = 10b0d2bd3a5e415971b36abf6bf6b853d7e3cd0dc316b6e4c773815a56b4a26f
 	sha256sums = 14762bf049e8de0675d297e174a6b4c31de65d543e738a1c400747aa155d57ae
 
 pkgname = lib32-faudio-git
diff --git a/PKGBUILD b/PKGBUILD
index 581713a31173..520511964492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,13 @@
 
 _pkgbase=faudio
 _pkgname=lib32-${_pkgbase}
-_gitname=FAudio
 pkgname=${_pkgname}-git
-pkgver=r1121.3dd4e04
+pkgver=19.05.r13.g3dd4e04
 pkgrel=1
-pkgdesc="Accuracy-focused XAudio reimplementation for open platforms"
-arch=('x86_64')
-url='https://github.com/FNA-XNA/FAudio'
-license=('custom')
+pkgdesc="XAudio2 reimplementation"
+arch=(x86_64)
+url="https://github.com/FNA-XNA/FAudio/"
+license=('custom:zlib')
 provides=("${_pkgname}")
 depends=("${_pkgbase}" 'lib32-sdl2' 'lib32-ffmpeg')
 makedepends=('git' 'cmake')
@@ -17,44 +16,40 @@ source=('git+https://github.com/FNA-XNA/FAudio'
         'faudio.pc'
         'force-lib32-sdl2.patch')
 sha256sums=('SKIP'
-            '371d1dfdfa335a354f41376807848ba0cc448890d6da60d0b5c9478033b7e54c'
+            '10b0d2bd3a5e415971b36abf6bf6b853d7e3cd0dc316b6e4c773815a56b4a26f'
             '14762bf049e8de0675d297e174a6b4c31de65d543e738a1c400747aa155d57ae')
 
 pkgver() {
-  cd "$srcdir/${_gitname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd FAudio
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
-  cd "$srcdir/${_gitname}"
+prepare() {
+  mkdir -p build
 
+  cd FAudio
   patch -p1 -i ../force-lib32-sdl2.patch
+}
 
-  mkdir -p build
-  cd build
-
-  export CFLAGS="${CFLAGS} -m32"
+build() {
+  export CC="gcc -m32 -mstackrealign"
+  export CXX="g++ -m32 -mstackrealign"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cmake .. \
+  cd build
+  cmake ../FAudio \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" \
     -DCMAKE_INSTALL_LIBDIR=lib32 \
-    -DCMAKE_INSTALL_INCLUDEDIR=include/FAudio \
     -DFFMPEG=ON \
     -DFFmpeg_LIBRARY_DIRS=/usr/lib32
-
   make
 }
 
 package() {
-  cd "$srcdir/${_gitname}/build"
-
-  make install
-
-  rm -r "${pkgdir}/usr/include"
-
-  mkdir -p "${pkgdir}/usr/share/licenses"
-  ln -s "${_pkgbase}" "${pkgdir}/usr/share/licenses/${_pkgname}"
+  DESTDIR="$pkgdir" make -C build install
+  rm -r "$pkgdir"/usr/include
 
-  install -D -m644 -t "${pkgdir}/usr/lib32/pkgconfig" ../../faudio.pc
+  install -Dm644 FAudio/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 faudio.pc "$pkgdir"/usr/lib32/pkgconfig/faudio.pc
 }
diff --git a/faudio.pc b/faudio.pc
index efa964e32a37..7f9bb264e217 100644
--- a/faudio.pc
+++ b/faudio.pc
@@ -1,9 +1,9 @@
 prefix=/usr
 libdir=${prefix}/lib32
-includedir=${prefix}/include/FAudio
+includedir=${prefix}/include
 
 Name: faudio
-Description: Accuracy-focused XAudio reimplementation for open platforms
+Description: XAudio2 reimplementation
 Version:
 
 Libs: -L${libdir} -lFAudio