* [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-185.18.31.ebuild ChangeLog nvidia-drivers-190.32.ebuild
@ 2009-09-26 18:48 Michael Januszewski (spock)
0 siblings, 0 replies; only message in thread
From: Michael Januszewski (spock) @ 2009-09-26 18:48 UTC (permalink / raw
To: gentoo-commits
spock 09/09/26 18:48:10
Modified: nvidia-drivers-185.18.31.ebuild ChangeLog
nvidia-drivers-190.32.ebuild
Log:
Fix bug #281895 (install manual pages). Also install the nvidia-smi tool and prepare support for OpenCL (note that the current drivers do NOT support OpenCL).
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Revision Changes Path
1.4 x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild?r1=1.3&r2=1.4
Index: nvidia-drivers-185.18.31.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-drivers-185.18.31.ebuild 3 Aug 2009 03:58:20 -0000 1.3
+++ nvidia-drivers-185.18.31.ebuild 26 Sep 2009 18:48:10 -0000 1.4
@@ -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-185.18.31.ebuild,v 1.3 2009/08/03 03:58:20 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild,v 1.4 2009/09/26 18:48:10 spock Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -77,6 +77,7 @@
usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
usr/lib64/opengl/nvidia/extensions/libglx.so
usr/bin/nvidia-xconfig
+ usr/bin/nvidia-smi
usr/lib64/libXvMCNVIDIA.a:NVXVMC.o"
QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
@@ -210,10 +211,12 @@
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
@@ -319,7 +322,7 @@
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"
@@ -329,9 +332,17 @@
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:
1.172 x11-drivers/nvidia-drivers/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.172&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.172&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?r1=1.171&r2=1.172
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- ChangeLog 21 Sep 2009 11:22:30 -0000 1.171
+++ ChangeLog 26 Sep 2009 18:48:10 -0000 1.172
@@ -1,6 +1,12 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.171 2009/09/21 11:22:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.172 2009/09/26 18:48:10 spock Exp $
+
+ 26 Sep 2009; Michał Januszewski <spock@gentoo.org>
+ nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.32.ebuild:
+ Fix bug #281895 (install manual pages). Also install the nvidia-smi tool
+ and prepare support for OpenCL (note that the current drivers do NOT
+ support OpenCL).
*nvidia-drivers-190.32 (21 Sep 2009)
1.2 x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild?r1=1.1&r2=1.2
Index: nvidia-drivers-190.32.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-drivers-190.32.ebuild 21 Sep 2009 11:22:30 -0000 1.1
+++ nvidia-drivers-190.32.ebuild 26 Sep 2009 18:48:10 -0000 1.2
@@ -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.32.ebuild,v 1.1 2009/09/21 11:22:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild,v 1.2 2009/09/26 18:48:10 spock Exp $
inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
@@ -69,6 +69,7 @@
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 @@
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 @@
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
@@ -193,10 +197,12 @@
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
@@ -302,7 +308,7 @@
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"
@@ -312,9 +318,17 @@
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:
@@ -459,6 +473,22 @@
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() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-09-26 18:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-26 18:48 [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: nvidia-drivers-185.18.31.ebuild ChangeLog nvidia-drivers-190.32.ebuild Michael Januszewski (spock)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox