directly handle build directory with cmake

2 files changed, 14 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d639190e2518..53a8f8747d31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = scream-git
 	pkgdesc = A Scream audio receiver using Pulseaudio, ALSA, JACK or stdout as audio output (git version)
-	pkgver = 3.8.r151.b3ca1ad
+	pkgver = 3.9.r160.98b39e2
 	pkgrel = 1
 	url = https://github.com/duncanthrax/scream
 	arch = x86_64
 	license = custom:MS-PL
 	makedepends = cmake
 	makedepends = git
+	makedepends = ninja
 	depends = jack
 	depends = libpulse
 	depends = libsoxr
diff --git a/PKGBUILD b/PKGBUILD
index d0b371a57dbb..e600fffbde44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,33 @@
 # Contributor: fatalis <fatalis@fatalis.pw>
 
 pkgname=scream-git
-_pkgname=scream
-pkgver=3.8.r151.b3ca1ad
+pkgver=3.9.r160.98b39e2
 pkgrel=1
 pkgdesc='A Scream audio receiver using Pulseaudio, ALSA, JACK or stdout as audio output (git version)'
+url='https://github.com/duncanthrax/scream'
 arch=('x86_64')
 provides=('scream' 'scream-pulse' 'scream-ivshmem-pulse' 'scream-alsa' 'scream-ivshmem-alsa')
 depends=('jack' 'libpulse' 'libsoxr' 'alsa-lib')
-makedepends=('cmake' 'git')
+makedepends=('cmake' 'git' 'ninja')
 conflicts=('scream' 'scream-pulse' 'scream-alsa')
-url='https://github.com/duncanthrax/scream'
 license=('custom:MS-PL')
-source=('git+https://github.com/duncanthrax/scream.git')
+source=("git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}"/${_pkgname}
+    cd "${srcdir}"/${pkgname%-git}
     printf "%s.r%s.%s" "$(git describe --abbrev=0 --tags)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}/Receivers/unix"
-  mkdir -p build && cd build
-  cmake ..
-  make
+    cmake -S ${pkgname%-git}/Receivers/unix -B build -G Ninja \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+
+    cmake --build build
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}/Receivers/unix"
-  install -d "${pkgdir}/usr/bin"
-  install build/${_pkgname} "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_pkgname}"
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+    cmake --install build
+    install -Dm644 ${pkgname%-git}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE"
 }