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

[Tobias Powalowski]

    Date: Thursday, March 26, 2015 @ 08:48:39
  Author: tpowa
Revision: 234952

upgpkg: libdrm 2.4.60-2

fix permission issues on r128 cards

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

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

Added: 0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch
===================================================================
--- 0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch	                        (rev 0)
+++ 0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch	2015-03-26 07:48:39 UTC (rev 234952)
@@ -0,0 +1,28 @@
+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-03-26 07:44:40 UTC (rev 234951)
+++ PKGBUILD	2015-03-26 07:48:39 UTC (rev 234952)
@@ -3,7 +3,7 @@
 
 pkgname=libdrm
 pkgver=2.4.60
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
 license=('custom')
@@ -13,20 +13,29 @@
 replaces=('libdrm-new' 'libdrm-nouveau')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig}
-        COPYING)
+        COPYING
+        0001-xf86drm-Fix-ioctl-struct-clearing-in-drmAgpEnable.patch)
 sha256sums=('99575fc6c8e31f59193f5320fd4db7a5478e2641b5266147caab9aa875b59889'
             'SKIP'
-            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
+            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93'
+            'b9a4e77e50a0c11fbdf95b277fe4a6943eba3a63b5b90c548cbc5159db1d32f3')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst at canonical.com>
 validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau at intel.com>
 
-build() {
+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
-  
+
+}
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --enable-udev
   make
 }