[arch-commits] Commit in libdrm/trunk (2 files)

[Laurent Carlier]

    Date: Thursday, May 7, 2015 @ 13:29:58
  Author: lcarlier
Revision: 238588

upgpkg: libdrm 2.4.61-1

upstream update 2.4.61

Modified:
  libdrm/trunk/PKGBUILD
Deleted:
  libdrm/trunk/0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch

--------------------------------------------------------------+
 0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch |   28 ----------
 PKGBUILD                                                     |   19 ++----
 2 files changed, 7 insertions(+), 40 deletions(-)

Deleted: 0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch
===================================================================
--- 0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch	2015-05-07 11:00:44 UTC (rev 238587)
+++ 0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch	2015-05-07 11:29:58 UTC (rev 238588)
@@ -1,28 +0,0 @@
-From 7d8f5e019505f5bda67ad8d2b25077eade90fbe8 Mon Sep 17 00:00:00 2001
-From: Connor Behan <connor.behan at gmail.com>
-Date: Tue, 24 Mar 2015 13:47:26 -0400
-Subject: [PATCH] xf86drm: Fix ioctl struct clearing in drmAgpEnable
-
-This one is a bit harder to notice.
-
-Signed-off-by: Connor Behan <connor.behan at gmail.com>
----
- xf86drm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xf86drm.c b/xf86drm.c
-index e73cddd..ffc53b8 100644
---- a/xf86drm.c
-+++ b/xf86drm.c
-@@ -1719,7 +1719,7 @@ int drmAgpEnable(int fd, unsigned long mode)
- {
-     drm_agp_mode_t m;
- 
--    memclear(mode);
-+    memclear(m);
-     m.mode = mode;
-     if (drmIoctl(fd, DRM_IOCTL_AGP_ENABLE, &m))
- 	return -errno;
--- 
-2.3.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-07 11:00:44 UTC (rev 238587)
+++ PKGBUILD	2015-05-07 11:29:58 UTC (rev 238588)
@@ -2,33 +2,28 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.60
-pkgrel=2
+pkgver=2.4.61
+pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
 license=('custom')
 depends=('glibc' 'libpciaccess')
-makedepends=('valgrind')
+makedepends=('valgrind' 'xorg-util-macros')
 checkdepends=('cairo')
 replaces=('libdrm-new' 'libdrm-nouveau')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig}
-        COPYING
-        0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch)
-sha256sums=('99575fc6c8e31f59193f5320fd4db7a5478e2641b5266147caab9aa875b59889'
+        COPYING)
+sha256sums=('8b549092c8961a393a7e1d9a1bccddcea8e2af67c0d7d7c67babb9fc3b47699c'
             'SKIP'
-            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93'
-            'b9a4e77e50a0c11fbdf95b277fe4a6943eba3a63b5b90c548cbc5159db1d32f3')
+            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 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>
 
 prepare() {
   cd $pkgname-$pkgver
   
-  # fix permission issue on r128 cards, pushed by Connor Behan
-  # tested by Tobias Powalowski
-  patch -Np1 -i ${srcdir}/0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch
-
   # pthread is useless in Linux
   sed -i "/pthread-stubs/d" configure.ac
   autoreconf --force --install