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

Thu Sep 10 20:06:06 UTC 2009

Date: Thursday, September 10, 2009 @ 16:06:05
  Author: andyrtr
Revision: 51747

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

........
  r51743 | andyrtr | 2009-09-10 18:24:51 +0000 (Do, 10 Sep 2009) | 1 line
  
  switch to master branch; master-compat got dropped upstream and was hell buggy
........
  r51744 | andyrtr | 2009-09-10 19:04:26 +0000 (Do, 10 Sep 2009) | 2 lines
  
  upgpkg: nouveau-drm 0.0.15_20090909-1
      new version based on master branch
........

Added:
  nouveau-drm/repos/testing-i686/Makefile
    (from rev 51744, nouveau-drm/trunk/Makefile)
Modified:
  nouveau-drm/repos/testing-i686/	(properties)
  nouveau-drm/repos/testing-i686/PKGBUILD

----------+
 Makefile |  100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   32 ++++++++++---------
 2 files changed, 118 insertions(+), 14 deletions(-)


Property changes on: nouveau-drm/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /nouveau-drm/trunk:1-51706
   + /nouveau-drm/trunk:1-51746

Copied: nouveau-drm/repos/testing-i686/Makefile (from rev 51744, nouveau-drm/trunk/Makefile)
===================================================================

--- testing-i686/Makefile	                        (rev 0)
+++ testing-i686/Makefile	2009-09-10 20:06:05 UTC (rev 51747)
@@ -0,0 +1,100 @@
+# This Makefile is loosely based on the drm.git/linux-core/Makefile and
+# the preliminary work by Christopher James Halse Rogers.
+# Edited by Pekka Paalanen <pq at iki.fi>
+
+# By default, the build is done against the running linux kernel source.
+# To build against a different kernel source tree, set LINUXDIR:
+#
+#    make LINUXDIR=/path/to/kernel/source
+
+# By default, it is assumed the Nouveau kernel tree is found in $PWD/../.
+# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR:
+#
+#    make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6
+
+
+ifndef LINUXDIR
+RUNNING_REL := $(shell uname -r)
+
+LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \
+		echo /lib/modules/$(RUNNING_REL)/source; \
+		else echo /lib/modules/$(RUNNING_REL)/build; fi)
+endif
+
+NOUVEAUGITREMOTE ?= origin
+NOUVEAUROOTDIR ?= $(CURDIR)/..
+override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR))
+
+TESTFILE := include/drm/nouveau_drm.h
+ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),)
+$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \
+	please set NOUVEAUROOTDIR)
+endif
+
+GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \
+	git describe --always --abbrev=17 2> /dev/null)
+
+DRMINC := -I$(NOUVEAUROOTDIR)/include/drm
+DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm
+DRMCFG := \
+	CONFIG_DRM=m \
+	CONFIG_DRM_KMS_HELPER=m \
+	CONFIG_DRM_TTM=m \
+	CONFIG_DRM_NOUVEAU=m \
+	CONFIG_DRM_NOUVEAU_KMS=n \
+	CONFIG_DRM_NOUVEAU_BACKLIGHT=y \
+	CONFIG_DRM_I2C_CH7006=m \
+	CONFIG_DRM_TDFX=n \
+	CONFIG_DRM_R128=n \
+	CONFIG_DRM_RADEON=n \
+	CONFIG_DRM_MGA=n \
+	CONFIG_DRM_I810=n \
+	CONFIG_DRM_I830=n \
+	CONFIG_DRM_I915=n \
+	CONFIG_DRM_SIS=n \
+	CONFIG_DRM_SAVAGE=n \
+	CONFIG_DRM_VIA=n
+
+EXTRA_CFLAGS :=
+MYEXTRA_CFLAGS :=
+MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT
+
+ifneq ($(GIT_REVISION),)
+MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"'
+endif
+
+MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG)
+
+MYEXTRA_CFLAGS += $(EXTRA_CFLAGS)
+ifneq ($(MYEXTRA_CFLAGS),)
+MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)"
+endif
+
+.PHONY: all modules install clean archive FORCE
+
+all: modules
+FORCE:
+
+modules:
+	$(MAKE) $(MYPARMS) modules
+
+install:
+	$(MAKE) $(MYPARMS) modules_install
+
+clean:
+	$(MAKE) $(MYPARMS) clean
+
+archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz
+
+newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau
+
+%.tar: FORCE
+	GIT_DIR=$(NOUVEAUROOTDIR)/.git \
+	git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \
+		drivers/gpu/drm include/drm $(EXTRAS) > $@
+
+%.tar.gz: %.tar
+	gzip -9 -c $< > $@
+
+# The commit id of the archive can be read with
+# $ zcat foo.tar.gz | git get-tar-commit-id

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-09-10 20:04:49 UTC (rev 51746)
+++ testing-i686/PKGBUILD	2009-09-10 20:06:05 UTC (rev 51747)
@@ -3,11 +3,10 @@
 # Contributor: buddabrod <buddabrod at gmail.com>
 
 pkgname=nouveau-drm
-_snapdate=20090908
+_snapdate=20090909
 pkgver=0.0.15_${_snapdate} # see drivers/gpu/drm/nouveau_drv.h for version
-#_gitdate=20090908
 _kernver='2.6.31-ARCH'
-pkgrel=2
+pkgrel=1
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -16,21 +15,26 @@
 install=${pkgname}.install
 license=('GPL')
 options=('force')
-source=(ftp://ftp.archlinux.org/other/$pkgname/master-compat_${_snapdate}.tar.gz
-	#http://people.freedesktop.org/~pq/nouveau-drm/master-compat.tar.gz
-)
-md5sums=('a181adcef3ffd8806037bf883d137d4e')
-  
+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)
+md5sums=('9c46ff084d305e8568dd318c8dccc531'
+         '84e2fdf54c027372fbce6c0d81127c24')
+
 build() {
-  cd ${srcdir}/master-compat
+  cd ${srcdir}/master
+  mkdir nouveau
+  cp $srcdir/Makefile ${srcdir}/master/nouveau/
   cd nouveau
   make DRM_MODULES="nouveau" || return 1
 
-  install -D -m 0644 ${srcdir}/master-compat/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/`uname -r`/updates/drm.ko || return 1
-  install -D -m 0644 ${srcdir}/master-compat/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/`uname -r`/kernel/drivers/video/nouveau.ko || return 1
-  install -D -m 0644 ${srcdir}/master-compat/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/`uname -r`/updates/ttm.ko || return 1
-  install -D -m 0644 ${srcdir}/master-compat/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/`uname -r`/updates/ch7006.ko || return 1
-  install -D -m 0644 ${srcdir}/master-compat/include/drm/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm.h || 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/include/drm/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm.h || return 1
 
   # install script
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/${pkgname}.install


