From d6700409fe40996d8185e25c7c375a1a8c250864 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verison.net>
Date: Mon, 28 Jun 2010 20:21:28 +0000
Subject: nvidia: update to 256.35 and PKGBUILD re-write (cribbed from Arch)

---
 abs/core-testing/nvidia/PKGBUILD | 41 ++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD
index 2003343..ca1d20f 100644
--- a/abs/core-testing/nvidia/PKGBUILD
+++ b/abs/core-testing/nvidia/PKGBUILD
@@ -1,34 +1,43 @@
-# $Id: PKGBUILD 56687 2009-10-25 15:28:13Z pierre $
+# $Id: PKGBUILD 83850 2010-06-23 10:39:40Z pierre $
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=195.36.24
+pkgver=256.35
 _kernver='2.6.28-LinHES'
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26."
 arch=('i686' 'x86_64')
-[ "$CARCH" = "i686"   ] && ARCH=x86
-[ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
 depends=('kernel26>=2.6.28' 'kernel26<2.6.29' "nvidia-utils=${pkgver}")
+makedepends=('kernel-headers>=2.6.28' 'kernel-headers<2.6.29')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
-source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
-[ "$CARCH" = "x86_64" ] && md5sums=('3d3e956366f9df0e4c64d2e0299d1029')
+
+if [ "$CARCH" = "i686" ]; then
+        _arch='x86'
+        _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+        source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+        md5sums=('f6af8917a500de28396a438f3f548c88')
+elif [ "$CARCH" = "x86_64" ]; then
+        _arch='x86_64'
+        _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+        source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+        md5sums=('7b5924f14a4d2326b4d916efdb7852ff')
+fi
 
 build() {
         cd $srcdir
-        sh NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run --extract-only
-        cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0
-
-        cd usr/src/nv/
-        ln -s Makefile.kbuild Makefile
-        make SYSSRC=/lib/modules/${_kernver}/build module || return 1
-
-        mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
-        install -m644 nvidia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
+        sh ${_pkg}.run --extract-only
+        cd ${_pkg}/kernel
+        make SYSSRC=/lib/modules/${_kernver}/build module
+}
 
+package() {
+        install -D -m644 $srcdir/${_pkg}/kernel/nvidia.ko \
+                $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko
+        install -d -m755 $pkgdir/etc/modprobe.d
+        echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf
         sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install
 }
-md5sums=('97d3e5f69707092aa643fb901bb94003')
+
-- 
cgit v0.12

