From ef9afbd5cb377d942a6604929cc2ed5edd8e9cbb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Mar 2015 17:19:17 +0000
Subject: nvidia & nvidia-utils: update to 346.47

---
 abs/core/nvidia-utils/PKGBUILD             |  6 +++---
 abs/core/nvidia-utils/nvidia-utils.install | 18 +++++++-----------
 abs/core/nvidia/PKGBUILD                   | 16 +++++++---------
 abs/core/nvidia/__changelog                |  1 +
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index 9e9cd62..ac935eb 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: James Rayner <iphitus@gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
-pkgver=346.35
+pkgver=346.47
 pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -12,8 +12,8 @@ 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=('b011f4767ac6fef2aa677923626dc235317af2c6'
-          'deb4535a9546b56ee1dbd1053bc56a3dd9c62117')
+sha1sums=('fff888527a89b95e2f32bdc8fe00d9e7c6112415'
+          'fc5f00fe21d48c0cafec6048837e53f6ef402aa8')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
diff --git a/abs/core/nvidia-utils/nvidia-utils.install b/abs/core/nvidia-utils/nvidia-utils.install
index df17a32..1955c64 100644
--- a/abs/core/nvidia-utils/nvidia-utils.install
+++ b/abs/core/nvidia-utils/nvidia-utils.install
@@ -1,14 +1,10 @@
-post_install() {
-  if ! getent group nvidia-persistenced >/dev/null; then
-    groupadd -g 143 nvidia-persistenced
-  fi
-  if ! getent passwd nvidia-persistenced >/dev/null; then
-    useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced
-  fi
+post_upgrade() {
+  echo "If you run into trouble with CUDA not being available, run nvidia-modprobe first."
 }
 
-post_remove() {
-  if getent group nvidia-persistenced >/dev/null; then
-    userdel -f nvidia-persistenced
-  fi
+post_install() {
+  getent group nvidia-persistenced &>/dev/null || groupadd -g 143 nvidia-persistenced
+  getent passwd nvidia-persistenced &>/dev/null || useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced
+
+  post_upgrade
 }
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index 991e153..f541e58 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer : Thomas Baechler <thomas@archlinux.org>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=346.35
+pkgver=346.47
 _extramodules=extramodules-3.18-ARCH
-pkgrel=4
+pkgrel=9
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,11 +15,9 @@ license=('custom')
 install=nvidia.install
 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"
-        nv-drm-343.36.patch)
-md5sums=('d2b8f7f90ef5037f03f94519f9809511'
-         '9ca9f07f91361362f304ca8317ddd453'
-         'ff8a5f979e4428f8c847423fb007042c')
+        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+md5sums=('ae61b6c3c081383f991bcc64ee0844b1'
+         '115b5b2d136c4b44c658ef823b8a4bab')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -27,7 +26,6 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
-    patch -p1 -i ../nv-drm-343.36.patch
 }
 
 build() {
diff --git a/abs/core/nvidia/__changelog b/abs/core/nvidia/__changelog
index a8f8250..8bc0490 100644
--- a/abs/core/nvidia/__changelog
+++ b/abs/core/nvidia/__changelog
@@ -1 +1,2 @@
+PKGBUILD: use dep "nvidia-libgl" instead of libgl
 nvidia.install: post_upgrade add root cron job to run xconfig.cron
-- 
cgit v0.12

