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

[Tobias Powalowski]

    Date: Friday, December 4, 2009 @ 04:15:53
  Author: tpowa
Revision: 60367

upgpkg: nouveau-drm 0.0.15_20091120-2
    bump to new .32 series

Modified:
  nouveau-drm/trunk/PKGBUILD
  nouveau-drm/trunk/kernel2.6.32_buildfix.patch
  nouveau-drm/trunk/nouveau-drm.install

-----------------------------+
 PKGBUILD                    |   21 ++++++++++++---------
 kernel2.6.32_buildfix.patch |   16 ++++++++--------
 nouveau-drm.install         |    4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-12-04 06:20:07 UTC (rev 60366)
+++ PKGBUILD	2009-12-04 09:15:53 UTC (rev 60367)
@@ -5,12 +5,12 @@
 pkgname=nouveau-drm
 _snapdate=20091120
 pkgver=0.0.15_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
-_kernver='2.6.31-ARCH'
-pkgrel=1
+_kernver='2.6.32-ARCH'
+pkgrel=2
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
-depends=("kernel26>=2.6.31" "kernel26<2.6.32")
+depends=("kernel26>=2.6.32" "kernel26<2.6.33")
 #makedepends=('git' 'autoconf' 'pkgconfig')
 install=${pkgname}.install
 license=('GPL')
@@ -18,23 +18,26 @@
 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
+	kernel2.6.32_buildfix.patch
 	Makefile)
 md5sums=('4dda39e216216b55e78e7a4586c137c8'
+         '46fc6e96026b2ec54ea143ca687481d6'
          'b619729a9374b7172fc1a7ce59f7f3ad')
 
 build() {
   cd ${srcdir}/master
-  
+  # add patch for .32 series
+  patch -Np1 -i ${srcdir}/kernel2.6.32_buildfix.patch || return 1
   mkdir nouveau
   cp $srcdir/Makefile ${srcdir}/master/nouveau/
   cd nouveau
   make DRM_MODULES="nouveau" || return 1
 
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/`uname -r`/updates/drm.ko || return 1
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/`uname -r`/updates/drm_kms_helper.ko || return 1
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/`uname -r`/kernel/drivers/video/nouveau.ko || return 1
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/`uname -r`/updates/ttm.ko || return 1
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/`uname -r`/updates/ch7006.ko || return 1
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm.ko || return 1
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm_kms_helper.ko || return 1
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko || return 1
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko || return 1
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko || return 1
   install -D -m 0644 ${srcdir}/master/include/drm/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm.h || return 1
 
   # install script

Modified: kernel2.6.32_buildfix.patch
===================================================================
--- kernel2.6.32_buildfix.patch	2009-12-04 06:20:07 UTC (rev 60366)
+++ kernel2.6.32_buildfix.patch	2009-12-04 09:15:53 UTC (rev 60367)
@@ -1,8 +1,6 @@
-diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
-index 5161172..16a2938 100644
---- a/drivers/gpu/drm/drm_sysfs.c
-+++ b/drivers/gpu/drm/drm_sysfs.c
- -15,6 +15,7 @@
+--- a/drivers/gpu/drm/drm_sysfs.c~	2009-12-04 09:24:31.000000000 +0100
++++ b/drivers/gpu/drm/drm_sysfs.c	2009-12-04 09:24:31.000000000 +0100
+@@ -15,6 +15,7 @@
  #include <linux/device.h>
  #include <linux/kdev_t.h>
  #include <linux/err.h>
@@ -10,7 +8,7 @@
  
  #include "drm_sysfs.h"
  #include "drm_core.h"
- -77,7 +78,11 @@ static ssize_t version_show(struct class *dev, char *buf)
+@@ -77,7 +78,11 @@
  		       CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
  }
  
@@ -23,10 +21,11 @@
  {
  	return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
  }
- -113,7 +118,11 @@ struct class *drm_sysfs_create(struct module *owner, char *name)
+@@ -112,8 +117,11 @@
+ 	err = class_create_file(class, &class_attr_version);
  	if (err)
  		goto err_out_class;
- 
+-
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32))
  	class->nodename = drm_nodename;
 +#else
@@ -34,3 +33,4 @@
 +#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) */
  
  	return class;
+ 

Modified: nouveau-drm.install
===================================================================
--- nouveau-drm.install	2009-12-04 06:20:07 UTC (rev 60366)
+++ nouveau-drm.install	2009-12-04 09:15:53 UTC (rev 60367)
@@ -1,5 +1,5 @@
 post_install() {
-  KERNEL_VERSION='2.6.31-ARCH'
+  KERNEL_VERSION='2.6.32-ARCH'
   depmod -v $KERNEL_VERSION  > /dev/null 2>&1
   echo "if you are running kms in early mode please rebuild your initrd"
 }
@@ -10,7 +10,7 @@
 }
 
 post_remove() {
-  KERNEL_VERSION='2.6.31-ARCH'
+  KERNEL_VERSION='2.6.32-ARCH'
   depmod -v $KERNEL_VERSION	 > /dev/null 2>&1	 
 }