summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/nvidia-kernel/nvidia-kernel.SlackBuild20
-rw-r--r--system/nvidia-kernel/nvidia-kernel.info10
2 files changed, 12 insertions, 18 deletions
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index 1d12dbd730..c39e3ec3f1 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for nvidia-kernel
# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2012-2015 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2012-2016 Edward W. Koenig, Vancouver, WA, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -28,8 +28,8 @@
# see nvidia-driver/changelog.txt
PRGNAM=nvidia-kernel
-VERSION=${VERSION:-352.63}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-361.28}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
KERNEL=${KERNEL:-$(uname -r)}
@@ -79,19 +79,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Nvidia removed uvm module from 32-bit
(cd kernel || exit 1
make SYSSRC=$KERNELPATH module || exit 1
- if [ "$ARCH" = "x86_64" ]; then
- cd uvm
- make SYSSRC=$KERNELPATH module || exit 1
- fi
)
mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
install -m 0664 kernel/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-if [ "$ARCH" = "x86_64" ]; then
- install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel/nvidia-modeset.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+# 32-bit doesn't have nvidia-uvm
+if [ "$TARGET" = "x86_64" ]; then
+ install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
fi
# Make sure the X is specified to automagically load the
@@ -100,9 +97,6 @@ fi
mkdir -p $PKG/usr/share/X11/xorg.conf.d/
cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
-# OutputClass not available until xorg > 1.16 so fix this up a bit
-sed -i "s|OutputClass|Device|" $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
-sed -i "s|Match|# Match|" $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index 7fb4833523..4104002905 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
PRGNAM="nvidia-kernel"
-VERSION="352.63"
+VERSION="361.28"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.63/NVIDIA-Linux-x86-352.63.run"
-MD5SUM="7882ecda1763504beb10af77a21b21c5"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.63/NVIDIA-Linux-x86_64-352.63.run"
-MD5SUM_x86_64="d4127834036fe24ec7a07999dadf3529"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run"
+MD5SUM="d4fc7fcf1204a46f15733d7cc2711ad2"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/361.28/NVIDIA-Linux-x86_64-361.28.run"
+MD5SUM_x86_64="16a583d074a83c1a3ef926e9c59d4349"
REQUIRES=""
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeowulf@gmail.com"