Install the Unified Memory kernel module (nvidia-uvm) (bug #501540 by Andreas Steinmetz).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 20 insertions, 12 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/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 58e9b6e92491..737a157b9b5a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -34,15 +34,15 @@ DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbd
 EBUILD nvidia-drivers-173.14.39.ebuild 16615 SHA256 df85299032940da5c09757185accdfdfc65c9beaa6e07a5ab7224122cbf62521 SHA512 c939a4d4f8e945ef5f90a7842e7110eb18ea5df1b1c9ff08e703b7d744206e0fa49e833f5780cb3f3435652f5e3b5743c74d0d44b7804caab6364236cd5ae6d2 WHIRLPOOL 8df9736aa00dbe6e2f75cb7994e9cfbef635d8c7c451a3d4248929e0b73bd8e73d1b316a5971757b56b1aa40ae3794b093a3adbd7eb840c568410406d9e85c6d
 EBUILD nvidia-drivers-304.119.ebuild 12594 SHA256 41d33636ae72cfb306ae9c2e561218cc06bc79ed6e1ab76e38eb36e9ded0c9a3 SHA512 ef197812a62068ff473e67c732a3def3c71edc4613dde5a6ba27ef64323ecc19f83924c2b2b72250fd2271811d00d51fec913c0fedb1091523674b15c108a1cc WHIRLPOOL e6b7851feacd09bfb94d01f90916a9fa46653e3200f5b7cc2227b3b98bf612245d9bda7f278f7489025b453802c6d2450f400d24d9087f09259dfa257d68cd12
 EBUILD nvidia-drivers-331.38.ebuild 12282 SHA256 1ae32d474538e98e868e314c667d10a70d9f963dde9479e074bbf51be0003ea1 SHA512 4867db76669a90d26a75eb0f15c4c50d270fa47418d223672429eb2ad48e8343f9984ac718de8d07aca11f21e781609c7c2b3a61fcf588d2837ed1e832fb8597 WHIRLPOOL 09572a65a59eb20276f92ec8f610d73bc4a0d563afc6729c0db666f788ac1679c4f05ba9ab864e8e95b118d1150af006df1881cfb0cdac77da53cb2a9f3f0a9c
-EBUILD nvidia-drivers-334.16-r5.ebuild 12803 SHA256 5b5c828fa7ab07508ad2aaefddc5b65823aa2d68ee50d3b607e864dad17ea8ec SHA512 7d8c0a910a3f9f239aad885254725c441f83ac6b4949fd0676c238b2774d84322961042e924251c47475009f9d35bc620bef9125ce7dc437b7f76b5d8f539b70 WHIRLPOOL 05a5ff1b124f20881c3f5a5ab0cb14d7f5f168b6f6c9761ea01a7f3c68357b5e54973ef7dfdadb97802d3d1229d807997f494b28c1929be2fc05e3f969bdb849
+EBUILD nvidia-drivers-334.16-r5.ebuild 12942 SHA256 5481060198030475a7fc27f287b357fc86207ac76d7e5eb25f2cf8a1626977f6 SHA512 011bbb64cbfebaae0dd269729884e3ed953552a2a5e212772f82e34b9143cfee7e26ca4ffa42d9ebe80c1577e30a562d5818d8750c7057ede29255d152933f85 WHIRLPOOL 8d78711ebafb47fc5fdf806f19fa031a24f59fcc22d4660fb4176a15731945df34448ea32853298b8ef38ab48e09e8599be8be8b2b049f0284b24152685b18f9
 EBUILD nvidia-drivers-96.43.23.ebuild 14882 SHA256 f113d8f0155e54f35ba9ae96e9190c9c0c008f53422bc4e4b07d20ac25efa917 SHA512 6fce1ad80cacf25c9c28638255c304c6218d91f13c7b5f3741cf0a10636aa449fb6241ddce211b8be92005a719f6d1e8cb28315a9900c4774c6420e3fbd5eecd WHIRLPOOL b87d4b6618b0cd355c5f9884eea353c1f0741b71b3b4cbb5e5ad985d1121db44fc2e77bffa361e82d7ab761eefe4b78c40498aa987a7ce5927a80bd868c4d53d
-MISC ChangeLog 2627 SHA256 b94eab4ce953bf5041ecccb4f336bc2aa4d78a33000dd945f28410a6853049eb SHA512 bcb6f71333faa80953b75e4662460fcc1b5ed39ce5bf1c10c81b7a492556a56137b34b11ff656e0dd884c1fa5a09f422f7dc1810e087e7a0108d969fcf034bf2 WHIRLPOOL b0f22d39d865105e668d22d54b59605a0cef5cfd3b9285468a24b95afdd8e5eba29222b45f00b9541efea1acc8fb00ab65220f8258224551829ddb632c382848
+MISC ChangeLog 2818 SHA256 1f6ca3d2ce55e2fe954067099df820851cbe440dfebf6261221f65ec86f3c4aa SHA512 7564c1f6918dab4b6ba8a4ff1e7faebfacee48b3725fae53734c0e1415803468c4a657d0f09c35e1c3213bc7dbb2a57cd1bdc71b234723d95e0457170f14968e WHIRLPOOL 63219eedc684446edf8c26ef9c6f190552b8999f77accaec48a69eaf26439bc754a4cd90f6bf59cb1a074e374620ece478c89c941c866dd4037ae4821a57a48d
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
-MISC metadata.xml 678 SHA256 02f45452a129ba14ad5ef0f6bf0031887aead328a7bfaa6977949bc6e8969e61 SHA512 dfc9494e01db7ee3e7ef64dc67c5e26b1a3b0c90ed2850f75c904a76a11df8b3cb137959fe471c788b7a33f555090a9c764af5cfff7f24253127484d4e518e84 WHIRLPOOL 2940677faa8b8183237d9797025079a68164584d2afd09b6e3846cdbbd5824f3c56da545b2f7d1c7d1e72746f540048e4256bde939a28ac785fa598ee2017abd
+MISC metadata.xml 787 SHA256 33a56a587e0681ce738990ea68443d02b094a71063d62f7c76c0f0576e2b2eea SHA512 f90c8a563c98ab47131141261a2934e0db2cdf2fd06f2fa05967c7e68745ffff72ea1ecf2e6865423006c1ca787c3e02bff7bcfafe8f5b343b4d0231bff0b290 WHIRLPOOL 2d8c24530d35c510963e1219fddde15810eb9a851f85842360d80f70dfd9e8f71891d3fa3bba663691080f31cbb70ff4503f727d1a72af0efc6ccf5c1502e58a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL4/NIACgkQVWmRsqeSphP8bACZAVulx97opyUY46pJsidDjjuN
-MysAn3qh/oN72YIcOyfrN/Pq1FJALPNq
-=vrbK
+iEYEAREIAAYFAlMCDRwACgkQVWmRsqeSphNSzgCfeFuxo6G4X0XXjG05jQoZTQe1
+m9UAni19cKuBn4/tBxf98HgJN6WfQXW8
+=XpZ8
 -----END PGP SIGNATURE-----
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)" \