main/libxkbcommon: update to 0.8.4

- Adopt
- Split x11 libraries into $pkgname-x11
- Switch to meson build system

main/libxkbcommon/APKBUILD

-# Contributor: 
-# Maintainer: 
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Leo <thinkabit.ukim@gmail.com>
 pkgname=libxkbcommon
-pkgver=0.8.2
+pkgver=0.8.4
 pkgrel=0
 pkgdesc="a keyboard handling library"
 url="https://www.xkbcommon.org/"
 arch="all"
 license="MIT"
-makedepends="bison flex libxcb-dev util-macros xorgproto"
+depends_dev="libxkbcommon-x11=$pkgver-r$pkgrel"
+makedepends="
+	bison
+	wayland-dev
+	wayland-protocols
+	libxcb-dev
+	xkeyboard-config
+	meson"
 checkdepends="bash"
-subpackages="$pkgname-dev"
+subpackages="$pkgname-dev $pkgname-x11"
 source="http://xkbcommon.org/download/libxkbcommon-$pkgver.tar.xz"
 
 builddir="$srcdir"/libxkbcommon-$pkgver
 
 build() {
 	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+	meson \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
+		-Denable-wayland=true \
+		-Denable-docs=false \
+		-Denable-x11=true \
+		build
+	ninja -C build
 }
 
 check() {
 	cd "$builddir"
-	make check
+	ninja -C build test
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" ninja -C build install
 }
 
-sha512sums="b714240ec6120bbe44b5da7a4f89b1c2f24cfd6e5ebbe81e5290d135c8f2e5a68f89ac256b73430a446167345f8db309b35dcf74f3d3840e20897cd91eccc172  libxkbcommon-0.8.2.tar.xz"
+x11() {
+	pkgdesc="$pkgdesc (x11 support)"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/*x11*.so.* "$subpkgdir"/usr/lib
+}
+
+sha512sums="dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3  libxkbcommon-0.8.4.tar.xz"