Upgpkg: 364.15

5 files changed, 28 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f41a5450440..33a4b3cc5d10 100644..100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = nvidia-utils-beta
-	pkgver = 364.12
+	pkgver = 364.15
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = i686
@@ -8,10 +8,10 @@ pkgbase = nvidia-utils-beta
 	options = !strip
 	source = 20-nvidia.conf
 	md5sums = 2640eac092c220073f0668a7aaff61f7
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/364.12/NVIDIA-Linux-x86-364.12.run
-	md5sums_i686 = fc600b54a518590976ced34795073f9f
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/364.12/NVIDIA-Linux-x86_64-364.12-no-compat32.run
-	md5sums_x86_64 = fbb16deedf34dd2d9da247261c5ce89c
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/364.15/NVIDIA-Linux-x86-364.15.run
+	md5sums_i686 = 856c286a4838f62c250939c769b42d6e
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/364.15/NVIDIA-Linux-x86_64-364.15-no-compat32.run
+	md5sums_x86_64 = 98dff9af5ce90295df442472483bca1e
 
 pkgname = nvidia-utils-beta
 	pkgdesc = NVIDIA driver utilities and libraries (beta version)
@@ -21,8 +21,12 @@ pkgname = nvidia-utils-beta
 	optdepends = gtk3: nvidia-settings (GTK+ v3)
 	optdepends = opencl-nvidia-beta: OpenCL support
 	optdepends = xorg-server-devel: nvidia-xconfig
-	provides = nvidia-utils=364.12
+	provides = nvidia-utils=364.15
+	provides = nvidia-settings
+	provides = libglvnd
 	conflicts = nvidia-utils
+	conflicts = nvidia-settings
+	conflicts = libglvnd
 	backup = etc/X11/xorg.conf.d/20-nvidia.conf
 
 pkgname = nvidia-libgl-beta
@@ -33,6 +37,7 @@ pkgname = nvidia-libgl-beta
 	conflicts = libgl
 	conflicts = nvidia-libgl
 	conflicts = mesa<10.1.0-2
+	conflicts = libglvnd
 
 pkgname = opencl-nvidia-beta
 	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-beta'
diff --git a/20-nvidia.conf b/20-nvidia.conf
index 8b8e26863c90..8b8e26863c90 100644..100755
--- a/20-nvidia.conf
+++ b/20-nvidia.conf
diff --git a/PKGBUILD b/PKGBUILD
index 3a0723cb938a..51f9b443c6f2 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on [extra]'s nvidia-utils: https://www.archlinux.org/packages/extra/x86_64/nvidia-utils/
 
 pkgname=('nvidia-utils-beta' 'nvidia-libgl-beta' 'opencl-nvidia-beta')
-pkgver=364.12
+pkgver=364.15
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -21,8 +21,8 @@ source=('20-nvidia.conf')
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/$pkgver/NVIDIA-Linux-x86-$pkgver.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/NVIDIA-Linux-x86_64-$pkgver-no-compat32.run")
 md5sums=('2640eac092c220073f0668a7aaff61f7')
-md5sums_i686=('fc600b54a518590976ced34795073f9f')
-md5sums_x86_64=('fbb16deedf34dd2d9da247261c5ce89c')
+md5sums_i686=('856c286a4838f62c250939c769b42d6e')
+md5sums_x86_64=('98dff9af5ce90295df442472483bca1e')
 
 _create_links() {
   # create missing soname links
@@ -75,7 +75,7 @@ package_nvidia-libgl-beta() {
   pkgdesc="NVIDIA driver library symlinks for 'nvidia-utils-beta'"
   depends=('nvidia-utils-beta')
   provides=('libgl' 'nvidia-libgl')
-  conflicts=('libgl' 'nvidia-libgl' 'mesa<10.1.0-2')
+  conflicts=('libgl' 'nvidia-libgl' 'mesa<10.1.0-2' 'libglvnd')
   cd $_pkg
 
   # GLX extension for X (link)
@@ -126,8 +126,8 @@ package_nvidia-utils-beta() {
               'gtk3: nvidia-settings (GTK+ v3)'
               'opencl-nvidia-beta: OpenCL support'
               'xorg-server-devel: nvidia-xconfig')
-  provides=("nvidia-utils=$pkgver")
-  conflicts=('nvidia-utils')
+  provides=("nvidia-utils=$pkgver" 'nvidia-settings' 'libglvnd')
+  conflicts=('nvidia-utils' 'nvidia-settings' 'libglvnd')
   backup=('etc/X11/xorg.conf.d/20-nvidia.conf')
   install=$pkgname.install
   cd $_pkg
@@ -270,4 +270,4 @@ package_nvidia-utils-beta() {
 
   # Distro-specific files must be installed in /usr/share/X11/xorg.conf.d
   install -Dm644 nvidia-drm-outputclass.conf "$pkgdir"/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf
-}
+}
\ No newline at end of file
diff --git a/nvidia-utils-beta.install b/nvidia-utils-beta.install
index 5c4c1cfa36dd..5c4c1cfa36dd 100644..100755
--- a/nvidia-utils-beta.install
+++ b/nvidia-utils-beta.install
diff --git a/nvidia-utils.install b/nvidia-utils.install
new file mode 100755
index 000000000000..5c4c1cfa36dd
--- /dev/null
+++ b/nvidia-utils.install
@@ -0,0 +1,10 @@
+post_upgrade() {
+  echo ":: If CUDA is unavailable, run 'nvidia-modprobe'."
+}
+
+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
+}