summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-02-15 09:53:34 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-02-15 09:53:34 +0000
commited7e4121410acd13778d7383ddadf0d51046ab25 (patch)
tree398a9e90b78bb6b57f4aff71efde7a511b3f10a5 /x11-drivers
parentVersion bump. (diff)
downloadhistorical-ed7e4121410acd13778d7383ddadf0d51046ab25.tar.gz
historical-ed7e4121410acd13778d7383ddadf0d51046ab25.tar.bz2
historical-ed7e4121410acd13778d7383ddadf0d51046ab25.zip
Move libcuda and libnvidia-compiler back to /usr/lib since they're not creating any conflicts now. That will allow to use CUDA without explicit eselect opencl. Fixes bug 403495 by Michal Januszewski <spock@gentoo.org>
Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog12
-rw-r--r--x11-drivers/nvidia-drivers/Manifest26
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-295.20.ebuild)46
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild)46
4 files changed, 80 insertions, 50 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 2bc508cc1ff0..200b33688cc6 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.320 2012/02/14 21:01:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.321 2012/02/15 09:53:34 xarthisius Exp $
+
+*nvidia-drivers-290.10-r2 (15 Feb 2012)
+*nvidia-drivers-295.20-r1 (15 Feb 2012)
+
+ 15 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
+ +nvidia-drivers-290.10-r2.ebuild, +nvidia-drivers-295.20-r1.ebuild,
+ -nvidia-drivers-290.10-r1.ebuild, -nvidia-drivers-295.20.ebuild:
+ Move libcuda and libnvidia-compiler back to /usr/lib since they're not
+ creating any conflicts now. That will allow to use CUDA without explicit
+ eselect opencl. Fixes bug 403495 by Michal Januszewski <spock@gentoo.org>
*nvidia-drivers-295.20 (14 Feb 2012)
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index c61a753d84e3..ad06088ab167 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
@@ -34,9 +37,26 @@ DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 RMD160 51d5838d1c0e63a1abf47
EBUILD nvidia-drivers-173.14.31.ebuild 15368 RMD160 93ab024561941795dda1c6a2a5060b59481b390b SHA1 4d70d4830c072c779721a28bce2dd71bdddbd290 SHA256 e535c39b73effb4efaec83c0167d0a0f8297412a59a023539728b3b2652739eb
EBUILD nvidia-drivers-275.09.07.ebuild 16589 RMD160 d4d2a8a0ab1052456ec4e3742aca274e25a853cc SHA1 ed46ad25a1b74c0c7de6132930724e4ee1766898 SHA256 b6e68bfa3dcb0cb966aa1e584cb9d4d353670bca2b98a4db949ea0fb590aa42e
EBUILD nvidia-drivers-275.43.ebuild 17128 RMD160 a2db0ad52163bfac39c77700ed2ceca63b431ec6 SHA1 be9bc6b8f825eba3da5e41bfb8665bce1c9ea89e SHA256 1a7396893350e19b4f557ea3a586698c8b944e42959177f72c5fb3a66eaa39df
-EBUILD nvidia-drivers-290.10-r1.ebuild 17961 RMD160 44a079c146373511e4b9417b47b99718e0fd5e7c SHA1 9ad78f1edc2a456c12b49b9a67e2c52cbd5c4997 SHA256 a7b170fc0a785ead8550eddab3ded1283b7df156942e7d31877daab037c3cfd2
+EBUILD nvidia-drivers-290.10-r2.ebuild 17535 RMD160 131955b464e0142422dc756d6e9dce3c86ce0781 SHA1 9267af0661366735ea1f6788ef04fb949ee7a920 SHA256 d147ad4c97a8289e5e08799ebf3a4afd4835486aa9ca4e35207f6ba4ffbb5071
EBUILD nvidia-drivers-290.10.ebuild 17126 RMD160 fb0ec889be40c7d3ff58e2c7b4a766aaf63a88f9 SHA1 b60e00df8938acb1ea77bc035d274f9f5b6ea184 SHA256 c768c98da5878b3ee17c84f1b7d2fe999b042d39e6388c28e9cca31c50b50b23
-EBUILD nvidia-drivers-295.20.ebuild 17954 RMD160 c472e904d38f8c9ceadbe72bf972d3f03748e365 SHA1 b1fa1c020d9ca5ff56bc4ec2acb72c5156d9e25a SHA256 7b1c276b286e76fb6c2ccf13594ba8a5908b5b9e0854204b7264ac2ea6819564
+EBUILD nvidia-drivers-295.20-r1.ebuild 17535 RMD160 4a3cbaf27b118472a7267b64c1a6fd73306fb0a4 SHA1 6eeb6638208183df6a3e09df335c444c772cb3ca SHA256 509d3f4ff4898996030ef09642f079ef379f68459e99e1df7195cc8fbf0a68f4
EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13
-MISC ChangeLog 68774 RMD160 4069df048a87f8e7ef401e04651b644a954018ba SHA1 faa681e7a5c37be63c3597cd8a23bd7cabf6bcc4 SHA256 3c676d70dbb869058ad68a90a229e32e21acbc64a505b629e8c91f7db6d965d6
+MISC ChangeLog 69275 RMD160 357956e6776b8720474f30382ddeb84f9a349ea5 SHA1 d3ddf4e52a124a3447bdc2596b3919b4add39354 SHA256 aa054461c4c416d6dcc8473513c9615aaeef4c5a7be4060b58015db403c4920e
MISC metadata.xml 653 RMD160 29f9c8662d2c08a9c33921ef606bf7059a30752b SHA1 8653d3a29f241f09b6b377c74f3d6a50bad69bbb SHA256 0e645c5ff2f1726137be71aaabd6c2a661602aa3526ef0500892dbfd63f5c31b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPO4CxAAoJEF0huFKJUZL5GusP/A+DVPlygkmNH9h8/rhR2u0y
+Tf8HgJhKr7X0CN2wLSRd+Qd21j7/w9F1MsvxTV1pRQanKkPLcGZ0dUDghp9KDvRi
+doJYjk6O9mvk1MF7pXWeOc1GC1hpRjLfu5XMK7UYk+id0wTgnpF0NCbuKWYGECsB
+hZKoGapfBUsxtilRXsQSGvlrVg9ogmTHWmWXi8ts25dzf9Cb8dL8iYj8UU9cRvW8
+7mA+asYKBskLtk2gQGRVTB4GlwwgQa27Qh/Ofqxk7K+3+rQnRBHEVMvcDbCbb2Ce
+BqKvYXZZ3cZecgLvDrqT2I+U0DaMN+iEkYDutNIz276u4F8v725WS3hpg9AgvR3p
+nlRoEuJd6KRPaIZ9284ARZqiKYmEBoSwVCADwfxB+6ksvTHRTeuNxAiiSQwVfdBT
+ac8Cpu2s/xzbVuUyx1o2Dtmxx2RJYfk6B5SADDCMWPKkf9wuYCbrIhESecEuDQ/a
+bLszUCWbC2Rii+mrXgQGtk487Ds0N9FRH2lsElt+Su1WLziiRis/HK8SWy01pQ0u
+Bcdl8CF8udJpPZMDEGdRHQMn+yVHkCjHyy8L3GXPSJHRCzKj4SxcyMQwWeZYB8Tc
+BUyRap/9Ck2CclmYVYNlgBAoaxjfulICS5xNQlOhBUR/XfqSB8/nMF6eneADrvM7
+gk8X5g0L4B9b6jSQGzWu
+=WfiT
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.ebuild
index 4ad49542ae4b..ee6c76dddd76 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.20.ebuild,v 1.1 2012/02/14 21:01:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.ebuild,v 1.1 2012/02/15 09:53:34 xarthisius Exp $
EAPI="2"
@@ -40,10 +40,10 @@ PDEPEND=">=x11-libs/libvdpau-0.3-r1
QA_TEXTRELS_x86="
usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
usr/lib/libXvMCNVIDIA.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib/libcuda.so.${PV}
usr/lib/libnvcuvid.so.${PV}
usr/lib/libnvidia-cfg.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib/libnvidia-compiler.so.${PV}
usr/lib/libnvidia-glcore.so.${PV}
usr/lib/libnvidia-ml.so.${PV}
usr/lib/libvdpau_nvidia.so.${PV}
@@ -64,9 +64,9 @@ QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
usr/lib32/libnvidia-glcore.so.${PV}
usr/lib32/libvdpau_nvidia.so.${PV}
usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib32/libcuda.so.${PV}
usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+ usr/lib32/libnvidia-compiler.so.${PV}"
QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
usr/lib/libnvidia-glcore.so.${PV}
@@ -74,17 +74,17 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
usr/lib64/libXvMCNVIDIA.so.${PV}
usr/lib/libXvMCNVIDIA.a:NVXVMC.o
usr/lib/libvdpau_nvidia.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib/libnvidia-compiler.so.${PV}
+ usr/lib/libcuda.so.${PV}
usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0"
QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
usr/lib32/libvdpau_nvidia.so.${PV}
- usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib32/libcuda.so.${PV}
usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib32/libnvidia-compiler.so.${PV}
usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
usr/lib64/libnvidia-cfg.so.${PV}
usr/lib64/libnvidia-ml.so.${PV}
@@ -95,8 +95,8 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
usr/lib64/libXvMCNVIDIA.so.${PV}
usr/lib64/OpenCL/vendors/nvidia/libcuda.so.${PV}
- usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib64/libOpenCL.so.1.0.0
+ usr/lib64/libnvidia-compiler.so.${PV}
usr/lib64/xorg/modules/drivers/nvidia_drv.so
usr/bin/nvidia-smi
usr/bin/nvidia-xconfig
@@ -115,20 +115,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/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
-QA_SONAME_amd64="usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
+ usr/lib32/libnvidia-compiler.so.${PV}"
-QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_amd64="usr/lib32/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/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib32/libnvidia-compiler.so.${PV}
usr/lib64/libXvMCNVIDIA.so.${PV}
- usr/lib64/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib64/libcuda.so.${PV}
usr/lib64/libnvidia-cfg.so.${PV}
usr/lib64/libnvidia-glcore.so.${PV}
usr/lib64/libnvidia-ml.so.${PV}
@@ -138,13 +138,13 @@ QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
usr/lib64/xorg/modules/drivers/nvidia_drv.so
usr/lib64/libvdpau_nvidia.so.${PV}
usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib64/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/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
usr/lib/libnvidia-cfg.so.${PV}
usr/lib/libnvidia-glcore.so.${PV}
usr/lib/libnvidia-ml.so.${PV}
@@ -155,7 +155,7 @@ QA_DT_HASH_x86="usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
usr/lib/libXvMCNVIDIA.so.${PV}
usr/lib/libvdpau_nvidia.so.${PV}
usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib/libnvidia-compiler.so.${PV}
usr/lib/libnvcuvid.so.${PV}
usr/bin/nvidia-smi
usr/bin/nvidia-xconfig
@@ -290,7 +290,7 @@ src_prepare() {
convert_to_m "${NV_SRC}"/Makefile.kbuild
fi
cat <<- EOF > "${S}"/nvidia.icd
- /usr/$(get_libdir)/OpenCL/vendors/nvidia/libcuda.so
+ /usr/$(get_libdir)/libcuda.so
EOF
}
@@ -492,8 +492,8 @@ src_install-libs() {
# CUDA & OpenCL
if use kernel_linux; then
- donvidia ${CL_ROOT} ${libdir}/libcuda.so ${sover}
- donvidia ${CL_ROOT} ${libdir}/libnvidia-compiler.so ${sover}
+ donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover}
+ donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover}
donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0
#dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so
fi
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild
index d2ab4f3afc3d..3551c12af738 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild,v 1.3 2012/02/07 10:14:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild,v 1.1 2012/02/15 09:53:34 xarthisius Exp $
EAPI="2"
@@ -40,10 +40,10 @@ PDEPEND=">=x11-libs/libvdpau-0.3-r1
QA_TEXTRELS_x86="
usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
usr/lib/libXvMCNVIDIA.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib/libcuda.so.${PV}
usr/lib/libnvcuvid.so.${PV}
usr/lib/libnvidia-cfg.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib/libnvidia-compiler.so.${PV}
usr/lib/libnvidia-glcore.so.${PV}
usr/lib/libnvidia-ml.so.${PV}
usr/lib/libvdpau_nvidia.so.${PV}
@@ -64,9 +64,9 @@ QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
usr/lib32/libnvidia-glcore.so.${PV}
usr/lib32/libvdpau_nvidia.so.${PV}
usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
- usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib32/libcuda.so.${PV}
usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+ usr/lib32/libnvidia-compiler.so.${PV}"
QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
usr/lib/libnvidia-glcore.so.${PV}
@@ -74,17 +74,17 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
usr/lib64/libXvMCNVIDIA.so.${PV}
usr/lib/libXvMCNVIDIA.a:NVXVMC.o
usr/lib/libvdpau_nvidia.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
- usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib/libnvidia-compiler.so.${PV}
+ usr/lib/libcuda.so.${PV}
usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0"
QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
usr/lib32/libvdpau_nvidia.so.${PV}
- usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib32/libcuda.so.${PV}
usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib32/libnvidia-compiler.so.${PV}
usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
usr/lib64/libnvidia-cfg.so.${PV}
usr/lib64/libnvidia-ml.so.${PV}
@@ -94,9 +94,9 @@ 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/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib64/libcuda.so.${PV}
usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib64/libnvidia-compiler.so.${PV}
usr/lib64/xorg/modules/drivers/nvidia_drv.so
usr/bin/nvidia-smi
usr/bin/nvidia-xconfig
@@ -115,20 +115,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/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
-QA_SONAME_amd64="usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
+ usr/lib32/libnvidia-compiler.so.${PV}"
-QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_amd64="usr/lib32/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/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib32/libnvidia-compiler.so.${PV}
usr/lib64/libXvMCNVIDIA.so.${PV}
- usr/lib64/OpenCL/vendors/nvidia/libcuda.so.${PV}
+ usr/lib64/libcuda.so.${PV}
usr/lib64/libnvidia-cfg.so.${PV}
usr/lib64/libnvidia-glcore.so.${PV}
usr/lib64/libnvidia-ml.so.${PV}
@@ -138,13 +138,13 @@ QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
usr/lib64/xorg/modules/drivers/nvidia_drv.so
usr/lib64/libvdpau_nvidia.so.${PV}
usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib64/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/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
usr/lib/libnvidia-cfg.so.${PV}
usr/lib/libnvidia-glcore.so.${PV}
usr/lib/libnvidia-ml.so.${PV}
@@ -155,7 +155,7 @@ QA_DT_HASH_x86="usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
usr/lib/libXvMCNVIDIA.so.${PV}
usr/lib/libvdpau_nvidia.so.${PV}
usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
- usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+ usr/lib/libnvidia-compiler.so.${PV}
usr/lib/libnvcuvid.so.${PV}
usr/bin/nvidia-smi
usr/bin/nvidia-xconfig
@@ -290,7 +290,7 @@ src_prepare() {
convert_to_m "${NV_SRC}"/Makefile.kbuild
fi
cat <<- EOF > "${S}"/nvidia.icd
- /usr/$(get_libdir)/OpenCL/vendors/nvidia/libcuda.so
+ /usr/$(get_libdir)/libcuda.so
EOF
}
@@ -492,8 +492,8 @@ src_install-libs() {
# CUDA & OpenCL
if use kernel_linux; then
- donvidia ${CL_ROOT} ${libdir}/libcuda.so ${sover}
- donvidia ${CL_ROOT} ${libdir}/libnvidia-compiler.so ${sover}
+ donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover}
+ donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover}
donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0
#dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so
fi