From 164524dcc2cabd296124c012f06b4a05f3770fb9 Mon Sep 17 00:00:00 2001
From: Edward Koenig <kingbeowulf@gmail.com>
Date: Thu, 1 Sep 2011 23:54:15 -0500
Subject: system/nvidia-kernel: Updated for version 280.13.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/nvidia-kernel/10-nvidia.conf           |  6 ++++++
 system/nvidia-kernel/README                   |  6 +++++-
 system/nvidia-kernel/nvidia-kernel.SlackBuild | 21 +++++++--------------
 system/nvidia-kernel/nvidia-kernel.info       | 10 +++++-----
 4 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 system/nvidia-kernel/10-nvidia.conf

(limited to 'system/nvidia-kernel')

diff --git a/system/nvidia-kernel/10-nvidia.conf b/system/nvidia-kernel/10-nvidia.conf
new file mode 100644
index 0000000000..a8992c2a0d
--- /dev/null
+++ b/system/nvidia-kernel/10-nvidia.conf
@@ -0,0 +1,6 @@
+Section "Device"
+    Identifier  "Device0"
+    Driver  "nvidia"
+    VendorName "Nvidia Corporation"
+    BoardName ""
+EndSection
diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index 030a0d5d52..fe7951db6a 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -3,6 +3,10 @@ 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
+    KERNEL=2.6.38.8 ./nvidia-kernel.SlackBuild
+
+A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf
+to make sure that X loads the nvidia module.  If you need to make changes, 
+copy that file to /etc/X11/xorg.conf.d/ and edit the copy. 
 
 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 eb21b0ef34..da84a65f97 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -30,10 +30,11 @@
 # 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
+# 1.6   30-AUG-2011     version bump, typo clean ups
 #
 
 PRGNAM=nvidia-kernel
-VERSION=275.09.07
+VERSION=280.13
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,19 +86,11 @@ make SYSSRC=$KERNELPATH module || exit 1
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
 install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
 
-# 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"
-    Identifier  "Device0"
-    Driver  "nvidia"
-    VendorName "Nvidia Corporation"
-    BoardName ""
-    Option  "CoolBits"  "1"
-EndSection
-EOF
+# Make sure the X is specified to automagically load the 
+# correct driver, since I always forget. 
+
+mkdir -p $PKG/usr/share/X11/xorg.conf.d/
+cat $CWD/10-nvidia.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
 cp -a README.template $PKG/usr/doc/$PRGNAM-$PKGVER
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index 11decdf368..e65e66b0c7 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="275.09.07"
+VERSION="280.13"
 HOMEPAGE="http://www.nvidia.com"
-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"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/280.13/NVIDIA-Linux-x86-280.13.run"
+MD5SUM="c3992c8cef02b7773a398640d8830e77"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/280.13/NVIDIA-Linux-x86_64-280.13.run"
+MD5SUM_x86_64="8f0e8d88a824f0bed27faa56a939a4f6"
 MAINTAINER="Edward Koenig"
 EMAIL="kingbeowulf@gmail.com"
 APPROVED="rworkman"
-- 
cgit v1.2.3