From 978b66db73218fd5354e8a315e243c174e69404e Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Fri, 4 Dec 2009 12:56:17 +0000 Subject: x11-base/nouveau-drm: new snapshot svn path=/sunrise/; revision=9644 --- x11-base/nouveau-drm/ChangeLog | 7 ++ x11-base/nouveau-drm/Manifest | 9 +- .../files/nouveau-drm-20091016-Makefile | 102 --------------------- .../files/nouveau-drm-20091204-Makefile | 102 +++++++++++++++++++++ .../nouveau-drm-20091204-nodename_to_devnode.patch | 21 +++++ x11-base/nouveau-drm/nouveau-drm-20091016.ebuild | 43 --------- x11-base/nouveau-drm/nouveau-drm-20091204.ebuild | 49 ++++++++++ 7 files changed, 184 insertions(+), 149 deletions(-) delete mode 100644 x11-base/nouveau-drm/files/nouveau-drm-20091016-Makefile create mode 100644 x11-base/nouveau-drm/files/nouveau-drm-20091204-Makefile create mode 100644 x11-base/nouveau-drm/files/nouveau-drm-20091204-nodename_to_devnode.patch delete mode 100644 x11-base/nouveau-drm/nouveau-drm-20091016.ebuild create mode 100644 x11-base/nouveau-drm/nouveau-drm-20091204.ebuild 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) + -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 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-20091016-Makefile deleted file mode 100644 index 123bc5339..000000000 --- a/x11-base/nouveau-drm/files/nouveau-drm-20091016-Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# 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 - -# 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_NOUVEAU_DEBUG=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 -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG - -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 diff --git a/x11-base/nouveau-drm/files/nouveau-drm-20091204-Makefile b/x11-base/nouveau-drm/files/nouveau-drm-20091204-Makefile new file mode 100644 index 000000000..123bc5339 --- /dev/null +++ b/x11-base/nouveau-drm/files/nouveau-drm-20091204-Makefile @@ -0,0 +1,102 @@ +# 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 + +# 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_NOUVEAU_DEBUG=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 +MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG + +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 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-20091016.ebuild deleted file mode 100644 index 94c10b4bf..000000000 --- a/x11-base/nouveau-drm/nouveau-drm-20091016.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit linux-info linux-mod - -DESCRIPTION="Nouveau DRM Kernel Modules for X11" -HOMEPAGE="http://nouveau.freedesktop.org/" -SRC_URI="http://omploader.org/vMms3bw/${P}.tar.gz" - -LICENSE="X11" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" - -DEPEND="virtual/linux-sources - !x11-base/x11-drm" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/master - -CONFIG_CHECK="~BACKLIGHT_CLASS_DEVICE ~DEBUG_FS !DRM ~FB_CFB_FILLRECT ~FB_CFB_COPYAREA ~FB_CFB_IMAGEBLIT ~!FB_VESA ~!FB_UVESA ~FRAMEBUFFER_CONSOLE" - -pkg_setup() { - linux-mod_pkg_setup - if kernel_is lt 2 6 31; then - eerror "You need at least kernel 2.6.31" - die "Kernel too old" - fi -} - -src_compile() { - set_arch_to_kernel - emake LINUXDIR="${KERNEL_DIR}" NOUVEAUROOTDIR="${PWD}" -f "${FILESDIR}"/${P}-Makefile || die "Compiling kernel modules failed" -} - -src_install() { - insinto "/lib/modules/${KV_FULL}/${PN}" - doins drivers/gpu/drm/{*/,}*.ko || die "doins failed" -} diff --git a/x11-base/nouveau-drm/nouveau-drm-20091204.ebuild b/x11-base/nouveau-drm/nouveau-drm-20091204.ebuild new file mode 100644 index 000000000..1cb46570b --- /dev/null +++ b/x11-base/nouveau-drm/nouveau-drm-20091204.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit linux-info linux-mod + +DESCRIPTION="Nouveau DRM Kernel Modules for X11" +HOMEPAGE="http://nouveau.freedesktop.org/" +SRC_URI="http://omploader.org/vMms3bw/${P}.tar.gz" + +LICENSE="X11" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="" + +DEPEND="virtual/linux-sources + !x11-base/x11-drm" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/master + +CONFIG_CHECK="~BACKLIGHT_CLASS_DEVICE ~DEBUG_FS !DRM ~FB_CFB_FILLRECT ~FB_CFB_COPYAREA ~FB_CFB_IMAGEBLIT ~!FB_VESA ~!FB_UVESA ~FRAMEBUFFER_CONSOLE" + +pkg_setup() { + linux-mod_pkg_setup + if kernel_is lt 2 6 31; then + eerror "You need at least kernel 2.6.31" + die "Kernel too old" + 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" +} + +src_install() { + insinto "/lib/modules/${KV_FULL}/${PN}" + doins drivers/gpu/drm/{*/,}*.ko || die "doins failed" +} -- cgit v1.2.3-65-gdbad