Follow 'meson' best-practices for PKGBUILDs.

Additionally, incorporate recommendations made in the AUR comments.

2 files changed, 14 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c677b24ff20..2bdd089a6b71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = wf-recorder-git
 	pkgdesc = A video recorder for wlroots-based compositors like sway or wayfire
-	pkgver = r91.7cb37c4
+	pkgver = r139.2bb52d8
 	pkgrel = 1
 	url = https://github.com/ammen99/wf-recorder
 	arch = i686
 	arch = x86_64
 	license = MIT
+	makedepends = scdoc
 	makedepends = meson
 	makedepends = git
 	makedepends = wayland-protocols
@@ -17,6 +18,7 @@ pkgbase = wf-recorder-git
 	depends = ocl-icd
 	optdepends = slurp: limit recording to a part of the screen
 	provides = wf-recorder
+	conflicts = wf-recorder
 	source = wf-recorder::git+https://github.com/ammen99/wf-recorder
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 231d7adc32f3..c5f3bf287328 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: ahub <ahub@riseup.net>
 pkgname=wf-recorder-git
 _pkgname=wf-recorder
-pkgver=r91.7cb37c4
+pkgver=r139.2bb52d8
 pkgrel=1
 license=("MIT")
 pkgdesc="A video recorder for wlroots-based compositors like sway or wayfire"
-makedepends=("meson" "git" "wayland-protocols" "ninja")
+makedepends=("scdoc" "meson" "git" "wayland-protocols" "ninja")
 depends=(
 	"wayland" "ffmpeg" "x264" "opencl-headers" "ocl-icd"
 )
@@ -17,23 +17,21 @@ url="https://github.com/ammen99/wf-recorder"
 source=("${pkgname%-*}::git+https://github.com/ammen99/wf-recorder")
 sha1sums=("SKIP")
 provides=("wf-recorder")
+conflicts=("wf-recorder")
 
 pkgver() {
-	cd "$_pkgname"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "$_pkgname"
-	meson -Dwerror=false --prefix /usr "$srcdir/build" --buildtype=release
+	cd "${srcdir}/${_pkgname}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$_pkgname"
-	ninja -C "$srcdir/build"
+	cd "${srcdir}/${_pkgname}"
+	meson --prefix=/usr build
+	cd build
+	ninja
 }
 
 package() {
-	cd "$_pkgname"
-	DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
+	cd "${srcdir}/${_pkgname}/build"
+	DESTDIR="$pkgdir" ninja install
 }