summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-25 05:48:11 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-25 05:48:11 -0600
commit855bac716d6e87b113c4ea91efed989712917d97 (patch)
treeb2ab3cf4aa285baec2d54255a9e7aebdcc88ca42
parent3b4082481339e7e4254011eb5088a2f6cdb4bace (diff)
downloadpackages-855bac716d6e87b113c4ea91efed989712917d97.tar.gz
packages-855bac716d6e87b113c4ea91efed989712917d97.tar.bz2
packages-855bac716d6e87b113c4ea91efed989712917d97.tar.xz
packages-855bac716d6e87b113c4ea91efed989712917d97.zip
user/libwacom: bump to 1.2
-rw-r--r--user/libwacom/APKBUILD30
-rw-r--r--user/libwacom/fix-database.patch25
-rw-r--r--user/libwacom/musl-test.patch22
3 files changed, 35 insertions, 42 deletions
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"
diff --git a/user/libwacom/fix-database.patch b/user/libwacom/fix-database.patch
deleted file mode 100644
index 3c43b5bbf..000000000
--- a/user/libwacom/fix-database.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index afb89a2..28388f5 100644
---- a/libwacom/libwacom-database.c
-+++ b/libwacom/libwacom-database.c
-@@ -147,14 +147,13 @@ make_match_string (const char *name, WacomBusType bus, int vendor_id, int produc
- static gboolean
- match_from_string(const char *str, WacomBusType *bus, int *vendor_id, int *product_id, char **name)
- {
-- int rc = 1;
-- char busstr[64], namestr[64];
-+ int rc = 1, len = 0;
-+ char busstr[64];
-
-- memset(namestr, 0, sizeof(namestr));
--
-- rc = sscanf(str, "%63[^:]:%x:%x:%63c", busstr, vendor_id, product_id, namestr);
-- if (rc == 4) {
-- *name = g_strdup(namestr);
-+ rc = sscanf(str, "%63[^:]:%x:%x:%n", busstr, vendor_id, product_id, &len);
-+ if (len > 0) {
-+ /* Grumble grumble scanf handling of %n */
-+ *name = g_strdup(str+len);
- } else if (rc == 3) {
- *name = NULL;
- } else {
diff --git a/user/libwacom/musl-test.patch b/user/libwacom/musl-test.patch
new file mode 100644
index 000000000..74625f02b
--- /dev/null
+++ b/user/libwacom/musl-test.patch
@@ -0,0 +1,22 @@
+--- libwacom-1.2/meson.build.old 2019-12-22 21:45:06.000000000 +0000
++++ libwacom-1.2/meson.build 2019-12-25 11:43:51.004107631 +0000
+@@ -555,7 +555,7 @@
+ # because of the tricks we use in calling the function and exposing
+ # it to begin with, LTO gets confused and this fails to link.
+ # Let's just disable it here.
+- if not get_option('b_lto')
++ if not get_option('b_lto') and get_option('test_deprecated')
+ test_deprecated = executable('test-deprecated',
+ 'test/test-deprecated.c',
+ dependencies: [dep_libwacom, dep_dl],
+--- libwacom-1.2/meson_options.txt.old 2019-11-07 02:25:47.000000000 +0000
++++ libwacom-1.2/meson_options.txt 2019-12-25 11:45:11.585452086 +0000
+@@ -10,4 +10,8 @@
+ type: 'boolean',
+ value: true,
+ description: 'Build the tests [default=true]')
++option('test_deprecated',
++ type: 'boolean',
++ value: true,
++ description: 'Test the deprecated ABI (fails on musl) [default=true]')
+