[arch-commits] Commit in lib32-libdrm/repos/multilib-x86_64 (6 files)
Laurent Carlier
lcarlier at archlinux.org
Thu Mar 22 08:32:04 UTC 2018
Date: Thursday, March 22, 2018 @ 08:32:03
Author: lcarlier
Revision: 310299
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libdrm/repos/multilib-x86_64/PKGBUILD
(from rev 310298, lib32-libdrm/trunk/PKGBUILD)
lib32-libdrm/repos/multilib-x86_64/fix_mistake_in_initial_hole_size_calculation.diff
(from rev 310298, lib32-libdrm/trunk/fix_mistake_in_initial_hole_size_calculation.diff)
lib32-libdrm/repos/multilib-x86_64/no-drmdevice-test.diff
(from rev 310298, lib32-libdrm/trunk/no-drmdevice-test.diff)
Deleted:
lib32-libdrm/repos/multilib-x86_64/PKGBUILD
lib32-libdrm/repos/multilib-x86_64/fix_mistake_in_initial_hole_size_calculation.diff
lib32-libdrm/repos/multilib-x86_64/no-drmdevice-test.diff
---------------------------------------------------+
PKGBUILD | 126 ++++++++++----------
fix_mistake_in_initial_hole_size_calculation.diff | 78 ++++++------
no-drmdevice-test.diff | 18 +-
3 files changed, 111 insertions(+), 111 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-22 08:31:39 UTC (rev 310298)
+++ PKGBUILD 2018-03-22 08:32:03 UTC (rev 310299)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.91
-pkgrel=2
-pkgdesc="Userspace interface to kernel DRM services (32-bit)"
-url="https://dri.freedesktop.org/"
-arch=(x86_64)
-license=('custom')
-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 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.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>
-validpgpkeys+=('CD47C5341A375F33BEF7BAFAFDD15D5ACEF0F2B1') # Marek Olšák <maraeo at gmail.com>
-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() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- arch-meson $_pkgbasename-$pkgver build \
- --libdir=/usr/lib32 \
- -Dudev=true \
- -Dvalgrind=false
- ninja -C build
-}
-
-check() {
- cd build
- meson test
-}
-
-package() {
- 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"
-}
Copied: lib32-libdrm/repos/multilib-x86_64/PKGBUILD (from rev 310298, lib32-libdrm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-22 08:32:03 UTC (rev 310299)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=libdrm
+pkgname=lib32-$_pkgbasename
+pkgver=2.4.91
+pkgrel=3
+pkgdesc="Userspace interface to kernel DRM services (32-bit)"
+url="https://dri.freedesktop.org/"
+arch=(x86_64)
+license=('custom')
+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 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.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>
+validpgpkeys+=('CD47C5341A375F33BEF7BAFAFDD15D5ACEF0F2B1') # Marek Olšák <maraeo at gmail.com>
+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() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ arch-meson $_pkgbasename-$pkgver build \
+ --libdir=/usr/lib32 \
+ -Dudev=false \
+ -Dvalgrind=false
+ ninja -C build
+}
+
+check() {
+ cd build
+ meson test
+}
+
+package() {
+ 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"
+}
Deleted: fix_mistake_in_initial_hole_size_calculation.diff
===================================================================
--- fix_mistake_in_initial_hole_size_calculation.diff 2018-03-22 08:31:39 UTC (rev 310298)
+++ fix_mistake_in_initial_hole_size_calculation.diff 2018-03-22 08:32:03 UTC (rev 310299)
@@ -1,39 +0,0 @@
-From 33a2851ab9bc3cd8a68bedf4cf0fdc549b0f3596 Mon Sep 17 00:00:00 2001
-From: Andrey Grodzovsky <andrey.grodzovsky at 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 at amd.com>
-Acked-by: Christian König <christian.koenig at 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
-
-
Copied: lib32-libdrm/repos/multilib-x86_64/fix_mistake_in_initial_hole_size_calculation.diff (from rev 310298, lib32-libdrm/trunk/fix_mistake_in_initial_hole_size_calculation.diff)
===================================================================
--- fix_mistake_in_initial_hole_size_calculation.diff (rev 0)
+++ fix_mistake_in_initial_hole_size_calculation.diff 2018-03-22 08:32:03 UTC (rev 310299)
@@ -0,0 +1,39 @@
+From 33a2851ab9bc3cd8a68bedf4cf0fdc549b0f3596 Mon Sep 17 00:00:00 2001
+From: Andrey Grodzovsky <andrey.grodzovsky at 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 at amd.com>
+Acked-by: Christian König <christian.koenig at 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
+
+
Deleted: no-drmdevice-test.diff
===================================================================
--- no-drmdevice-test.diff 2018-03-22 08:31:39 UTC (rev 310298)
+++ no-drmdevice-test.diff 2018-03-22 08:32:03 UTC (rev 310299)
@@ -1,9 +0,0 @@
-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)
Copied: lib32-libdrm/repos/multilib-x86_64/no-drmdevice-test.diff (from rev 310298, lib32-libdrm/trunk/no-drmdevice-test.diff)
===================================================================
--- no-drmdevice-test.diff (rev 0)
+++ no-drmdevice-test.diff 2018-03-22 08:32:03 UTC (rev 310299)
@@ -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)
More information about the arch-commits
mailing list