From 0484c8e4d3c3deb62450556b0bae5b41661b9146 Mon Sep 17 00:00:00 2001
From: Edward Koenig
Date: Tue, 5 Jul 2011 16:27:28 -0500
Subject: system/nvidia-kernel: Updated for version 275.09.07.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/nvidia-kernel/BLACKLIST-nouveau.conf   |  2 --
 system/nvidia-kernel/README                   |  2 ++
 system/nvidia-kernel/nvidia-kernel.SlackBuild | 22 +++++++---------------
 system/nvidia-kernel/nvidia-kernel.info       | 12 +++++-------
 4 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 system/nvidia-kernel/BLACKLIST-nouveau.conf

(limited to 'system/nvidia-kernel')

diff --git a/system/nvidia-kernel/BLACKLIST-nouveau.conf b/system/nvidia-kernel/BLACKLIST-nouveau.conf
deleted file mode 100644
index c7f1a88a78..0000000000
--- a/system/nvidia-kernel/BLACKLIST-nouveau.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-blacklist nouveau
-
diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index 4705cbbe05..030a0d5d52 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -4,3 +4,5 @@ You also need the nvidia-driver package from SlackBuilds.org.
 To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
     KERNEL=2.6.38.4 ./nvidia-kernel.SlackBuild
+
+The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index d3991c97b2..eb21b0ef34 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -29,10 +29,11 @@
 # 1.0	20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
 # 1.1	10-APR-2011	updated to new version, testing 13.37rc4.6692
 # 1.2   27-MAY-2011	new version, blacklist nouveau, fix ups, tested 13.37-stable
+# 1.5   01-JULY-2011	new version, kill SRCSUFFIX nonsense, use blacklist in /extra
 #
 
 PRGNAM=nvidia-kernel
-VERSION=270.41.19
+VERSION=275.09.07
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,13 +58,11 @@ elif [ "$ARCH" = "i686" ]; then
   SRCSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x86_64"
-  SRCSUFFIX=${SRCSUFFIX:-}
-# pass SRCSUFFIX="-no-compat32" if you d/l that version.
 fi
 
 unset ARCH
 
-SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}${SRCSUFFIX}
+SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -84,18 +83,11 @@ cd kernel || exit 1
 make SYSSRC=$KERNELPATH module || exit 1
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
-install -m 0644 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
 
-# Blacklist the nouveau driver (ok, I know this will annoy some using 
-# nvidia-switch and you need to reboot for this to work)...
-mkdir -p $PKG/etc/modprobe.d
-cat <<EOF > $PKG/etc/modprobe.d/blacklist-nouveau.conf
-blacklist nouveau
-EOF
-
-#... AND make sure the nvidia driver is specified to
-# automagically load the correct driver, since I always forget. If you
-# create a proper full xorg.conf, then this isn't needed.
+# Make sure the nvidia driver is specified to automagically load the 
+# correct driver, since I always forget. If you create a proper full xorg.conf,
+# then this isn't needed.
 mkdir -p $PKG/etc/X11/xorg.conf.d
 cat << EOF > $PKG/etc/X11/xorg.conf.d/device.conf
 Section "Device"
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index a0a41c4f3e..11decdf368 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,12 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="270.41.19"
+VERSION="275.09.07"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/270.41.19/NVIDIA-Linux-x86-270.41.19.run"
-MD5SUM="c167e32702f56599bd600add97943312"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19-no-compat32.run \
-                 ftp://download.nvidia.com/XFree86/Linux-x86_64/270.41.19/NVIDIA-Linux-x86_64-270.41.19.run"
-MD5SUM_x86_64="cb518bdd70f356425b8c4a5a48c0ad9c \
-               b84143ecb5c0511c5ef9e53e732d9136"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/275.09.07/NVIDIA-Linux-x86-275.09.07.run"
+MD5SUM="d779057af3a2f96a05ddda201606618b"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/275.09.07/NVIDIA-Linux-x86_64-275.09.07.run"
+MD5SUM_x86_64="29f28cd59e2647cdb517eca2381d3dbd"
 MAINTAINER="Edward Koenig"
 EMAIL="kingbeowulf@gmail.com"
 APPROVED="rworkman"
-- 
cgit v1.2.3