From 79e6c8bf0920084b9dff7a1f668bdb5900c1ea87 Mon Sep 17 00:00:00 2001 From: Edward W. Koenig Date: Sun, 13 Jul 2014 22:57:37 +0700 Subject: system/nvidia-driver: Updated for version 340.24. Signed-off-by: Willy Sudiarto Raharjo --- system/nvidia-driver/nvidia-driver.SlackBuild | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'system/nvidia-driver/nvidia-driver.SlackBuild') diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 3c99a1f3fb..7c3b5c6732 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -43,14 +43,14 @@ # 2.6 20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove # 3.0 13-NOV-2013 new version (LLB), update libs # 3.1 12-APR-2014 new version (LLB), update libs +# 3.2a 12-JUL-2014 new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm PRGNAM=nvidia-driver -VERSION=${VERSION:-331.67} +VERSION=${VERSION:-340.24} MVERS=331 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CPROXY=${CPROXY:-no} -OPTAPPS=${OPTAPPS:-no} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -109,7 +109,7 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \ $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/tls \ @@ -117,7 +117,7 @@ mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \ $PKG/usr/include/GL # Get all the libs to the right place -# Ignore libEGL and libGLES support; phones/tablets etc. +# Ignore libEGL/libGLES for desktop GPUs install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/ install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia @@ -130,6 +130,7 @@ install -m 755 libnvidia-encode.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-fbc.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-ifr.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ +install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/ @@ -155,6 +156,7 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then install -m 755 32/libnvidia-encode.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-fbc.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/ + install -m 755 32/libnvidia-glsi.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-ifr.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/ install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/ @@ -265,8 +267,9 @@ cd $TMP/nvidia-xconfig-$VERSION install -m 644 _out/Linux_$TARGET/nvidia-xconfig.1.gz $PKG/usr/man/man1/ cd - -# Some new optional "useless" utilities. FIXME: Needs cleanup at a later date. -if [ "${OPTAPPS}" = "yes" ]; then +# Some new optional "useless" utilities, such as laptop GPU switching +# nvdia-modprobe needed to create device nodes, see README! +# FIXME: Needs cleanup at a later date. # Compiling nvidia-modprobe from source cd $TMP/nvidia-modprobe-$VERSION @@ -296,7 +299,6 @@ if [ "${OPTAPPS}" = "yes" ]; then install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ cd - -fi # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files # so we don't stomp on the overlapping xorg files. @@ -322,12 +324,16 @@ sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cd $TMP/$SRCNAM - cp -a LICENSE NVIDIA_Changelog README.txt html $PKG/usr/doc/$PRGNAM-$VERSION cp -a nvidia-persistenced-init.tar.bz2 $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# nvidia-settings application profile support +mkdir -p $PKG/usr/share/nvidia +install -m 755 nvidia-application-profiles-340.24-key-documentation $PKG/usr/share/nvidia/ +install -m 755 nvidia-application-profiles-340.24-rc $PKG/usr/share/nvidia/ + mkdir -p $PKG/install sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -- cgit v1.2.3