Upgpkg: 361.16

2 files changed, 106 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b151b4cf71e6..aae5d1757ecf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,7 @@
+# Generated by mksrcinfo v8
+# Wed Jan  6 17:35:07 UTC 2016
 pkgbase = nvidia-full-beta-all
-	pkgver = 358.16
+	pkgver = 361.16
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = i686
@@ -10,15 +12,15 @@ pkgbase = nvidia-full-beta-all
 	options = !strip
 	source = 20-nvidia.conf
 	md5sums = 2640eac092c220073f0668a7aaff61f7
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/358.16/NVIDIA-Linux-x86-358.16.run
-	md5sums_i686 = 5dfe11ca13548ca4813b10f3223d6014
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/358.16/NVIDIA-Linux-x86_64-358.16-no-compat32.run
-	md5sums_x86_64 = efb1e649c0e0d62e92774bbf2c124488
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/361.16/NVIDIA-Linux-x86-361.16.run
+	md5sums_i686 = cbb48d10306d6ca49423ed80e786598e
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/361.16/NVIDIA-Linux-x86_64-361.16.run
+	md5sums_x86_64 = b49638820f1b46ac3b34443617531eb7
 
 pkgname = nvidia-full-beta-all
 	pkgdesc = Full NVIDIA drivers' package for all kernels on the system (drivers and shared utilities and libraries) (beta version)
 	install = nvidia-full-beta-all.install
-	depends = nvidia-utils-full-beta-all>=358.16
+	depends = nvidia-utils-full-beta-all>=361.16
 	depends = libgl
 	provides = nvidia
 	conflicts = nvidia-96xx
@@ -33,7 +35,7 @@ pkgname = nvidia-utils-full-beta-all
 	optdepends = gtk3: nvidia-settings (GTK+ v3)
 	optdepends = opencl-nvidia-full-beta-all: OpenCL support
 	optdepends = xorg-server-devel: nvidia-xconfig
-	provides = nvidia-utils=358.16
+	provides = nvidia-utils=361.16
 	conflicts = nvidia-utils
 	backup = etc/X11/xorg.conf.d/20-nvidia.conf
 
@@ -54,3 +56,29 @@ pkgname = opencl-nvidia-full-beta-all
 	provides = opencl-nvidia
 	conflicts = opencl-nvidia
 
+pkgname = lib32-nvidia-utils-full-beta-all
+	pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta-all' (32-bit)
+	depends = lib32-zlib
+	depends = lib32-gcc-libs
+	optdepends = lib32-opencl-nvidia-full-beta-all: OpenCL support
+	provides = lib32-nvidia-utils=361.16
+	conflicts = lib32-nvidia-utils
+
+pkgname = lib32-nvidia-libgl-full-beta-all
+	pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-full-beta-all'
+	depends = lib32-nvidia-utils-full-beta-all
+	provides = lib32-libgl
+	provides = lib32-nvidia-libgl
+	conflicts = lib32-libgl
+	conflicts = lib32-nvidia-libgl
+	conflicts = lib32-mesa<10.1.0-2
+
+pkgname = lib32-opencl-nvidia-full-beta-all
+	pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-full-beta-all'
+	depends = lib32-libcl
+	depends = lib32-zlib
+	depends = lib32-gcc-libs
+	optdepends = opencl-headers: headers necessary for OpenCL development
+	provides = lib32-opencl-nvidia
+	conflicts = lib32-opencl-nvidia
+
diff --git a/PKGBUILD b/PKGBUILD
index 968ffe566239..92c3fbd0ae85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _lib32=0
 
 pkgname=('nvidia-full-beta-all' 'nvidia-utils-full-beta-all' 'nvidia-libgl-full-beta-all' 'opencl-nvidia-full-beta-all')
-pkgver=358.16
+pkgver=361.16
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -30,9 +30,9 @@ 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/$_pkg.run")
 md5sums=('2640eac092c220073f0668a7aaff61f7')
-md5sums_i686=('5dfe11ca13548ca4813b10f3223d6014')
-md5sums_x86_64=('efb1e649c0e0d62e92774bbf2c124488')
-[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('b766c62e2168cb9e125e5ae3bada4383')
+md5sums_i686=('cbb48d10306d6ca49423ed80e786598e')
+md5sums_x86_64=('13df10e88eb550b8d7f2e276bb5cfb57')
+[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('b49638820f1b46ac3b34443617531eb7')
 
 # Auto-detect patches (e.g. nvidia-linux-4.1.patch)
 for _patch in $(ls "$startdir"/*.patch 2>/dev/null); do
@@ -137,9 +137,15 @@ package_nvidia-libgl-full-beta-all() {
   ln -s libglx.so.$pkgver "$pkgdir"/usr/lib/xorg/modules/extensions/libglx.so
 
   # OpenGL (link)
-  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
+  ln -s /usr/lib/nvidia/libGL.so.1 "$pkgdir"/usr/lib/libGL.so.1
+  ln -s libGL.so.1 "$pkgdir"/usr/lib/libGL.so.$pkgver
+  ln -s libGL.so.1 "$pkgdir"/usr/lib/libGL.so
+
+  # GLX (link)
+  ln -s /usr/lib/nvidia/libGLX.so.0 "$pkgdir"/usr/lib/libGLX.so.0
+  ln -s libGLX.so.0 "$pkgdir"/usr/lib/libGLX.so.$pkgver
+  ln -s libGLX.so.0 "$pkgdir"/usr/lib/libGLX.so
+  ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib/libGLX_indirect.so.0
 
   # EGL (link)
   ln -s /usr/lib/nvidia/libEGL.so.1 "$pkgdir"/usr/lib/libEGL.so.1
@@ -147,14 +153,14 @@ package_nvidia-libgl-full-beta-all() {
   ln -s libEGL.so.1 "$pkgdir"/usr/lib/libEGL.so
 
   # OpenGL ES 1 (link)
-  ln -s /usr/lib/nvidia/libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib/libGLESv1_CM.so.$pkgver
-  ln -s libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib/libGLESv1_CM.so.1
-  ln -s libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib/libGLESv1_CM.so
+  ln -s /usr/lib/nvidia/libGLESv1_CM.so.1 "$pkgdir"/usr/lib/libGLESv1_CM.so.1
+  ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib/libGLESv1_CM.so.$pkgver
+  ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib/libGLESv1_CM.so
 
   # OpenGL ES 2 (link)
-  ln -s /usr/lib/nvidia/libGLESv2.so.$pkgver "$pkgdir"/usr/lib/libGLESv2.so.$pkgver
-  ln -s libGLESv2.so.$pkgver "$pkgdir"/usr/lib/libGLESv2.so.2
-  ln -s libGLESv2.so.$pkgver "$pkgdir"/usr/lib/libGLESv2.so
+  ln -s /usr/lib/nvidia/libGLESv2.so.2 "$pkgdir"/usr/lib/libGLESv2.so.2
+  ln -s libGLESv2.so.2 "$pkgdir"/usr/lib/libGLESv2.so.$pkgver
+  ln -s libGLESv2.so.2 "$pkgdir"/usr/lib/libGLESv2.so
 
   # License (link)
   install -d "$pkgdir"/usr/share/licenses/
@@ -182,19 +188,25 @@ package_nvidia-utils-full-beta-all() {
   ln -s libglx.so.$pkgver "$pkgdir"/usr/lib/nvidia/xorg/modules/extensions/libglx.so
 
   # OpenGL
-  install -Dm755 libGL.so.$pkgver "$pkgdir"/usr/lib/nvidia/libGL.so.$pkgver
+  install -Dm755 libGL.so.1 "$pkgdir"/usr/lib/nvidia/libGL.so.1
   install -Dm755 libnvidia-glcore.so.$pkgver "$pkgdir"/usr/lib/libnvidia-glcore.so.$pkgver
   install -Dm755 libGLdispatch.so.0 "$pkgdir"/usr/lib/libGLdispatch.so.0
   install -Dm755 libOpenGL.so.0 "$pkgdir"/usr/lib/libOpenGL.so.0
 
+  # GLX
+  install -Dm755 libGLX.so.0 "$pkgdir"/usr/lib/nvidia/libGLX.so.0
+  install -Dm755 libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib/libGLX_nvidia.so.$pkgver
+
   # EGL
   install -Dm755 libEGL.so.1 "$pkgdir"/usr/lib/nvidia/libEGL.so.1
-  install -Dm755 libEGL_nvidia.so.0 "$pkgdir"/usr/lib/libEGL_nvidia.so.0
+  install -Dm755 libEGL_nvidia.so.$pkgver "$pkgdir"/usr/lib/libEGL_nvidia.so.$pkgver
   install -Dm755 libnvidia-eglcore.so.$pkgver "$pkgdir"/usr/lib/libnvidia-eglcore.so.$pkgver
 
   # OpenGL ES
-  install -Dm755 libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib/nvidia/libGLESv1_CM.so.$pkgver
-  install -Dm755 libGLESv2.so.$pkgver "$pkgdir"/usr/lib/nvidia/libGLESv2.so.$pkgver
+  install -Dm755 libGLESv1_CM.so.1 "$pkgdir"/usr/lib/nvidia/libGLESv1_CM.so.1
+  install -Dm755 libGLESv1_CM_nvidia.so.$pkgver "$pkgdir"/usr/lib/libGLESv1_CM_nvidia.so.$pkgver
+  install -Dm755 libGLESv2.so.2 "$pkgdir"/usr/lib/nvidia/libGLESv2.so.2
+  install -Dm755 libGLESv2_nvidia.so.$pkgver "$pkgdir"/usr/lib/libGLESv2_nvidia.so.$pkgver
   install -Dm755 libnvidia-glsi.so.$pkgver "$pkgdir"/usr/lib/libnvidia-glsi.so.$pkgver
 
   # VDPAU (Video Decode and Presentation API for Unix)
@@ -211,6 +223,12 @@ package_nvidia-utils-full-beta-all() {
   install -Dm755 libcuda.so.$pkgver "$pkgdir"/usr/lib/libcuda.so.$pkgver
   install -Dm755 libnvcuvid.so.$pkgver "$pkgdir"/usr/lib/libnvcuvid.so.$pkgver
 
+  # PTX JIT Compiler (Parallel Thread Execution (PTX) is a pseudo-assembly language for CUDA)
+  install -Dm755 libnvidia-ptxjitcompiler.so.$pkgver "$pkgdir"/usr/lib/libnvidia-ptxjitcompiler.so.$pkgver
+  
+  # Fat (multiarchitecture) binary loader
+  install -Dm755 libnvidia-fatbinaryloader.so.$pkgver "$pkgdir"/usr/lib/libnvidia-fatbinaryloader.so.$pkgver
+
   # TLS (Thread local storage) support for OpenGL libs
   install -Dm755 tls/libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib/libnvidia-tls.so.$pkgver
 
@@ -231,6 +249,9 @@ package_nvidia-utils-full-beta-all() {
   install -Dm644 nvidia-cuda-mps-control.1.gz "$pkgdir"/usr/share/man/man1/nvidia-cuda-mps-control.1.gz
   install -Dm755 nvidia-cuda-mps-server "$pkgdir"/usr/bin/nvidia-cuda-mps-server
  
+  # nvidia-gridd
+  install -Dm644 nvidia-gridd.1.gz "$pkgdir"/usr/share/man/man1/nvidia-gridd.1.gz
+ 
   # nvidia-modprobe
   install -Dm4755 nvidia-modprobe "$pkgdir"/usr/bin/nvidia-modprobe
   install -Dm644 nvidia-modprobe.1.gz "$pkgdir"/usr/share/man/man1/nvidia-modprobe.1.gz
@@ -301,7 +322,7 @@ package_nvidia-full-beta-all() {
                "$pkgdir"/$_path/nvidia-uvm.ko
     fi
 
-    # Install Nvidia Modeset module:
+    # Install Modeset module:
     #
     # "nvidia-modeset.ko does not provide any new user-visible functionality or interfaces to third party applications.
     #  However, in a later release, nvidia-modeset.ko will be used as a basis for the modesetting interface provided by
@@ -347,28 +368,30 @@ package_lib32-nvidia-libgl-full-beta-all() {
 
   # OpenGL (link)
   install -d "$pkgdir"/usr/lib32/
-  ln -s /usr/lib32/nvidia/libGL.so.$pkgver "$pkgdir"/usr/lib32/libGL.so.$pkgver
-  ln -s libGL.so.$pkgver "$pkgdir"/usr/lib32/libGL.so.1
-  ln -s libGL.so.$pkgver "$pkgdir"/usr/lib32/libGL.so
+  ln -s /usr/lib32/nvidia/libGL.so.1 "$pkgdir"/usr/lib32/libGL.so.1
+  ln -s libGL.so.1 "$pkgdir"/usr/lib32/libGL.so.$pkgver
+  ln -s libGL.so.1 "$pkgdir"/usr/lib32/libGL.so
 
-  # EGL (link)
+  # GLX (link)
+  ln -s /usr/lib32/nvidia/libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.0
+  ln -s libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so.$pkgver
+  ln -s libGLX.so.0 "$pkgdir"/usr/lib32/libGLX.so
+  ln -s libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_indirect.so.0
+
+  # EGL (link)	
   ln -s /usr/lib32/nvidia/libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so.1
   ln -s libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so.$pkgver
   ln -s libEGL.so.1 "$pkgdir"/usr/lib32/libEGL.so
 
   # OpenGL ES 1 (link)
-  ln -s /usr/lib32/nvidia/libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib32/libGLESv1_CM.so.$pkgver
-  ln -s libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib32/libGLESv1_CM.so.1
-  ln -s libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib32/libGLESv1_CM.so
+  ln -s /usr/lib32/nvidia/libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so.1
+  ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so.$pkgver
+  ln -s libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/libGLESv1_CM.so
 
   # OpenGL ES 2 (link)
-  ln -s /usr/lib32/nvidia/libGLESv2.so.$pkgver "$pkgdir"/usr/lib32/libGLESv2.so.$pkgver
-  ln -s libGLESv2.so.$pkgver "$pkgdir"/usr/lib32/libGLESv2.so.2
-  ln -s libGLESv2.so.$pkgver "$pkgdir"/usr/lib32/libGLESv2.so
-
-  # License (link)
-  install -d "$pkgdir"/usr/share/licenses/
-  ln -s nvidia-utils/ "$pkgdir"/usr/share/licenses/lib32-nvidia-libgl
+  ln -s /usr/lib32/nvidia/libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so.2
+  ln -s libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so.$pkgver
+  ln -s libGLESv2.so.2 "$pkgdir"/usr/lib32/libGLESv2.so
 }
 
 package_lib32-nvidia-utils-full-beta-all() {
@@ -380,19 +403,25 @@ package_lib32-nvidia-utils-full-beta-all() {
   cd $_pkg
 
   # OpenGL
-  install -Dm755 32/libGL.so.$pkgver "$pkgdir"/usr/lib32/nvidia/libGL.so.$pkgver
+  install -Dm755 32/libGL.so.1 "$pkgdir"/usr/lib32/nvidia/libGL.so.1
   install -Dm755 32/libnvidia-glcore.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-glcore.so.$pkgver
   install -Dm755 32/libGLdispatch.so.0 "$pkgdir"/usr/lib32/libGLdispatch.so.0
   install -Dm755 32/libOpenGL.so.0 "$pkgdir"/usr/lib32/libOpenGL.so.0
 
+  # GLX
+  install -Dm755 32/libGLX.so.0 "$pkgdir"/usr/lib32/nvidia/libGLX.so.0
+  install -Dm755 32/libGLX_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLX_nvidia.so.$pkgver
+
   # EGL
   install -Dm755 32/libEGL.so.1 "$pkgdir"/usr/lib32/nvidia/libEGL.so.1
-  install -Dm755 32/libEGL_nvidia.so.0 "$pkgdir"/usr/lib32/libEGL_nvidia.so.0
+  install -Dm755 32/libEGL_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libEGL_nvidia.so.$pkgver
   install -Dm755 32/libnvidia-eglcore.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-eglcore.so.$pkgver
 
   # OpenGL ES
-  install -Dm755 32/libGLESv1_CM.so.$pkgver "$pkgdir"/usr/lib32/nvidia/libGLESv1_CM.so.$pkgver
-  install -Dm755 32/libGLESv2.so.$pkgver "$pkgdir"/usr/lib32/nvidia/libGLESv2.so.$pkgver
+  install -Dm755 32/libGLESv1_CM.so.1 "$pkgdir"/usr/lib32/nvidia/libGLESv1_CM.so.1
+  install -Dm755 32/libGLESv1_CM_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLESv1_CM_nvidia.so.$pkgver
+  install -Dm755 32/libGLESv2.so.2 "$pkgdir"/usr/lib32/nvidia/libGLESv2.so.2
+  install -Dm755 32/libGLESv2_nvidia.so.$pkgver "$pkgdir"/usr/lib32/libGLESv2_nvidia.so.$pkgver
   install -Dm755 32/libnvidia-glsi.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-glsi.so.$pkgver
 
   # VDPAU (Video Decode and Presentation API for Unix)
@@ -405,6 +434,12 @@ package_lib32-nvidia-utils-full-beta-all() {
   install -Dm755 32/libcuda.so.$pkgver "$pkgdir"/usr/lib32/libcuda.so.$pkgver
   install -Dm755 32/libnvcuvid.so.$pkgver "$pkgdir"/usr/lib32/libnvcuvid.so.$pkgver
 
+  # PTX JIT Compiler (Parallel Thread Execution (PTX) is a pseudo-assembly language for CUDA)
+  install -Dm755 32/libnvidia-ptxjitcompiler.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-ptxjitcompiler.so.$pkgver
+  
+  # Fat (multiarchitecture) binary loader
+  install -Dm755 32/libnvidia-fatbinaryloader.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-fatbinaryloader.so.$pkgver
+
   # TLS (Thread local storage) support for OpenGL libs
   install -Dm755 32/tls/libnvidia-tls.so.$pkgver "$pkgdir"/usr/lib32/libnvidia-tls.so.$pkgver