From b556da7987407c44fab2f8e04eedd274bdec9f8b Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Fri, 14 Jan 2022 23:51:41 +0000
Subject: user/wayland: bump { 1.19.0 --> 1.20.0 }. switch to meson.

---
 user/wayland/APKBUILD | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'user')

diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD
index dae8a1998..f249ed94f 100644
--- a/user/wayland/APKBUILD
+++ b/user/wayland/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
 # Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=wayland
-pkgver=1.19.0
+pkgver=1.20.0
 pkgrel=0
 pkgdesc="A computer display server protocol"
 url="https://wayland.freedesktop.org"
@@ -10,31 +10,30 @@ arch="all"
 license="MIT"
 depends=""
 depends_dev="libffi-dev expat-dev"
-makedepends="$depends_dev doxygen xmlto graphviz grep libxml2-dev bash"
+makedepends="$depends_dev doxygen xmlto graphviz grep libxml2-dev bash meson"
 subpackages="$pkgname-dev"
 replaces="wayland-libs-client wayland-libs-cursor wayland-libs-server"
 source="https://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+	meson \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--disable-documentation \
-		--disable-static
-	make
+		--buildtype=plain \
+		-Ddocumentation=false \
+		. output
+
+	meson compile ${JOBS:+-j ${JOBS}} -C output
 }
 
 check() {
-	make check
+	meson test --no-rebuild -v -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 dev() {
@@ -44,4 +43,4 @@ dev() {
 	default_dev
 }
 
-sha512sums="d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef  wayland-1.19.0.tar.xz"
+sha512sums="e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215  wayland-1.20.0.tar.xz"
-- 
cgit v1.2.3-60-g2f50