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

---
 extra/libdrm/PKGBUILD       | 17 ++++++-----------
 extra/libdrm/git_fixes.diff | 30 ++++++++++++------------------
 2 files changed, 18 insertions(+), 29 deletions(-)

(limited to 'extra/libdrm')

diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 6904b9ca3..94c51c177 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144919 2011-12-10 10:45:30Z andyrtr $
+# $Id: PKGBUILD 145190 2011-12-19 12:35:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.28
+pkgver=2.4.29
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -14,23 +14,18 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         no-pthread-stubs.patch
         COPYING
-	git_fixes.diff 
-	#missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538
-	rbo.h list.h)
-md5sums=('6488f64119c6439fa4038e9cd7b30b67'
+	git_fixes.diff)
+md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953'
          'c722c8406507b7e3a8da7a3030d1d9cf'
          'ba65e71c481b94ef0fb6c23c7f21ffa1'
-         '671b87f9670e709e54a19cd292c6330d'
-         '073846ea43fb4d6130062c1897d92e40'
-         'ce867d3331862c2b87d1a37461b42dbe')
+         'aebd5336568090b8ec084fabcfb08071')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
 
-  # add a missing file in the release tarball
+  # git fixes - currently none
   patch -Np1 -i ${srcdir}/git_fixes.diff
-  cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/
   
   #libtoolize --force
   autoreconf --force --install
diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff
index 5ebcb606a..dc80155f2 100644
--- a/extra/libdrm/git_fixes.diff
+++ b/extra/libdrm/git_fixes.diff
@@ -1,19 +1,13 @@
-From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 05 Dec 2011 21:24:48 +0000
-Subject: test/radeon: add missing files for dist
-
----
-diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am
-index 021ca72..1775669 100644
---- a/tests/radeon/Makefile.am
-+++ b/tests/radeon/Makefile.am
-@@ -9,4 +9,6 @@ noinst_PROGRAMS = \
+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);
  
- radeon_ttm_SOURCES = \
- 	rbo.c \
-+	rbo.h \
-+	list.h \
- 	radeon_ttm.c
---
-cgit v0.9.0.2-2-gbebe
+ 		if (bo_gem->mem_virtual) {
+ 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
-- 
cgit v1.2.3-54-g00ecf