fork nvidia-drivers

3 files changed, 46 insertions, 28 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 4449ecd..c1c3ac4 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,5 +1,6 @@
 AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
+AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577
 DIST NVIDIA-FreeBSD-x86-290.10.tar.gz 32042469 RMD160 712cd816ab24319d03ae475af0ac2a56518ef58b SHA1 4fe79060b9e475e4a74b7b17e95410bad1f33427 SHA256 f5accbdac0b231a8073f76c1d1d8ace7cb98ebe167888c31183a2752a669ee92
 DIST NVIDIA-Linux-x86-290.10.run 34691272 RMD160 ddcee14e7b474a646a707fd966cc1d223d3177eb SHA1 dfc095db2bdca672e6cfe7878a75c5d25d8c54a9 SHA256 99be8f53aa1f777445e5a4cac27acd7d85990db712b5c29caac865145fc5adaa
 DIST NVIDIA-Linux-x86_64-290.10.run 58334192 RMD160 a850a83643d507ff84be76691188a5ecd870c4d8 SHA1 f3e8b43248d9d167b1c3f67a8cba9c1f2c53e583 SHA256 34a2ab07f4ae7afdeb2c8415f3f37c1099e6690eb25f3dbef92eca771f7ce4cd
-EBUILD nvidia-drivers-290.10.ebuild 17103 RMD160 51f42abb7a4a9421eb5c07f9457451e5e750ae31 SHA1 f2b24f805af4b17b6dd353260c6004de30ba298a SHA256 0bb77fd75c7c77342b5cb2668d36a466a6d1103d02d7807109ada73501cd4288
+EBUILD nvidia-drivers-290.10.ebuild 17625 RMD160 d36b3e2b2e8d96ea67861ac21f694f8690fff24d SHA1 14670fad7f318efc44d82c22dde790cdaa39284e SHA256 29776a8347ad7efff0b3b5f4323e88a550e6b8f7b6d6d53bd14f88f606367285
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
new file mode 100644
index 0000000..a96b0cd
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-169.07
@@ -0,0 +1,14 @@
+# Nvidia drivers support
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+
+# To tweak the driver the following options can be used, note that
+# you should be careful, as it could cause instability!! For more 
+# options see /usr/share/doc/PACKAGE/README 
+#
+# !!! SECURITY WARNING !!!
+# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
+# WHAT YOU ARE DOING.
+# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
+# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
+options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild
index f896a84..9cd1fcb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild
@@ -62,10 +62,10 @@ QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
 QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
+	usr/lib32/OpenCL/vendor/nvidia/libcuda.so.${PV}
 	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/libOpenCL.so.1.0.0
-	usr/lib32/libnvidia-compiler.so.${PV}"
+	usr/lib32/OpenCL/vendor/nvidia/libOpenCL.so.1.0.0
+	usr/lib32/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}"
 
 QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
@@ -79,12 +79,12 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 
 QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libnvidia-compiler.so.${PV}
+	usr/lib32/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libOpenCL.so.1.0.0
-	usr/lib64/libnvidia-compiler.so.${PV}
+	usr/lib32/OpenCL/vendor/nvidia/libcuda.so.${PV}
+	usr/lib32/OpenCL/vendor/nvidia/libOpenCL.so.1.0.0
+	usr/lib64/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
 	usr/lib64/libnvidia-cfg.so.${PV}
 	usr/lib64/libnvidia-ml.so.${PV}
@@ -94,8 +94,8 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib64/libnvidia-glcore.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libOpenCL.so.1.0.0
+	usr/lib64/OpenCL/vendor/nvidia/libcuda.so.${PV}
+	usr/lib64/OpenCL/vendor/nvidia/libOpenCL.so.1.0.0
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
@@ -114,20 +114,20 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}"
 
-QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
+QA_SONAME_x86="usr/lib/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}"
 
-QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
-	usr/lib32/libnvidia-compiler.so.${PV}"
+QA_SONAME_amd64="usr/lib64/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib32/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}"
 
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
+QA_DT_HASH_amd64="usr/lib32/OpenCL/vendor/nvidia/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/libOpenCL.so.1.0.0
-	usr/lib32/libnvidia-compiler.so.${PV}
+	usr/lib32/OpenCL/vendor/nvidia/libOpenCL.so.1.0.0
+	usr/lib32/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
+	usr/lib64/OpenCL/vendor/nvidia/libcuda.so.${PV}
 	usr/lib64/libnvidia-cfg.so.${PV}
 	usr/lib64/libnvidia-glcore.so.${PV}
 	usr/lib64/libnvidia-ml.so.${PV}
@@ -136,14 +136,14 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/lib64/libOpenCL.so.1.0.0
-	usr/lib64/libnvidia-compiler.so.${PV}
+	usr/lib64/OpenCL/vendor/nvidia/libOpenCL.so.1.0.0
+	usr/lib64/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib64/libnvcuvid.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
 	usr/bin/nvidia-settings"
 
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
+QA_DT_HASH_x86="usr/lib/OpenCL/vendor/nvidia/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}
@@ -153,14 +153,14 @@ QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	usr/lib/libXvMCNVIDIA.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libOpenCL.so.1.0.0
-	usr/lib/libnvidia-compiler.so.${PV}
+	usr/lib/OpenCL/vendor/nvidia/libOpenCL.so.1.0.0
+	usr/lib/OpenCL/vendor/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib/libnvcuvid.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
 	usr/bin/nvidia-settings"
 
-S="${WORKDIR}/"
+S=${WORKDIR}/
 
 mtrr_check() {
 	ebegin "Checking for MTRR support"
@@ -288,6 +288,9 @@ src_prepare() {
 		# If greater than 2.6.5 use M= instead of SUBDIR=
 		convert_to_m "${NV_SRC}"/Makefile.kbuild
 	fi
+	cat <<- EOF > "${S}"/nvidia.icd
+		/usr/$(get_libdir)/OpenCL/vendor/libcuda.so
+	EOF
 }
 
 src_compile() {
@@ -387,7 +390,6 @@ src_install() {
 
 	# OpenCL ICD for NVIDIA
 	if use kernel_linux; then
-		dodir /etc/OpenCL/vendors
 		insinto /etc/OpenCL/vendors
 		doins nvidia.icd
 	fi
@@ -459,6 +461,7 @@ donvidia() {
 src_install-libs() {
 	local inslibdir=$(get_libdir)
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local CL_ROOT=/usr/${inslibdir}/OpenCL/vendor/nvidia
 	local libdir= sover=
 
 	if use kernel_linux; then
@@ -488,10 +491,10 @@ src_install-libs() {
 
 	# CUDA & OpenCL
 	if use kernel_linux; then
-		donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover}
-		donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover}
-		donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0
-		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
+		donvidia ${CL_ROOT} ${libdir}/libcuda.so ${sover}
+		donvidia ${CL_ROOT} ${libdir}/libnvidia-compiler.so ${sover}
+		donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0
+		#dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so
 	fi
 }