From ea1f4bece8870857691a7123bdc899562760b3fe Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 20 Dec 2011 23:14:59 +0000
Subject: Tue Dec 20 23:14:59 UTC 2011

---
 multilib/lib32-libdrm/PKGBUILD       | 17 +++++++++++------
 multilib/lib32-libdrm/git_fixes.diff | 13 +++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 multilib/lib32-libdrm/git_fixes.diff

(limited to 'multilib/lib32-libdrm')

diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD
index f139d9267..93f3763a3 100644
--- a/multilib/lib32-libdrm/PKGBUILD
+++ b/multilib/lib32-libdrm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57787 2011-11-02 16:54:51Z lcarlier $
+# $Id: PKGBUILD 60845 2011-12-19 13:05:47Z lcarlier $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgbasename=libdrm
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.27
-pkgrel=2
+pkgver=2.4.29
+pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
 arch=(x86_64)
 license=('custom')
@@ -13,9 +13,11 @@ makedepends=(gcc-multilib)
 options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
-        no-pthread-stubs.patch)
-md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd'
-         'c722c8406507b7e3a8da7a3030d1d9cf')
+        no-pthread-stubs.patch
+	git_fixes.diff)
+md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953'
+         'c722c8406507b7e3a8da7a3030d1d9cf'
+         'aebd5336568090b8ec084fabcfb08071')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
@@ -26,6 +28,9 @@ build() {
 
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
 
+  # git fixes - currently none
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+
   # libtoolize --force
   autoreconf --force --install
   ./configure --prefix=/usr --libdir=/usr/lib32 \
diff --git a/multilib/lib32-libdrm/git_fixes.diff b/multilib/lib32-libdrm/git_fixes.diff
new file mode 100644
index 000000000..dc80155f2
--- /dev/null
+++ b/multilib/lib32-libdrm/git_fixes.diff
@@ -0,0 +1,13 @@
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 19441f3..eb9dd32 100644
+--- a/intel/intel_bufmgr_gem.c
++++ b/intel/intel_bufmgr_gem.c
+@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
+ 				      bufmgr_gem->vma_cache.next,
+ 				      vma_list);
+ 		assert(bo_gem->map_count == 0);
+-		DRMLISTDEL(&bo_gem->vma_list);
++		DRMLISTDELINIT(&bo_gem->vma_list);
+ 
+ 		if (bo_gem->mem_virtual) {
+ 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
-- 
cgit v1.2.3-54-g00ecf