From d15d34fb7483442abd7b884870c8aed28ae81452 Mon Sep 17 00:00:00 2001 From: Fabian Fingerle Date: Wed, 30 Sep 2009 23:34:21 +0200 Subject: [PATCH] x11-drivers/nvidia-drivers: fixes --- x11-drivers/nvidia-drivers/Manifest | 2 +- .../nvidia-drivers/nvidia-drivers-190.36.ebuild | 62 ++++++++++++++++------ 2 files changed, 46 insertions(+), 18 deletions(-) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 576fdd6..eee19c4 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -10,6 +10,6 @@ DIST NVIDIA-Linux-x86-190.36-pkg0.run 14691246 RMD160 3c8e811f88662140d7c2005133 DIST NVIDIA-Linux-x86_64-185.18.36-pkg2.run 22245788 RMD160 0ffbc35dd13d2ccff87f20e0d6a8b8622c497ec7 SHA1 0ec535765bf07dc7ff47bbede831a89617105ac1 SHA256 c9b413910a26cc55829e018f71e12981fa4140b5e0f7a81bb5e1a1b3d353ef8b DIST NVIDIA-Linux-x86_64-190.36-pkg2.run 23034136 RMD160 caf542c44ccc072034fc39212c1fb2e7e6f8a7bf SHA1 7e7720247ba3fa6e71241f7ca9293bdf29071c48 SHA256 276c9a201daacd42391e93798f6d479ff3061f2e7fefaeb9c20dde253b9810f7 EBUILD nvidia-drivers-185.18.36.ebuild 16848 RMD160 3cd0779f2a0905c328d34a9b2997bd1b34bd0a59 SHA1 b4e51979d885d130e09f27c51a5e6eee9a31e9b9 SHA256 76d8128bd6ee4b4f6c949cb6f0722736c4e586f331ca6aa8962c6d0cb2c21b82 -EBUILD nvidia-drivers-190.36.ebuild 16758 RMD160 bb02468a26ab722fd7703eeeac524b3ce7e7f645 SHA1 7f0fe5176f9a94c5b4bf4785f502c1b0709aab95 SHA256 001db6df0770605a8b225c8f838204ac40ae8e7715b3a065f9f69612e1dd4f0a +EBUILD nvidia-drivers-190.36.ebuild 17707 RMD160 ad46f9df61c99dd49a53f7492c61d31084a84011 SHA1 deca1c6fa6f1511af9e31f1a9d505d7aa23c816c SHA256 eca24b50904118bf49d16d49faae403490f84437d63eebfa79059f589996e94e MISC ChangeLog 3757 RMD160 55d74d2c5e0b0810f61fde1b92de3ff7cbb18ae0 SHA1 a51da5ef3dfb805103e3d5a183883ad0a3eea45b SHA256 55e17e689434d1a827580225cdf39907f7ed13b5054e77e3474a9b2683eefe7a MISC metadata.xml 167 RMD160 37158b954b5c56848025caab67dff8a1b7cb3146 SHA1 0a1a5e46367626858fc7f28de6fca63ccfa3f7e0 SHA256 4476ca9edabcb9df5e3e77607b3972df652fd44fb82ec2a751a9ce798da17a73 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild index b550224..95c5df7 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.18.ebuild,v 1.1 2009/07/27 06:37:51 spock Exp $ +# $Header: $ inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver @@ -69,6 +69,7 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib32/opengl/nvidia/lib/libGL.so.${PV} usr/lib64/xorg/modules/drivers/nvidia_drv.so + usr/lib64/libnvcompiler.so.${PV} usr/lib64/libXvMCNVIDIA.so.${PV} usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV} usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} @@ -76,6 +77,7 @@ QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib64/opengl/nvidia/lib/libGL.so.${PV} usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV} usr/lib64/opengl/nvidia/extensions/libglx.so + usr/bin/nvidia-smi usr/bin/nvidia-xconfig usr/lib64/libXvMCNVIDIA.a:NVXVMC.o" @@ -90,6 +92,8 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib64/opengl/nvidia/lib/libGL.so.${PV} usr/lib64/opengl/nvidia/extensions/libglx.so" +QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}" + # we really should have QA_DT_HASH_x86 and QA_DT_HASH_amd64 but Portage # does not support it. bug #271416 @@ -159,20 +163,18 @@ mtrr_check() { fi } -paravirt_check() { - ebegin "Checking for Paravirtualized guest support" - linux_chkconfig_present PARAVIRT_GUEST - - if [[ $? -eq 0 ]]; then - eerror "Please disable PARAVIRT_GUEST in your kernel config, found at:" - eerror - eerror " Processor type and features" - eerror " [*] Paravirtualized guest support" - eerror - eerror "or XEN support" - eerror - eerror "and recompile your kernel .." - die "PARAVIRT_GUEST support detected!" +lockdep_check() { + if linux_chkconfig_present LOCKDEP; then + eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel." + eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only" + eerror "which will prevent ${P} from compiling." + eerror "Please make sure the following options have been unset:" + eerror " Kernel hacking --->" + eerror " [ ] Lock debugging: detect incorrect freeing of live locks" + eerror " [ ] Lock debugging: prove locking correctness" + eerror " [ ] Lock usage statistics" + eerror "in 'menuconfig'" + die "LOCKDEP enabled" fi } @@ -192,7 +194,7 @@ pkg_setup() { BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)" mtrr_check - paravirt_check + lockdep_check fi # On BSD userland it wants real make command @@ -211,10 +213,12 @@ pkg_setup() { NV_DOC="${S}/doc" NV_EXEC="${S}/obj" NV_SRC="${S}/src" + NV_MAN="${S}/x11/man" elif use kernel_linux; then NV_DOC="${S}/usr/share/doc" NV_EXEC="${S}/usr/bin" NV_SRC="${S}/usr/src/nv" + NV_MAN="${S}/usr/share/man/man1" else die "Could not determine proper NVIDIA package" fi @@ -320,7 +324,7 @@ src_install() { is_final_abi || return 0 # Documentation - dodoc "${NV_DOC}"/{XF86Config.sample,Copyrights} + dodoc "${NV_DOC}"/XF86Config.sample dohtml "${NV_DOC}"/html/* if use x86-fbsd; then dodoc "${NV_DOC}/README" @@ -330,9 +334,17 @@ src_install() { dodoc "${NV_DOC}/NVIDIA_Changelog" fi + if use kernel_linux; then + doman "${NV_MAN}/nvidia-smi.1.gz" + fi + doman "${NV_MAN}/nvidia-xconfig.1.gz" + # Helper Apps dobin ${NV_EXEC}/nvidia-xconfig || die dobin ${NV_EXEC}/nvidia-bug-report.sh || die + if use kernel_linux; then + dobin ${NV_EXEC}/nvidia-smi || die + fi } # Install nvidia library: @@ -477,6 +489,22 @@ src_install-libs() { dosym lib${vdpaulib}.so.1 /usr/${inslibdir}/lib${vdpaulib}.so done fi + + # OpenCL + # NOTE: This isn't currently available in the publicly released drivers. + if [[ -f usr/${pkglibdir}/libOpenCL.so.1.0.0 ]]; then + dodir /usr/include/CL + insinto /usr/include/CL + doins usr/include/CL/*.h + + dolib.so usr/${pkglibdir}/libnvcompiler.so.${PV} + dosym libnvcompiler.so.${PV} /usr/${inslibdir}/libnvcompiler.so.1 + dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so + + dolib.so usr/${pkglibdir}/libOpenCL.so.1.0.0 + dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1 + dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so + fi } pkg_preinst() { -- 2.11.4.GIT