* [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/nvidia-drivers/, x11-drivers/nvidia-drivers/files/
@ 2011-12-25 18:39 Kacper Kowalik
0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik @ 2011-12-25 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 09cd61adbf3fb795a289f99a7a39aa3ada89992b
Author: Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Sun Dec 25 18:37:48 2011 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 18:37:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=09cd61ad
fork nvidia-drivers
---
x11-drivers/nvidia-drivers/Manifest | 5 +
.../nvidia-drivers/files/256.35-unified-arch.patch | 31 ++
.../nvidia-drivers/nvidia-drivers-290.10.ebuild | 557 ++++++++++++++++++++
3 files changed, 593 insertions(+), 0 deletions(-)
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
new file mode 100644
index 0000000..4449ecd
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -0,0 +1,5 @@
+AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
+DIST NVIDIA-FreeBSD-x86-290.10.tar.gz 32042469 RMD160 712cd816ab24319d03ae475af0ac2a56518ef58b SHA1 4fe79060b9e475e4a74b7b17e95410bad1f33427 SHA256 f5accbdac0b231a8073f76c1d1d8ace7cb98ebe167888c31183a2752a669ee92
+DIST NVIDIA-Linux-x86-290.10.run 34691272 RMD160 ddcee14e7b474a646a707fd966cc1d223d3177eb SHA1 dfc095db2bdca672e6cfe7878a75c5d25d8c54a9 SHA256 99be8f53aa1f777445e5a4cac27acd7d85990db712b5c29caac865145fc5adaa
+DIST NVIDIA-Linux-x86_64-290.10.run 58334192 RMD160 a850a83643d507ff84be76691188a5ecd870c4d8 SHA1 f3e8b43248d9d167b1c3f67a8cba9c1f2c53e583 SHA256 34a2ab07f4ae7afdeb2c8415f3f37c1099e6690eb25f3dbef92eca771f7ce4cd
+EBUILD nvidia-drivers-290.10.ebuild 17103 RMD160 51f42abb7a4a9421eb5c07f9457451e5e750ae31 SHA1 f2b24f805af4b17b6dd353260c6004de30ba298a SHA256 0bb77fd75c7c77342b5cb2668d36a466a6d1103d02d7807109ada73501cd4288
diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
new file mode 100644
index 0000000..401ce95
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
@@ -0,0 +1,31 @@
+Add support for the 'x86' unified kernel arch in conftest.sh
+
+--- NVIDIA-Linux-x86-256.25/kernel/conftest.sh
++++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh
+@@ -101,7 +101,7 @@ build_cflags() {
+
+ if [ "$OUTPUT" != "$SOURCES" ]; then
+ MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ fi
+@@ -110,7 +110,7 @@ build_cflags() {
+ fi
+ else
+ MACH_CFLAGS="-I$HEADERS/asm/mach-default"
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+ fi
+@@ -121,7 +121,7 @@ build_cflags() {
+
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+
+- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ fi
+ if [ -n "$BUILD_PARAMS" ]; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild
new file mode 100644
index 0000000..f896a84
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild
@@ -0,0 +1,557 @@
+# Copyright 1999-2011 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.ebuild,v 1.2 2011/12/16 08:47:09 ago Exp $
+
+EAPI="2"
+
+inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
+
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+ amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+ x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
+IUSE="acpi custom-cflags gtk multilib kernel_linux"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+COMMON="<x11-base/xorg-server-1.11.99
+ kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+ multilib? ( app-emulation/emul-linux-x86-xlibs )
+ >=app-admin/eselect-opengl-1.0.9
+ !<media-video/nvidia-settings-256.52"
+DEPEND="${COMMON}
+ kernel_linux? ( virtual/linux-sources )"
+RDEPEND="${COMMON}
+ x11-libs/libXvMC
+ acpi? ( sys-power/acpid )"
+PDEPEND=">=x11-libs/libvdpau-0.3-r1
+ gtk? ( media-video/nvidia-settings )"
+
+QA_TEXTRELS_x86="
+ usr/lib/libOpenCL.so.1.0.0
+ usr/lib/libXvMCNVIDIA.so.${PV}
+ usr/lib/libcuda.so.${PV}
+ usr/lib/libnvcuvid.so.${PV}
+ usr/lib/libnvidia-cfg.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}
+ usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
+QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
+ usr/lib/opengl/nvidia/lib/libGL.so.1
+ usr/lib/libnvidia-glcore.so.1
+ usr/lib/libnvidia-cfg.so.1
+ usr/lib/libnvidia-ml.so.1
+ usr/lib/opengl/nvidia/extensions/libglx.so.1
+ usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
+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/libvdpau_nvidia.so.${PV}
+ usr/lib32/libOpenCL.so.1.0.0
+ usr/lib32/libnvidia-compiler.so.${PV}"
+
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/libnvidia-glcore.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"
+
+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/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/lib64/libXvMCNVIDIA.a:NVXVMC.o
+ usr/lib64/libnvidia-cfg.so.${PV}
+ usr/lib64/libnvidia-ml.so.${PV}
+ usr/lib64/libvdpau_nvidia.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGL.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/xorg/modules/drivers/nvidia_drv.so
+ usr/bin/nvidia-smi
+ usr/bin/nvidia-xconfig
+ usr/bin/nvidia-settings"
+
+QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib/libXvMCNVIDIA.a
+ usr/lib64/libXvMCNVIDIA.so.${PV}"
+
+QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib32/libnvidia-glcore.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/libnvidia-glcore.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_amd64="usr/lib64/libnvidia-compiler.so.${PV}
+ usr/lib32/libnvidia-compiler.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/libOpenCL.so.1.0.0
+ usr/lib32/libnvidia-compiler.so.${PV}
+ usr/lib64/libXvMCNVIDIA.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}
+ usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libnvidia-tls.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/libnvcuvid.so.${PV}
+ usr/bin/nvidia-smi
+ usr/bin/nvidia-xconfig
+ usr/bin/nvidia-settings"
+
+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}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.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/libnvcuvid.so.${PV}
+ usr/bin/nvidia-smi
+ usr/bin/nvidia-xconfig
+ usr/bin/nvidia-settings"
+
+S="${WORKDIR}/"
+
+mtrr_check() {
+ ebegin "Checking for MTRR support"
+ linux_chkconfig_present MTRR
+ eend $?
+
+ if [[ $? -ne 0 ]] ; then
+ eerror "Please enable MTRR support in your kernel config, found at:"
+ eerror
+ eerror " Processor type and features"
+ eerror " [*] MTRR (Memory Type Range Register) support"
+ eerror
+ eerror "and recompile your kernel ..."
+ die "MTRR support not detected!"
+ fi
+}
+
+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 "
+ eerror "'lockdep_init_map' as GPL-only which will prevent "
+ eerror "${P} from compiling."
+ eerror "Please make sure the following options have been unset:"
+ eerror
+ 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
+}
+
+pkg_setup() {
+ # try to turn off distcc and ccache for people that have a problem with it
+ export DISTCC_DISABLE=1
+ export CCACHE_DISABLE=1
+
+ if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+ eerror "This ebuild doesn't currently support changing your default abi."
+ die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+ fi
+
+ if use kernel_linux; then
+ linux-mod_pkg_setup
+ MODULE_NAMES="nvidia(video:${S}/kernel)"
+ BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+ mtrr_check
+ lockdep_check
+ fi
+
+ # On BSD userland it wants real make command
+ use userland_BSD && MAKE="$(get_bmake)"
+
+ export _POSIX2_VERSION="199209"
+
+ # Since Nvidia ships 3 different series of drivers, we need to give the user
+ # some kind of guidance as to what version they should install. This tries
+ # to point the user in the right direction but can't be perfect. check
+ # nvidia-driver.eclass
+ nvidia-driver-check-warning
+
+ # set variables to where files are in the package structure
+ if use kernel_FreeBSD; then
+ NV_DOC="${S}/doc"
+ NV_EXEC="${S}/obj"
+ NV_LIB="${S}/obj"
+ NV_SRC="${S}/src"
+ NV_MAN="${S}/x11/man"
+ NV_X11="${S}/obj"
+ NV_X11_DRV="${NV_X11}"
+ NV_X11_EXT="${NV_X11}"
+ NV_SOVER=1
+ elif use kernel_linux; then
+ NV_DOC="${S}"
+ NV_EXEC="${S}"
+ NV_LIB="${S}"
+ NV_SRC="${S}/kernel"
+ NV_MAN="${S}"
+ NV_X11="${S}"
+ NV_X11_DRV="${NV_X11}"
+ NV_X11_EXT="${NV_X11}"
+ NV_SOVER=${PV}
+ else
+ die "Could not determine proper NVIDIA package"
+ fi
+}
+
+src_unpack() {
+ if use kernel_linux && kernel_is lt 2 6 7; then
+ echo
+ ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+ ewarn "This is not officially supported for ${P}. It is likely you"
+ ewarn "will not be able to compile or use the kernel module."
+ ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+ echo
+ ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+ fi
+
+ if ! use x86-fbsd; then
+ cd "${S}"
+ unpack_makeself
+ else
+ unpack ${A}
+ fi
+}
+
+src_prepare() {
+ # Please add a brief description for every added patch
+ use x86-fbsd && cd doc
+
+ if use kernel_linux; then
+ # Quiet down warnings the user does not need to see
+ sed -i \
+ -e 's:-Wsign-compare::g' \
+ "${NV_SRC}"/Makefile.kbuild
+
+ epatch "${FILESDIR}"/256.35-unified-arch.patch
+
+ # If you set this then it's your own fault when stuff breaks :)
+ use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
+
+ # If greater than 2.6.5 use M= instead of SUBDIR=
+ convert_to_m "${NV_SRC}"/Makefile.kbuild
+ fi
+}
+
+src_compile() {
+ # This is already the default on Linux, as there's no toplevel Makefile, but
+ # on FreeBSD there's one and triggers the kernel module build, as we install
+ # it by itself, pass this.
+
+ cd "${NV_SRC}"
+ if use x86-fbsd; then
+ MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+ elif use kernel_linux; then
+ linux-mod_src_compile
+ fi
+}
+
+src_install() {
+ if use kernel_linux; then
+ linux-mod_src_install
+
+ VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
+ if [ -z "$VIDEOGROUP" ]; then
+ eerror "Failed to determine the video group gid."
+ die "Failed to determine the video group gid."
+ fi
+
+ # Add the aliases
+ [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
+ sed -e 's:PACKAGE:'${PF}':g' \
+ -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
+ "${WORKDIR}"/nvidia
+ insinto /etc/modprobe.d
+ newins "${WORKDIR}"/nvidia nvidia.conf || die
+ elif use x86-fbsd; then
+ insinto /boot/modules
+ doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
+
+ exeinto /boot/modules
+ doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
+ fi
+
+ # NVIDIA kernel <-> userspace driver config lib
+ dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
+ die "failed to install libnvidia-cfg"
+ dosym libnvidia-cfg.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libnvidia-cfg.so.1 || \
+ die "failed to create libnvidia-cfg.so symlink"
+ dosym libnvidia-cfg.so.1 \
+ /usr/$(get_libdir)/libnvidia-cfg.so || \
+ die "failed to create libnvidia-cfg.so symlink"
+
+ # NVIDIA monitoring library
+ dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \
+ die "failed to install libnvidia-ml"
+ dosym libnvidia-ml.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libnvidia-ml.so.1 || \
+ die "failed to create libnvidia-ml.so symlink"
+ dosym libnvidia-ml.so.1 \
+ /usr/$(get_libdir)/libnvidia-ml.so || \
+ die "failed to create libnvidia-ml.so symlink"
+
+ # NVIDIA video decode <-> CUDA
+ dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \
+ die "failed to install libnvcuvid.so"
+ dosym libnvcuvid.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libnvcuvid.so.1 || \
+ die "failed to create libnvcuvid.so symlink"
+ dosym libnvcuvid.so.1 \
+ /usr/$(get_libdir)/libnvcuvid.so || \
+ die "failed to create libnvcuvid.so symlink"
+
+ # Xorg DDX driver
+ insinto /usr/$(get_libdir)/xorg/modules/drivers
+ doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
+
+ # Xorg GLX driver
+ insinto /usr/$(get_libdir)/opengl/nvidia/extensions
+ doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
+ die "failed to install libglx.so"
+ dosym libglx.so.${NV_SOVER} \
+ /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
+ die "failed to create libglx.so symlink"
+
+ # XvMC driver
+ dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+ die "failed to install libXvMCNVIDIA.so"
+ dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
+ die "failed to install libXvMCNVIDIA.so"
+ dosym libXvMCNVIDIA.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
+ die "failed to create libXvMCNVIDIA.so symlink"
+ dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \
+ die "failed to create libXvMCNVIDIA.so symlink"
+ dosym libXvMCNVIDIA.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+ die "failed to create libXvMCNVIDIA_dynamic.so symlink"
+
+ # OpenCL ICD for NVIDIA
+ if use kernel_linux; then
+ dodir /etc/OpenCL/vendors
+ insinto /etc/OpenCL/vendors
+ doins nvidia.icd
+ fi
+
+ # Documentation
+ dohtml ${NV_DOC}/html/*
+ if use x86-fbsd; then
+ dodoc "${NV_DOC}/README"
+ doman "${NV_MAN}/nvidia-xconfig.1"
+ use gtk && doman "${NV_MAN}/nvidia-settings.1"
+ else
+ # Docs
+ newdoc "${NV_DOC}/README.txt" README
+ dodoc "${NV_DOC}/NVIDIA_Changelog"
+ doman "${NV_MAN}/nvidia-smi.1.gz"
+ doman "${NV_MAN}/nvidia-xconfig.1.gz"
+ use gtk && doman "${NV_MAN}/nvidia-settings.1.gz"
+ fi
+
+ # Helper Apps
+ dobin ${NV_EXEC}/nvidia-xconfig || die
+ if use gtk; then
+ dobin ${NV_EXEC}/nvidia-settings || die
+ fi
+ dobin ${NV_EXEC}/nvidia-bug-report.sh || die
+ if use kernel_linux; then
+ dobin ${NV_EXEC}/nvidia-smi || die
+ fi
+
+ # Desktop entries for nvidia-settings
+ if use gtk; then
+ sed -e 's:__UTILS_PATH__:/usr/bin:' \
+ -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+ -i "${NV_EXEC}/nvidia-settings.desktop"
+ domenu ${NV_EXEC}/nvidia-settings.desktop
+
+ doicon ${NV_EXEC}/nvidia-settings.png
+ fi
+
+ if has_multilib_profile ; then
+ local OABI=${ABI}
+ for ABI in $(get_install_abis) ; do
+ src_install-libs
+ done
+ ABI=${OABI}
+ unset OABI
+ else
+ src_install-libs
+ fi
+
+ is_final_abi || die "failed to iterate through all ABIs"
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second parameter is the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+ dodir $1
+ exeinto $1
+
+ libname=$(basename $2)
+
+ doexe $2.$3 || die "failed to install $2"
+ dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
+ [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+src_install-libs() {
+ local inslibdir=$(get_libdir)
+ local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+ local libdir= sover=
+
+ if use kernel_linux; then
+ if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+ libdir=32
+ else
+ libdir=.
+ fi
+ sover=${PV}
+ else
+ libdir=obj
+ # on FreeBSD it has just .1 suffix
+ sover=1
+ fi
+
+ # The GLX libraries
+ donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
+ donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover}
+ if use x86-fbsd; then
+ donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
+ else
+ donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
+ fi
+
+ # VDPAU
+ donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
+
+ # 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
+ fi
+}
+
+pkg_preinst() {
+ if use kernel_linux; then
+ linux-mod_pkg_postinst
+ fi
+
+ # Clean the dynamic libGL stuff's home to ensure
+ # we dont have stale libs floating around
+ if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+ rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+ fi
+ # Make sure we nuke the old nvidia-glx's env.d file
+ if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+ rm -f "${ROOT}"/etc/env.d/09nvidia
+ fi
+}
+
+pkg_postinst() {
+ if use kernel_linux; then
+ linux-mod_pkg_postinst
+ fi
+
+ # Switch to the nvidia implementation
+ eselect opengl set --use-old nvidia
+
+ echo
+ elog "You must be in the video group to use the NVIDIA device"
+ elog "For more info, read the docs at"
+ elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
+ elog
+
+ elog "This ebuild installs a kernel module and X driver. Both must"
+ elog "match explicitly in their version. This means, if you restart"
+ elog "X, you must modprobe -r nvidia before starting it back up"
+ elog
+
+ elog "To use the NVIDIA GLX, run \"eselect opengl 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
+ elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
+ elog
+ elog "If you are having resolution problems, try disabling DynamicTwinView."
+ elog
+
+ if ! use gtk; then
+ elog "USE=gtk controls whether the nvidia-settings application"
+ elog "is installed. If you would like to use it, enable that"
+ elog "flag and re-emerge this ebuild. media-video/nvidia-settings"
+ elog "no longer installs nvidia-settings but only installs the"
+ elog "associated user space libraries."
+ fi
+}
+
+pkg_postrm() {
+ if use kernel_linux; then
+ linux-mod_pkg_postrm
+ fi
+ eselect opengl set --use-old xorg-x11
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/nvidia-drivers/, x11-drivers/nvidia-drivers/files/
@ 2011-12-25 18:39 Kacper Kowalik
0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik @ 2011-12-25 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 0094dd1365c53f7285f1521e611eb0fb5575fd81
Author: Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Sun Dec 25 18:37:56 2011 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 18:37:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=0094dd13
fork nvidia-drivers
---
x11-drivers/nvidia-drivers/Manifest | 3 +-
x11-drivers/nvidia-drivers/files/nvidia-169.07 | 14 +++++
.../nvidia-drivers/nvidia-drivers-290.10.ebuild | 57 ++++++++++---------
3 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 4449ecd..c1c3ac4 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,5 +1,6 @@
AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
+AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577
DIST NVIDIA-FreeBSD-x86-290.10.tar.gz 32042469 RMD160 712cd816ab24319d03ae475af0ac2a56518ef58b SHA1 4fe79060b9e475e4a74b7b17e95410bad1f33427 SHA256 f5accbdac0b231a8073f76c1d1d8ace7cb98ebe167888c31183a2752a669ee92
DIST NVIDIA-Linux-x86-290.10.run 34691272 RMD160 ddcee14e7b474a646a707fd966cc1d223d3177eb SHA1 dfc095db2bdca672e6cfe7878a75c5d25d8c54a9 SHA256 99be8f53aa1f777445e5a4cac27acd7d85990db712b5c29caac865145fc5adaa
DIST NVIDIA-Linux-x86_64-290.10.run 58334192 RMD160 a850a83643d507ff84be76691188a5ecd870c4d8 SHA1 f3e8b43248d9d167b1c3f67a8cba9c1f2c53e583 SHA256 34a2ab07f4ae7afdeb2c8415f3f37c1099e6690eb25f3dbef92eca771f7ce4cd
-EBUILD nvidia-drivers-290.10.ebuild 17103 RMD160 51f42abb7a4a9421eb5c07f9457451e5e750ae31 SHA1 f2b24f805af4b17b6dd353260c6004de30ba298a SHA256 0bb77fd75c7c77342b5cb2668d36a466a6d1103d02d7807109ada73501cd4288
+EBUILD nvidia-drivers-290.10.ebuild 17625 RMD160 d36b3e2b2e8d96ea67861ac21f694f8690fff24d SHA1 14670fad7f318efc44d82c22dde790cdaa39284e SHA256 29776a8347ad7efff0b3b5f4323e88a550e6b8f7b6d6d53bd14f88f606367285
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
new file mode 100644
index 0000000..a96b0cd
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-169.07
@@ -0,0 +1,14 @@
+# Nvidia drivers support
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+
+# To tweak the driver the following options can be used, note that
+# you should be careful, as it could cause instability!! For more
+# options see /usr/share/doc/PACKAGE/README
+#
+# !!! SECURITY WARNING !!!
+# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
+# WHAT YOU ARE DOING.
+# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
+# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
+options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-25 18:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-25 18:39 [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/nvidia-drivers/, x11-drivers/nvidia-drivers/files/ Kacper Kowalik
-- strict thread matches above, loose matches on Subject: below --
2011-12-25 18:39 Kacper Kowalik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox