From d85cd1f4a01df707f188744861966b8d12a7cda4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 21 Feb 2019 02:46:37 +0000
Subject: libdrm: update to 2.4.97

---
 abs/core/libdrm/PKGBUILD                           | 26 +++++----------
 ...x_mistake_in_initial_hole_size_calculation.diff | 39 ----------------------
 2 files changed, 9 insertions(+), 56 deletions(-)
 delete mode 100644 abs/core/libdrm/fix_mistake_in_initial_hole_size_calculation.diff

diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD
index 59dd0ab..a1c902c 100644
--- a/abs/core/libdrm/PKGBUILD
+++ b/abs/core/libdrm/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.90
-pkgrel=3
+pkgver=2.4.97
+pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 url="https://dri.freedesktop.org/"
 arch=(x86_64)
@@ -12,14 +11,11 @@ depends=('libpciaccess')
 makedepends=('valgrind' 'libxslt' 'docbook-xsl' 'meson')
 checkdepends=('cairo')
 replaces=('libdrm-new' 'libdrm-nouveau')
-source=(https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig}
+source=(https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 #{,.sig}
         no-drmdevice-test.diff
-        fix_mistake_in_initial_hole_size_calculation.diff
         COPYING)
-sha512sums=('3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c'
-            'SKIP'
+sha512sums=('3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed'
             'f1dd5d8c2270c092ccb8e4f92a0da9ab27706dfa22dcedd3fb2414b968ced9333c8bf62baf0219b822e43dce0d804d1dd5cc27d09b0afe8c01967c1784d4a4bb'
-            '679ba7ef4f29cc4d511d5fbb7b505d8eade4cd3fc16eceaed2d1aa47947ebf31bac113ead5f2a1db8f5626ba290e9e1ffeab28c2abb924d0c85efe816c1201f8'
             'b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst@canonical.com>
 validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau@intel.com>
@@ -37,26 +33,22 @@ validpgpkeys+=('CFD0E654BCBE5DD2D030D222CFCC297C6D0A120B') # Lucas Stach <l.stac
 prepare() {
   cd $pkgname-$pkgver
 
-  # Fix version
-  sed -i 's/2\.4\.89/2.4.90/' meson.build
-
   # Fails in a container; autotools skipped this one already
   patch -Np1 -i ../no-drmdevice-test.diff
-  # FS#57576; fix amdgpu cards
-  patch -Np1 -i ../fix_mistake_in_initial_hole_size_calculation.diff
 }
 
 build() {
-  arch-meson $pkgname-$pkgver build -Dudev=true
+  arch-meson $pkgname-$pkgver build \
+    -Dudev=false \
+    -Dvalgrind=false
   ninja -C build
 }
 
 check() {
-  cd build
-  meson test
+  meson test -C build
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
 }
diff --git a/abs/core/libdrm/fix_mistake_in_initial_hole_size_calculation.diff b/abs/core/libdrm/fix_mistake_in_initial_hole_size_calculation.diff
deleted file mode 100644
index 8998e45..0000000
--- a/abs/core/libdrm/fix_mistake_in_initial_hole_size_calculation.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From 33a2851ab9bc3cd8a68bedf4cf0fdc549b0f3596 Mon Sep 17 00:00:00 2001
-From: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
-Date: Mon, 19 Feb 2018 02:18:36 -0500
-Subject: amdgpu: Fix mistake in initial hole size calculation.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
-Acked-by: Christian König <christian.koenig@amd.com>
----
- amdgpu/amdgpu_vamgr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/amdgpu/amdgpu_vamgr.c b/amdgpu/amdgpu_vamgr.c
-index 722067f..5840042 100644
---- a/amdgpu/amdgpu_vamgr.c
-+++ b/amdgpu/amdgpu_vamgr.c
-@@ -57,7 +57,7 @@ drm_private void amdgpu_vamgr_init(struct amdgpu_bo_va_mgr *mgr, uint64_t start,
- 	pthread_mutex_init(&mgr->bo_va_mutex, NULL);
- 	pthread_mutex_lock(&mgr->bo_va_mutex);
- 	n = calloc(1, sizeof(struct amdgpu_bo_va_hole));
--	n->size = mgr->va_max;
-+	n->size = mgr->va_max - start;
- 	n->offset = start;
- 	list_add(&n->list, &mgr->va_holes);
- 	pthread_mutex_unlock(&mgr->bo_va_mutex);
-@@ -80,6 +80,7 @@ amdgpu_vamgr_find_va(struct amdgpu_bo_va_mgr *mgr, uint64_t size,
- 	struct amdgpu_bo_va_hole *hole, *n;
- 	uint64_t offset = 0, waste = 0;
- 
-+
- 	alignment = MAX2(alignment, mgr->va_alignment);
- 	size = ALIGN(size, mgr->va_alignment);
- 
--- 
-cgit v1.1
-
-
-- 
cgit v0.12

