From f767daf505cf4f698d41383c378f7b5e425738d9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 25 Mar 2014 22:35:54 +0000
Subject: nvidia & nvidia-utils: update to 331.49 and build for kernel 3.13

---
 abs/core/nvidia-utils/PKGBUILD | 28 ++++++++++++++--------------
 abs/core/nvidia/PKGBUILD       | 33 +++++++++++++--------------------
 abs/core/nvidia/nvidia.install |  6 +++---
 3 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index 4e5c35c..e38a75a 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD 199766 2013-11-15 21:30:02Z svenstaro $
+# $Id$
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
-pkgver=331.20
+pkgver=331.49
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
 options=('!strip')
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+sha1sums=('3ab5c9e3b206cdb93baf6ea17dafe1486dbaa03f'
+          '72f7c25ba94041a80f81a8d8bf025ef680ed1f4f')
 
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    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+=('28295eed56c2ca996401c0093279620f')
-fi
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
 create_links() {
     # create soname links
@@ -48,6 +43,9 @@ package_opencl-nvidia() {
     install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
 
     create_links
+
+    mkdir -p "${pkgdir}/usr/share/licenses"
+    ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
 }
 
 package_nvidia-libgl() {
@@ -65,6 +63,9 @@ package_nvidia-libgl() {
     ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
     ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1"
     ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so"
+
+    mkdir -p "${pkgdir}/usr/share/licenses"
+    ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
 }
 
 package_nvidia-utils() {
@@ -121,4 +122,3 @@ package_nvidia-utils() {
 
     create_links
 }
-md5sums=('28295eed56c2ca996401c0093279620f')
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index 5c42e7b..cafec22 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,38 +1,32 @@
-# $Id: PKGBUILD 202756 2013-12-26 13:03:42Z thomas $
+# $Id$
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=331.20
-_extramodules=extramodules-3.12-ARCH
-pkgrel=3
+pkgver=331.49
+_extramodules=extramodules-3.13-ARCH
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.12' 'linux-headers<3.13')
+depends=('linux>=3.13' 'linux<3.14' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.13' 'linux-headers<3.14')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 options=(!strip)
-#source=('nvidia-linux-3.12.patch')
-#md5sums=('d267069bc456de269424b4e1b46a3745')
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+md5sums=('176c77f9a10eaa652860dbc24042bff2'
+         'd0c944466a36cae8b1e23330b27a721c')
 
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    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+=('28295eed56c2ca996401c0093279620f')
-fi
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
 prepare() {
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
+    # patches here
 }
 
 build() {
@@ -49,4 +43,3 @@ package() {
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
 }
-md5sums=('28295eed56c2ca996401c0093279620f')
diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install
index b11a93e..86803bc 100644
--- a/abs/core/nvidia/nvidia.install
+++ b/abs/core/nvidia/nvidia.install
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.12-ARCH'
+    EXTRAMODULES='extramodules-3.13-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.12-ARCH'
+    EXTRAMODULES='extramodules-3.13-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.12-ARCH'
+    EXTRAMODULES='extramodules-3.13-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
-- 
cgit v0.12

