From 855bac716d6e87b113c4ea91efed989712917d97 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 25 Dec 2019 05:48:11 -0600
Subject: user/libwacom: bump to 1.2

---
 user/libwacom/APKBUILD | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'user/libwacom/APKBUILD')

diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD
index c99e8605a..58de8225a 100644
--- a/user/libwacom/APKBUILD
+++ b/user/libwacom/APKBUILD
@@ -1,39 +1,35 @@
 # Contributor: Ivan Tham <pickfire@riseup.net>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=libwacom
-pkgver=0.33
-pkgrel=2
+pkgver=1.2
+pkgrel=0
 pkgdesc="Tablet description library"
 url="http://linuxwacom.sourceforge.net/"
 arch="all"
 license="MIT"
 depends=""
-makedepends="libgudev-dev"
 checkdepends="bash findutils"
+makedepends="libgudev-dev libxml2-dev meson ninja"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2
-	fix-database.patch
+	musl-test.patch
 	"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-static
-	make
+	meson \
+		-Dprefix=/usr \
+		-Dtest_deprecated=false \
+		build
+	ninja -C build
 }
 
 check() {
-	make check
+	ninja -C build test
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
-	install -dm755 "$pkgdir"/usr/lib/udev/rules.d/
-	tools/generate-udev-rules \
-		> "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules
+	DESTDIR="$pkgdir" ninja -C build install
 }
 
-sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d  libwacom-0.33.tar.bz2
-db07a7c44bd7ed010eec167d5e7cd807da203f8d42630855189b7c7e91ef6776b7df571ee0b0a0985912f836640fcf458ee4a394a47e9e8365892a6a137a3f00  fix-database.patch"
+sha512sums="595c073d8160bce2d6cec13d5c672594c73ae677e37dbba0ac088c9010d6e2f824d442ccdb7f695642bd06cce75c85473d863823c20a46fbe27e966ae3fed147  libwacom-1.2.tar.bz2
+5aebef9f8b224c83fa9f175b2cfec0198aeb0b462b2bb55c02e0cf10ef78f8af66def81f715fc3d95e8d7191f6fb688795f3561eb6850eed76105f865229d3f4  musl-test.patch"
-- 
cgit v1.2.3-60-g2f50