diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-02-17 13:22:34 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-02-17 13:22:34 +0000 |
| commit | 5587acc1a4dc99e51fe1655745e14ceffb575462 (patch) | |
| tree | e1c21d2cb118ed1605f12da1a3918b0a64a6395d /x11-drivers/nvidia-drivers | |
| parent | Remove old development versions (diff) | |
| download | gentoo-2-5587acc1a4dc99e51fe1655745e14ceffb575462.tar.gz gentoo-2-5587acc1a4dc99e51fe1655745e14ceffb575462.tar.bz2 gentoo-2-5587acc1a4dc99e51fe1655745e14ceffb575462.zip | |
Install the Unified Memory kernel module (nvidia-uvm) (bug #501540 by Andreas Steinmetz).
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-drivers/nvidia-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/metadata.xml | 6 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild | 7 |
3 files changed, 14 insertions, 6 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 20b663d7ab51..b45cb6cbca7b 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.524 2014/02/10 16:22:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.525 2014/02/17 13:22:34 jer Exp $ + + 17 Feb 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-334.16-r5.ebuild, + metadata.xml: + Install the Unified Memory kernel module (nvidia-uvm) (bug #501540 by Andreas + Steinmetz). *nvidia-drivers-334.16-r5 (10 Feb 2014) diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml index 783d2d6f3cf5..1766fc2a8970 100644 --- a/x11-drivers/nvidia-drivers/metadata.xml +++ b/x11-drivers/nvidia-drivers/metadata.xml @@ -10,9 +10,9 @@ </maintainer> <longdescription>NVIDIA X11 driver and GLX libraries</longdescription> <use> - <flag name='tools'>Installs additional tools such as nvidia-settings</flag> - <flag name='X'>Controls whether the X.org driver, OpenGL libraries, - XvMC libraries, and VDPAU libraries are installed</flag> + <flag name='X'>Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag> <flag name='pax_kernel'>PaX patches from the PaX project</flag> + <flag name='tools'>Install additional tools such as nvidia-settings</flag> + <flag name='uvm'>Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag> </use> </pkgmetadata> diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild index c33be875a682..0226425fbb29 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild,v 1.1 2014/02/10 16:22:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r5.ebuild,v 1.2 2014/02/17 13:22:34 jer Exp $ EAPI=5 @@ -25,7 +25,7 @@ SRC_URI=" LICENSE="GPL-2 NVIDIA-r1" SLOT="0" KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X" +IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm" RESTRICT="bindist mirror strip" EMULTILIB_PKG="true" @@ -117,6 +117,7 @@ pkg_setup() { if use kernel_linux; then linux-mod_pkg_setup MODULE_NAMES="nvidia(video:${S}/kernel)" + use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)" BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" # linux-mod_src_compile calls set_arch_to_kernel, which @@ -185,6 +186,8 @@ src_compile() { # on FreeBSD there's one and triggers the kernel module build, as we install # it by itself, pass this. + use uvm && append-cppflags -DNV_UVM_ENABLE -DNVIDIA_UVM_LITE_ENABLED + cd "${NV_SRC}" if use kernel_FreeBSD; then MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ |