[arch-commits] Commit in nouveau-drm/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Thursday, October 8, 2009 @ 15:07:07
  Author: andyrtr
Revision: 54322

upgpkg: nouveau-drm 0.0.15_20091008-1
    new snapshot 20091008

Modified:
  nouveau-drm/trunk/Makefile
  nouveau-drm/trunk/PKGBUILD
Deleted:
  nouveau-drm/trunk/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch

----------------------------------------------------------------+
 0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch |   25 ----------
 Makefile                                                       |    1 
 PKGBUILD                                                       |   13 ++---
 3 files changed, 6 insertions(+), 33 deletions(-)

Deleted: 0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch
===================================================================
--- 0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch	2009-10-08 13:44:52 UTC (rev 54321)
+++ 0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch	2009-10-08 19:07:07 UTC (rev 54322)
@@ -1,25 +0,0 @@
-From 11f193fa874dc995a499601aa32b33938dc7fbeb Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin at 0x04.net>
-Date: Tue, 29 Sep 2009 23:50:16 +0200
-Subject: [PATCH] drm/nouveau: fix missized allocation for ttm_bo_global struct
-
----
- drivers/gpu/drm/nouveau/nouveau_ttm.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
-index 352f04d..7818981 100644
---- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
-@@ -103,7 +103,7 @@ nouveau_ttm_global_init(struct drm_nouveau_private *dev_priv)
- 	dev_priv->ttm.bo_global_ref.mem_glob = global_ref->object;
- 	global_ref = &dev_priv->ttm.bo_global_ref.ref;
- 	global_ref->global_type = TTM_GLOBAL_TTM_BO;
--	global_ref->size = sizeof(struct ttm_mem_global);
-+	global_ref->size = sizeof(struct ttm_bo_global);
- 	global_ref->init = &ttm_bo_global_init;
- 	global_ref->release = &ttm_bo_global_release;
- 
--- 
-1.6.0.4
-

Modified: Makefile
===================================================================
--- Makefile	2009-10-08 13:44:52 UTC (rev 54321)
+++ Makefile	2009-10-08 19:07:07 UTC (rev 54322)
@@ -98,3 +98,4 @@
 
 # The commit id of the archive can be read with
 # $ zcat foo.tar.gz | git get-tar-commit-id
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-08 13:44:52 UTC (rev 54321)
+++ PKGBUILD	2009-10-08 19:07:07 UTC (rev 54322)
@@ -3,10 +3,10 @@
 # Contributor: buddabrod <buddabrod at gmail.com>
 
 pkgname=nouveau-drm
-_snapdate=20090920
+_snapdate=20091008
 pkgver=0.0.15_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
 _kernver='2.6.31-ARCH'
-pkgrel=2
+pkgrel=1
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -18,15 +18,12 @@
 source=(ftp://ftp.archlinux.org/other/$pkgname/master-${_snapdate}.tar.gz 
 	#http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz
 	# get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat
-	Makefile
-	0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch)
-md5sums=('1eaa4874e4e1ba31d29f56046c6d5f52'
-         '84e2fdf54c027372fbce6c0d81127c24'
-         '0cb580eb4e2007982675a9eb1009f864')
+	Makefile)
+md5sums=('5b54442de27b76f7076b46dd803c65f1'
+         'b619729a9374b7172fc1a7ce59f7f3ad')
 
 build() {
   cd ${srcdir}/master
-  patch -Np1 -i $srcdir/0001-drm-nouveau-fix-missized-allocation-for-ttm_bo_glob.patch || return 1
   
   mkdir nouveau
   cp $srcdir/Makefile ${srcdir}/master/nouveau/