nvidia: 331.20

2 files changed, 24 insertions, 18 deletions

diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index a7d4b38..5c42e7b 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,37 +1,43 @@
-# $Id: PKGBUILD 171241 2012-11-16 21:41:41Z ibiru $
+# $Id: PKGBUILD 202756 2013-12-26 13:03:42Z thomas $
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=310.19
-_extramodules=extramodules-3.6-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux."
+pkgver=331.20
+_extramodules=extramodules-3.12-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
+depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.12' 'linux-headers<3.13')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 options=(!strip)
+#source=('nvidia-linux-3.12.patch')
+#md5sums=('d267069bc456de269424b4e1b46a3745')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('2adbdd38540b3a8955714760e05f575d')
+    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums+=('801aa04a087891690f1cac09575b2ba9')
 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=('0ba08d32852e442ebba5ba22c7abed36')
+    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums+=('28295eed56c2ca996401c0093279620f')
 fi
 
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+prepare() {
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
+    cd "${_pkg}"
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${srcdir}"/"${_pkg}"/kernel
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 
@@ -43,4 +49,4 @@ package() {
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
 }
-md5sums=('0ba08d32852e442ebba5ba22c7abed36')
+md5sums=('28295eed56c2ca996401c0093279620f')
diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install
index c2c292a..b11a93e 100644
--- a/abs/core/nvidia/nvidia.install
+++ b/abs/core/nvidia/nvidia.install
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
+    EXTRAMODULES='extramodules-3.12-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
+    EXTRAMODULES='extramodules-3.12-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     if  [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
         echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
@@ -13,6 +13,6 @@ post_upgrade() {
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
+    EXTRAMODULES='extramodules-3.12-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }