From 4c5a42c6c25ac58777e0281f590eaf4c1744b447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin.decimo@gmail.com>
Date: Tue, 16 Feb 2021 00:35:26 +0100
Subject: [PATCH] Update meson build script and follow packaging
 recommendations

---
 .SRCINFO |  3 +--
 PKGBUILD | 27 +++++++++------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 3f7f52f..8241d1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = wlroots-hidpi-git
 	pkgdesc = Modular Wayland compositor library, with XWayland HiDPI (git version)
-	pkgver = 0.12.0.r324.gb9e9e0e1
+	pkgver = 0.12.0.r342.g38ec1c0e
 	pkgrel = 1
 	url = https://github.com/swaywm/wlroots
 	arch = x86_64
 	license = custom:MIT
 	makedepends = meson
-	makedepends = ninja
 	makedepends = git
 	makedepends = wayland-protocols
 	makedepends = xorgproto
diff --git a/PKGBUILD b/PKGBUILD
index 0d44a2c..d2aaec5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com>
 # Contributor: Adrian Perez de Castro <aperez@igalia.com>
 pkgname=wlroots-hidpi-git
-pkgver=0.12.0.r324.gb9e9e0e1
+pkgver=0.12.0.r342.g38ec1c0e
 pkgrel=1
 license=(custom:MIT)
 pkgdesc='Modular Wayland compositor library, with XWayland HiDPI (git version)'
@@ -14,7 +14,7 @@ conflicts=(wlroots wlroots-git)
 options=(debug)
 depends=(systemd wayland opengl-driver libxcb xcb-util-errors
          xcb-util-renderutil xcb-util-wm pixman libinput libxkbcommon)
-makedepends=(meson ninja git wayland-protocols xorgproto)
+makedepends=(meson git wayland-protocols xorgproto)
 source=("${pkgname}::git+${url}"
         # "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/pull/2064.diff"
         "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/compare/master...MisterDA:xwayland_hidpi.diff"
@@ -37,24 +37,15 @@ prepare () {
 }
 
 build () {
-	cd "${pkgname}"
-
-	rm -rf build
-	meson build \
-		--prefix /usr \
-		--buildtype debug \
-		-Dlogind=enabled \
+	arch-meson \
 		-Dlogind-provider=systemd \
-		-Dxcb-errors=enabled \
-		-Dxcb-icccm=enabled \
-		-Dxwayland=enabled \
-		-Dx11-backend=enabled \
-		-Dexamples=false
-	ninja -C build
+		-Dlibseat=disabled \
+		-Dwerror=false \
+		"${pkgname}" build
+	meson compile -C build
 }
 
 package () {
-	cd "${pkgname}"
-	DESTDIR="${pkgdir}" ninja -C build install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	DESTDIR="${pkgdir}" meson install -C build
+	install -Dm644 "${pkgname}/"LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }