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

[Jan Steffens]

    Date: Saturday, February 17, 2018 @ 16:42:04
  Author: heftig
Revision: 317220

2.4.90-1

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

------------------------+
 PKGBUILD               |   33 +++++++++++++++++++--------------
 no-drmdevice-test.diff |    9 +++++++++
 2 files changed, 28 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-17 15:42:55 UTC (rev 317219)
+++ PKGBUILD	2018-02-17 16:42:04 UTC (rev 317220)
@@ -2,20 +2,21 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.89
+pkgver=2.4.90
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
+url="https://dri.freedesktop.org/"
 arch=(x86_64)
 license=('custom')
 depends=('libpciaccess')
-makedepends=('valgrind' 'xorg-util-macros' 'libxslt' 'docbook-xsl')
+makedepends=('valgrind' 'libxslt' 'docbook-xsl' 'meson')
 checkdepends=('cairo')
 replaces=('libdrm-new' 'libdrm-nouveau')
-url="http://dri.freedesktop.org/"
 source=(https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig}
-        COPYING)
-sha512sums=('380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d'
+        no-drmdevice-test.diff COPYING)
+sha512sums=('3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c'
             'SKIP'
+            'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb'
             'b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst at canonical.com>
 validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau at intel.com>
@@ -30,20 +31,24 @@
 validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # Daniel Stone <daniels at collabora.com>
 validpgpkeys+=('CFD0E654BCBE5DD2D030D222CFCC297C6D0A120B') # Lucas Stach <l.stach at pengutronix.de>
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --enable-udev
-  make
+
+  # Fails in a container; autotools skipped this one already
+  patch -Np1 -i ../no-drmdevice-test.diff
 }
 
+build() {
+  arch-meson $pkgname-$pkgver build -Dudev=true
+  ninja -C build
+}
+
 check() {
-  cd $pkgname-$pkgver
-  make -k check
+  cd build
+  meson test
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/"
+  DESTDIR="$pkgdir" ninja -C build install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
 }

Added: no-drmdevice-test.diff
===================================================================
--- no-drmdevice-test.diff	                        (rev 0)
+++ no-drmdevice-test.diff	2018-02-17 16:42:04 UTC (rev 317220)
@@ -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)