diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2012-02-07 10:14:00 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-02-07 10:14:00 +0000 |
| commit | 67eac780ca0cc93cd3a24f1a33b43aee30352753 (patch) | |
| tree | d74e64f1778959547f9a20e07404d98de4e4f67d /x11-drivers | |
| parent | mikmod and vorbis require sound (diff) | |
| download | gentoo-2-67eac780ca0cc93cd3a24f1a33b43aee30352753.tar.gz gentoo-2-67eac780ca0cc93cd3a24f1a33b43aee30352753.tar.bz2 gentoo-2-67eac780ca0cc93cd3a24f1a33b43aee30352753.zip | |
Run eselect opencl during pkg_postinst wrt bug 402407 by Benjamin Schindler <bschindler@student.ethz.ch> Add missing files to QA_* though some warnigs still slip through
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild | 23 |
2 files changed, 20 insertions, 11 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index c09e9325624e..035ce39b2d5a 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,12 @@ # 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.317 2012/02/05 07:42:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.318 2012/02/07 10:14:00 xarthisius Exp $ + + 07 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> + nvidia-drivers-290.10-r1.ebuild: + Run eselect opencl during pkg_postinst wrt bug 402407 by Benjamin Schindler + <bschindler@student.ethz.ch> Add missing files to QA_* though some warnigs + still slip through 05 Feb 2012; Mike Frysinger <vapier@gentoo.org> nvidia-drivers-96.43.20.ebuild, nvidia-drivers-173.14.31.ebuild, diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild index 48ad44b5b76a..d2ab4f3afc3d 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-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.2 2012/02/05 07:42:05 vapier Exp $ +# $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 $ EAPI="2" @@ -38,12 +38,12 @@ PDEPEND=">=x11-libs/libvdpau-0.3-r1 gtk? ( media-video/nvidia-settings )" QA_TEXTRELS_x86=" - usr/lib/libOpenCL.so.1.0.0 + usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 usr/lib/libXvMCNVIDIA.so.${PV} - usr/lib/libcuda.so.${PV} + usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV} usr/lib/libnvcuvid.so.${PV} usr/lib/libnvidia-cfg.so.${PV} - usr/lib/libnvidia-compiler.so.${PV} + usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV} usr/lib/libnvidia-glcore.so.${PV} usr/lib/libnvidia-ml.so.${PV} usr/lib/libvdpau_nvidia.so.${PV} @@ -62,9 +62,9 @@ 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/libvdpau_nvidia.so.${PV} usr/lib32/opengl/nvidia/lib/libGL.so.${PV} usr/lib32/OpenCL/vendors/nvidia/libcuda.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}" @@ -73,19 +73,18 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} usr/lib/opengl/nvidia/extensions/libglx.so.${PV} usr/lib64/libXvMCNVIDIA.so.${PV} usr/lib/libXvMCNVIDIA.a:NVXVMC.o - usr/lib/libnvidia-compiler.so.${PV} usr/lib/libvdpau_nvidia.so.${PV} - usr/lib/libcuda.so.${PV} - usr/lib/libOpenCL.so.1.0.0" + usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV} + usr/lib/OpenCL/vendors/nvidia/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/OpenCL/vendors/nvidia/libnvidia-compiler.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/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV} + usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV} usr/lib64/libXvMCNVIDIA.a:NVXVMC.o usr/lib64/libnvidia-cfg.so.${PV} usr/lib64/libnvidia-ml.so.${PV} @@ -97,6 +96,7 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.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/xorg/modules/drivers/nvidia_drv.so usr/bin/nvidia-smi usr/bin/nvidia-xconfig @@ -522,6 +522,7 @@ pkg_postinst() { # Switch to the nvidia implementation eselect opengl set --use-old nvidia + eselect opencl set --use-old nvidia echo elog "You must be in the video group to use the NVIDIA device" @@ -536,6 +537,8 @@ pkg_postinst() { elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" elog + elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\"" + elog elog "NVIDIA has requested that any bug reports submitted have the" elog "output of /usr/bin/nvidia-bug-report.sh included." elog |