x11-base/nouveau-drm: new snapshot

svn path=/sunrise/; revision=9644

5 files changed, 39 insertions, 4 deletions

diff --git a/x11-base/nouveau-drm/ChangeLog b/x11-base/nouveau-drm/ChangeLog
index f39d9cda6..ecbcf5c16 100644
--- a/x11-base/nouveau-drm/ChangeLog
+++ b/x11-base/nouveau-drm/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Dec 2009; Chi-Thanh Christopher Nguyen (chithead)
+  <chithanh@cs.tu-berlin.de> -nouveau-drm-20091016.ebuild,
+  -files/nouveau-drm-20091016-Makefile, +nouveau-drm-20091204.ebuild,
+  +files/nouveau-drm-20091204-Makefile,
+  +files/nouveau-drm-20091204-nodename_to_devnode.patch:
+  new snapshot
+
   09 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
   nouveau-drm-20091016.ebuild:
   Keywording for ppc
diff --git a/x11-base/nouveau-drm/Manifest b/x11-base/nouveau-drm/Manifest
index dc5824e27..e172f0bfc 100644
--- a/x11-base/nouveau-drm/Manifest
+++ b/x11-base/nouveau-drm/Manifest
@@ -1,5 +1,6 @@
-AUX nouveau-drm-20091016-Makefile 2723 RMD160 468ff0dfb87ccef121e92380afb83041942719d6 SHA1 6fd23ee7d0bb40d70d6445959134919ac5d0dcba SHA256 eaab05b9e70c8557950a688027ba2708525bf97d01a9466c8da3778d8d07c2ef
-DIST nouveau-drm-20091016.tar.gz 1235123 RMD160 b3f404844a21054f1167363e5ed1c2d7ce1ee7d4 SHA1 a81ece07633b73b7e8e02d5ac54f90c1da0764ed SHA256 c489c5ba46301aa15ba1dac0c83bc5fad2ac8972e5bb5106a3c384ed8993e48b
-EBUILD nouveau-drm-20091016.ebuild 1026 RMD160 22b5d018acac66c37e74d05fe0d10af1aa2b58dc SHA1 74d210360a1c128f12e0d0f721a56a84db7116a9 SHA256 bf6c19917dc76482ceb9f6498c817709c87b814b1d9251bd8965f60ca45c405f
-MISC ChangeLog 2910 RMD160 37aa5bf43dcd438e400a3bcdeb019a63ac85f0b3 SHA1 31776645f62611e3cb45962295985163b86fc485 SHA256 7761e37fe3d2248b9b630818cd99f55416414e929b7df2d90fb1fca6bcc0990b
+AUX nouveau-drm-20091204-Makefile 2723 RMD160 468ff0dfb87ccef121e92380afb83041942719d6 SHA1 6fd23ee7d0bb40d70d6445959134919ac5d0dcba SHA256 eaab05b9e70c8557950a688027ba2708525bf97d01a9466c8da3778d8d07c2ef
+AUX nouveau-drm-20091204-nodename_to_devnode.patch 704 RMD160 15f8a139e2e72bde67b7754964889ac8d310b976 SHA1 bca40bb432de9e2404abbd8dda4df0702ca572eb SHA256 0a7fcf39fb59c756fb223eacbfa38f7a7470451d51eca5f765ee24cd9435cd8c
+DIST nouveau-drm-20091204.tar.gz 1247089 RMD160 a4cdb83ed1bf3772ecf74882db9f2cba372fe96f SHA1 278afa91c221a81e290a206580c65373811cbb83 SHA256 67acc839260c19d59f1603c5f67f0577f6acb518b73d949cdde27b4dd31c76f0
+EBUILD nouveau-drm-20091204.ebuild 1144 RMD160 e706cb343359156ea948688bf569d92554dca2d8 SHA1 390f759a16af711e0546eb65869021196f2321aa SHA256 891e110d2c722c2af2c78c308241ba9e9460008f9a580082e7fecdf9554dfd79
+MISC ChangeLog 3207 RMD160 458ad218fd8c40d32f943d2ee8997464947d6f7c SHA1 107e817e9e19f519e91a724a8e4783c112624906 SHA256 4bb19cd387e8f94666b0cbbcc29f3fe36caf15058bbad5f94bd3445dfc0e1e46
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-base/nouveau-drm/files/nouveau-drm-20091016-Makefile b/x11-base/nouveau-drm/files/nouveau-drm-20091204-Makefile
index 123bc5339..123bc5339 100644
--- a/x11-base/nouveau-drm/files/nouveau-drm-20091016-Makefile
+++ b/x11-base/nouveau-drm/files/nouveau-drm-20091204-Makefile
diff --git a/x11-base/nouveau-drm/files/nouveau-drm-20091204-nodename_to_devnode.patch b/x11-base/nouveau-drm/files/nouveau-drm-20091204-nodename_to_devnode.patch
new file mode 100644
index 000000000..9846f155a
--- /dev/null
+++ b/x11-base/nouveau-drm/files/nouveau-drm-20091204-nodename_to_devnode.patch
@@ -0,0 +1,21 @@
+diff -ruN nouveau-0.0.15+git20090823.old/drivers/gpu/drm/drm_sysfs.c nouveau-0.0.15+git20090823/drivers/gpu/drm/drm_sysfs.c
+--- nouveau-0.0.15+git20090823.old/drivers/gpu/drm/drm_sysfs.c	2009-12-03 01:27:32.394110430 +0000
++++ nouveau-0.0.15+git20090823/drivers/gpu/drm/drm_sysfs.c	2009-12-03 01:42:05.502859645 +0000
+@@ -71,7 +71,7 @@
+ 		       CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
+ }
+ 
+-static char *drm_nodename(struct device *dev)
++static char *drm_devnode(struct device *dev, mode_t *mode)
+ {
+ 	return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
+ }
+@@ -107,7 +107,7 @@
+ 	if (err)
+ 		goto err_out_class;
+ 
+-	class->nodename = drm_nodename;
++	class->devnode = drm_devnode;
+ 
+ 	return class;
+ 
diff --git a/x11-base/nouveau-drm/nouveau-drm-20091016.ebuild b/x11-base/nouveau-drm/nouveau-drm-20091204.ebuild
index 94c10b4bf..1cb46570b 100644
--- a/x11-base/nouveau-drm/nouveau-drm-20091016.ebuild
+++ b/x11-base/nouveau-drm/nouveau-drm-20091204.ebuild
@@ -32,6 +32,12 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	if kernel_is ge 2 6 32; then
+		epatch ${FILESDIR}/${P}-nodename_to_devnode.patch # bug 295633
+	fi
+}
+
 src_compile() {
 	set_arch_to_kernel
 	emake LINUXDIR="${KERNEL_DIR}" NOUVEAUROOTDIR="${PWD}" -f "${FILESDIR}"/${P}-Makefile || die "Compiling kernel modules failed"