[arch-commits] Commit in nouveau-drm/repos (4 files)

[andyrtr at archlinux.org]

    Date: Monday, December 21, 2009 @ 12:48:36
  Author: andyrtr
Revision: 61677

Merged revisions 61675 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/nouveau-drm/trunk

........
  r61675 | andyrtr | 2009-12-21 17:46:41 +0000 (Mo, 21 Dez 2009) | 2 lines
  
  upgpkg: nouveau-drm 0.0.15_20091220-1
      new snapshot 20091220; optdepend on new nouveau-firmware pkg
........

Modified:
  nouveau-drm/repos/testing-x86_64/	(properties)
  nouveau-drm/repos/testing-x86_64/Makefile
  nouveau-drm/repos/testing-x86_64/PKGBUILD
Deleted:
  nouveau-drm/repos/testing-x86_64/kernel2.6.32_buildfix.patch

-----------------------------+
 Makefile                    |    3 ++-
 PKGBUILD                    |   12 +++++-------
 kernel2.6.32_buildfix.patch |   36 ------------------------------------
 3 files changed, 7 insertions(+), 44 deletions(-)


Property changes on: nouveau-drm/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /nouveau-drm/trunk:1-60808
   + /nouveau-drm/trunk:1-61676

Modified: testing-x86_64/Makefile
===================================================================
--- testing-x86_64/Makefile	2009-12-21 17:47:31 UTC (rev 61676)
+++ testing-x86_64/Makefile	2009-12-21 17:48:36 UTC (rev 61677)
@@ -43,6 +43,7 @@
 	CONFIG_DRM_NOUVEAU=m \
 	CONFIG_DRM_NOUVEAU_KMS=n \
 	CONFIG_DRM_NOUVEAU_BACKLIGHT=y \
+	CONFIG_DRM_NOUVEAU_DEBUG=y \
 	CONFIG_DRM_I2C_CH7006=m \
 	CONFIG_DRM_TDFX=n \
 	CONFIG_DRM_R128=n \
@@ -58,6 +59,7 @@
 EXTRA_CFLAGS :=
 MYEXTRA_CFLAGS :=
 MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT
+MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG
 
 ifneq ($(GIT_REVISION),)
 MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"'
@@ -98,4 +100,3 @@
 
 # The commit id of the archive can be read with
 # $ zcat foo.tar.gz | git get-tar-commit-id
-

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-12-21 17:47:31 UTC (rev 61676)
+++ testing-x86_64/PKGBUILD	2009-12-21 17:48:36 UTC (rev 61677)
@@ -3,7 +3,7 @@
 # Contributor: buddabrod <buddabrod at gmail.com>
 
 pkgname=nouveau-drm
-_snapdate=20091206
+_snapdate=20091220
 pkgver=0.0.15_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
 _kernver='2.6.32-ARCH'
 pkgrel=1
@@ -12,6 +12,8 @@
 url="http://nouveau.freedesktop.org/"
 depends=("kernel26>=2.6.32" "kernel26<2.6.33")
 makedepends=("kernel26-headers>=2.6.32" "kernel26-headers<2.6.33")
+# http://nouveau.freedesktop.org/wiki/InstallDRM#head-771a47a133fba6a5a70253656e76c61e9bff93bd
+optdepends=('nouveau-firmware: may be needed for very new card (GF6 and above) to work properly where the OSS replacement does not work well')
 #makedepends=('git' 'autoconf' 'pkgconfig')
 install=${pkgname}.install
 license=('GPL')
@@ -19,16 +21,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
-	kernel2.6.32_buildfix.patch
 	Makefile)
-md5sums=('b9c29f5d032e99c2c96998b010730dbf'
-         '46fc6e96026b2ec54ea143ca687481d6'
-         'b619729a9374b7172fc1a7ce59f7f3ad')
+md5sums=('10ff91f44db641839c73b4ab2de11798'
+         'e7d5df80186d5c736e82b0a7d46216bc')
 
 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

Deleted: testing-x86_64/kernel2.6.32_buildfix.patch
===================================================================
--- testing-x86_64/kernel2.6.32_buildfix.patch	2009-12-21 17:47:31 UTC (rev 61676)
+++ testing-x86_64/kernel2.6.32_buildfix.patch	2009-12-21 17:48:36 UTC (rev 61677)
@@ -1,36 +0,0 @@
---- 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>
-+#include <linux/version.h>
- 
- #include "drm_sysfs.h"
- #include "drm_core.h"
-@@ -77,7 +78,11 @@
- 		       CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
- }
- 
--static char *drm_nodename(struct device *dev)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32))
-+  static char *drm_nodename(struct device *dev)
-+#else
-+  static char *drm_devnode(struct device *dev, mode_t *mode)
-+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) */
- {
- 	return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
- }
-@@ -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
-+	class->devnode = drm_devnode;
-+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) */
- 
- 	return class;
-