[arch-commits] Commit in lib32-libdrm/trunk (PKGBUILD no-drmdevice-test.diff)

[Jan Steffens]

    Date: Saturday, February 17, 2018 @ 16:41:59
  Author: heftig
Revision: 296119

2.4.90-1

Added:
  lib32-libdrm/trunk/no-drmdevice-test.diff
Modified:
  lib32-libdrm/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   44 ++++++++++++++++++++++----------------------
 no-drmdevice-test.diff |    9 +++++++++
 2 files changed, 31 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-17 16:35:18 UTC (rev 296118)
+++ PKGBUILD	2018-02-17 16:41:59 UTC (rev 296119)
@@ -4,24 +4,26 @@
 
 _pkgbasename=libdrm
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.89
+pkgver=2.4.90
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
+url="https://dri.freedesktop.org/"
 arch=(x86_64)
 license=('custom')
 depends=('lib32-libpciaccess' $_pkgbasename)
-makedepends=(gcc-multilib xorg-util-macros valgrind-multilib)
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(https://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2{,.sig})
-sha256sums=('629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e'
-            'SKIP')
+makedepends=('valgrind' 'meson')
+checkdepends=('lib32-cairo')
+source=(https://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2{,.sig}
+        no-drmdevice-test.diff)
+sha512sums=('3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c'
+            'SKIP'
+            'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst at canonical.com>
 validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau at intel.com>
 validpgpkeys+=('10A6D91DA1B05BD29F6DEBAC0C74F35979C486BE') # David Airlie <airlied at redhat.com>
 validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
 validpgpkeys+=('D6285B5E899299F3DA746184191C9B905522B045') # Rob Clark <robclark at freedesktop.org>
-validpgpkeys+=('E8EB5B34081CE1EEA26EFE195B5BDA071D49CC38') # Kenneth Graunke <kenneth at whitecape.org>
+validpgpkeys+=('E8EB5B34081CE1EEA26EFE195B5BDA071D49CC38') # Kenneth Graunke <kenneth.w.graunke at intel.com>
 validpgpkeys+=('FC9BAE1435A9F7F664B82057B5D62936D1FC9EE8') # Eric Anholt <eric at anholt.net>
 validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88 at gmail.com>
 validpgpkeys+=('C20F5C4490D7D64B4C9A09998CD1DF552975297B') # Robert Bragg <robert at sixbynine.org>
@@ -29,32 +31,30 @@
 validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # Daniel Stone <daniels at collabora.com>
 validpgpkeys+=('CFD0E654BCBE5DD2D030D222CFCC297C6D0A120B') # Lucas Stach <l.stach at pengutronix.de>
 
+prepare() {
+  cd $_pkgbasename-$pkgver
+
+  # Fails in a container; autotools skipped this one already
+  patch -Np1 -i ../no-drmdevice-test.diff
+}
+
 build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  ./configure --prefix=/usr \
-     --libdir=/usr/lib32 \
-     --enable-udev
-
-  make
+  arch-meson $_pkgbasename-$pkgver build --libdir=/usr/lib32 -Dudev=true
+  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"
 }
-

Added: no-drmdevice-test.diff
===================================================================
--- no-drmdevice-test.diff	                        (rev 0)
+++ no-drmdevice-test.diff	2018-02-17 16:41:59 UTC (rev 296119)
@@ -0,0 +1,9 @@
+diff --git i/tests/meson.build w/tests/meson.build
+index fdf950b7..a6a2f1f1 100644
+--- i/tests/meson.build
++++ w/tests/meson.build
+@@ -83,4 +83,3 @@ drmdevice = executable(
+ test('random', random, timeout : 240)
+ test('hash', hash)
+ test('drmsl', drmsl)
+-test('drmdevice', drmdevice)