Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild')
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild57
1 files changed, 30 insertions, 27 deletions
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
}