diff --git a/lib32-libdrm/PKGBUILD b/lib32-libdrm/PKGBUILD
index 4ce9f76..de2b818 100644
--- a/lib32-libdrm/PKGBUILD
+++ b/lib32-libdrm/PKGBUILD
@@ -1,23 +1,25 @@
 _pkgbasename=libdrm
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.89
+pkgver=2.4.91
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
+url="https://dri.freedesktop.org/"
 arch=(x86_64)
 license=('custom')
-depends=('lib32-libpciaccess' 'lib32-systemd' $_pkgbasename)
-makedepends=(lib32-gcc-libs xorg-util-macros)
-options=('!libtool')
-url="https://dri.freedesktop.org/"
-source=(https://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2{,.sig})
-sha256sums=('629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e'
-            'SKIP')
+depends=('lib32-libpciaccess' $_pkgbasename)
+makedepends=('valgrind' 'meson')
+checkdepends=('lib32-cairo')
+source=(https://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2{,.sig}
+        no-drmdevice-test.diff)
+sha512sums=('07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772'
+            'SKIP'
+            'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst@canonical.com>
 validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau@intel.com>
 validpgpkeys+=('10A6D91DA1B05BD29F6DEBAC0C74F35979C486BE') # David Airlie <airlied@redhat.com>
 validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 validpgpkeys+=('D6285B5E899299F3DA746184191C9B905522B045') # Rob Clark <robclark@freedesktop.org>
-validpgpkeys+=('E8EB5B34081CE1EEA26EFE195B5BDA071D49CC38') # Kenneth Graunke <kenneth@whitecape.org>
+validpgpkeys+=('E8EB5B34081CE1EEA26EFE195B5BDA071D49CC38') # Kenneth Graunke <kenneth.w.graunke@intel.com>
 validpgpkeys+=('FC9BAE1435A9F7F664B82057B5D62936D1FC9EE8') # Eric Anholt <eric@anholt.net>
 validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88@gmail.com>
 validpgpkeys+=('C20F5C4490D7D64B4C9A09998CD1DF552975297B') # Robert Bragg <robert@sixbynine.org>
@@ -25,32 +27,33 @@ validpgpkeys+=('CD47C5341A375F33BEF7BAFAFDD15D5ACEF0F2B1') # Marek Olšák <mara
 validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # Daniel Stone <daniels@collabora.com>
 validpgpkeys+=('CFD0E654BCBE5DD2D030D222CFCC297C6D0A120B') # Lucas Stach <l.stach@pengutronix.de>
 
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+prepare() {
+  cd $_pkgbasename-$pkgver
 
+  # Fails in a container; autotools skipped this one already
+  patch -Np1 -i ../no-drmdevice-test.diff
+}
+
+build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  ./configure --prefix=/usr \
-     --libdir=/usr/lib32 \
-     --enable-udev
-
-  make
+  chakra-meson $_pkgbasename-$pkgver build \
+    --libdir=/usr/lib32 \
+    -Dudev=false \
+    -Dvalgrind=false
+  ninja -C build
 }
 
 check() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make -k check
+  cd build
+  meson test
 }
 
 package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
+  DESTDIR="$pkgdir" ninja -C build install
   rm -rf "${pkgdir}"/usr/{include,share,bin}
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
 }
-