1.12.0

1 files changed, 14 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a406fb040c6e..dee6e38de0ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,41 +3,33 @@
 
 _basename=libevdev
 pkgname="lib32-$_basename"
-pkgver=1.11.0
+pkgver=1.12.0
 pkgrel=1
 pkgdesc="Wrapper library for evdev devices (32-bit)"
 arch=('x86_64')
 url="https://www.freedesktop.org/wiki/Software/libevdev/"
 license=(custom:X11)
 depends=('lib32-glibc' "$_basename")
-makedepends=('python2' 'gcc-multilib' 'lib32-check' 'valgrind' 'doxygen' 'lib32-gcc-libs')
-#checkdepends=('kmod')
-source=(https://www.freedesktop.org/software/$_basename/$_basename-$pkgver.tar.xz)
-sha512sums=('b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d')
+makedepends=('python' 'gcc-multilib' 'lib32-check' 'valgrind' 'doxygen' 'meson' 'lib32-gcc-libs')
+source=(https://freedesktop.org/software/$_basename/$_basename-$pkgver.tar.xz)
+sha512sums=('6c1c1362d5112cdf3816d1f735c27e625f5463ebf10a83d675cd9364c3fb291ebcb91c051da442f1a36ed28ba7dd99af74546707f61274f7d5715c544a0ed04c')
 
 build() {
-  cd $_basename-$pkgver
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  ./configure --prefix=/usr \
-    --disable-static \
-    --libdir=/usr/lib32 
-  make
+  arch-meson $_basename-$pkgver build \
+    --libdir=/usr/lib32 \
+    -D documentation=disabled
+  meson compile -C build
 }
 
 check() {
-  cd $_basename-$pkgver
-  # test suite requires root access and needs to load uinput module
-  # that's not possible in our chroot
-  #modprobe uinput
-  make check || /bin/true
+  meson test -C build --print-errorlogs || true
 }
 
 package() {
-  cd $_basename-$pkgver
-  make DESTDIR="$pkgdir" install
-  rm -rf ${pkgdir}/usr/{bin,share,include}
+  meson install -C build --destdir "$pkgdir"
+  rm -rf "$pkgdir"/usr/{bin,share,include}
 }