summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Teichroeb2017-07-04 08:48:22 -0700
committerJoel Teichroeb2017-07-04 08:48:34 -0700
commit23ccabf5204ffbfc636c514932b65733e4a7056d (patch)
tree9770842e0024f9a7dbe4eed55730c032da2ffca2
parent30e1ca64c5fba7a3726d491c9fe68ffc0adeb0b6 (diff)
downloadaur-23ccabf5204ffbfc636c514932b65733e4a7056d.tar.gz
Update build to use meson
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD24
2 files changed, 21 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f97d5c60e609..ead5c99ad6cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
# Generated by mksrcinfo v8
-# Wed May 24 22:15:56 UTC 2017
+# Tue Jul 4 15:48:28 UTC 2017
pkgbase = libinput-git
- pkgdesc = A library to handle input devices in Wayland compositors
- pkgver = 1.7.0.r102.ga2a8db2
+ pkgdesc = Input device management and event handling library
+ pkgver = 1.8.0.r7.gca9d6a8
pkgrel = 1
url = http://freedesktop.org/wiki/Software/libinput/
arch = i686
arch = x86_64
license = MIT
+ checkdepends = valgrind
makedepends = git
+ makedepends = meson
makedepends = doxygen
makedepends = graphviz
makedepends = gtk3
@@ -16,7 +18,7 @@ pkgbase = libinput-git
depends = systemd
depends = libevdev
depends = libwacom
- provides = libinput=1.7.0.r102.ga2a8db2
+ provides = libinput=1.8.0.r7.gca9d6a8
conflicts = libinput
source = git://anongit.freedesktop.org/wayland/libinput
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3f82b01b1a6d..1c12b67ef4d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
# Maintainer: Joel Teichroeb <joel@teichroeb.net>
pkgname=libinput-git
-pkgver=1.7.0.r102.ga2a8db2
+pkgver=1.8.0.r7.gca9d6a8
pkgrel=1
-pkgdesc='A library to handle input devices in Wayland compositors'
+pkgdesc='Input device management and event handling library'
arch=(i686 x86_64)
url='http://freedesktop.org/wiki/Software/libinput/'
provides=("libinput=${pkgver}")
license=('MIT')
depends=('mtdev' 'systemd' 'libevdev' 'libwacom')
-makedepends=('git' 'doxygen' 'graphviz' 'gtk3')
+checkdepends=('valgrind')
+makedepends=('git' 'meson' 'doxygen' 'graphviz' 'gtk3')
conflicts=('libinput')
source=(git://anongit.freedesktop.org/wayland/libinput)
sha1sums=('SKIP')
@@ -21,16 +22,21 @@ pkgver() {
build() {
cd libinput
+ meson build --prefix=/usr \
+ --buildtype=release \
+ --libexecdir=/usr/lib \
+ -Dtests=false
+ ninja -C build
+}
- ./autogen.sh --prefix=/usr --disable-static --disable-tests
- make
+check() {
+ cd libinput/build
+ mesontest
}
package() {
cd libinput
- make DESTDIR="${pkgdir}" install
+ DESTDIR="$pkgdir" ninja -C build install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
- # install doc - no Makefile target
- install -v -dm755 ${pkgdir}/usr/share/doc/libinput
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}