system/nvidia-driver: Updated for version 352.30.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 44 insertions, 49 deletions

diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index c153444101..05700b67fe 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -9,8 +9,8 @@ Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
 nvidia-settings.  Please refer to the Nvidia documentation and man pages
 for details and usage.
 
-For CUDA/OpenCL to work after reboot, include the following line in your
-/etc/rc.d/rc.local:
+For CUDA/OpenCL to work after reboot, you might need to include the 
+following line in your /etc/rc.d/rc.local:
 -------------8<---------------
 # Create missing nvidia device nodes after reboot
 /usr/bin/nvidia-modprobe -c 0 -u
@@ -38,8 +38,8 @@ You do NOT have to run nvidia-switch after installing the package.
 Before uninstalling or upgrading this package, it is important that you execute
 'nvidia-switch --remove', which will switch back to the stock xorg files
 and remove all links created by nvidia-switch during installation. If you forget 
-to do this, you'll have to do the switch manually, or xorg won't work on next startup.
-Here are the affected files:
+to do this, you might have to do the switch manually, since 'nvidia-switch --install'
+may fail, resulting in xorg not working. Here are the affected files:
   /usr/lib[64]/libGL.so.1.2
   /usr/lib[64]/xorg/modules/extensions/{libglx.so libglx.la}
 Simply remove the dead nvidia symlinks and rename the saved '-xorg' appended files.
diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt
index 2a406417fa..f2061c8d82 100644
--- a/system/nvidia-driver/changelog.txt
+++ b/system/nvidia-driver/changelog.txt
@@ -19,4 +19,5 @@
 3.3		20-NOV-2014	new version (LLB), update libs, fix nvidia-switch
 3.4		11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES
 4.0		07-FEB-2015 new long lived branch, version update, bug fixes
-4.1     27-APR-2014 version update LLB, fix $VERSION usage
+4.1     27-APR-2015 version update LLB, fix $VERSION usage
+4.2     28-JUL-2015 version update LLB, bug fixes, clean-ups.
\ No newline at end of file
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 1980bc3c57..3e460a0a97 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -26,7 +26,7 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-346.59}
+VERSION=${VERSION:-352.30}
 MVERS=340
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -103,6 +103,7 @@ install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensi
 install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia
 install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
 install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.$VERSION-nvidia
+install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
@@ -115,16 +116,16 @@ install -m 755 libnvidia-glsi.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
-install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
+
+
+# Watch for conflicts in newer MESA package
+install -m 755 libGLESv1_CM.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.$VERSION
+install -m 755 libGLESv2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.$VERSION
 
 # For nvidia-settings GUI support
 install -m 755 libnvidia-gtk2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-gtk3.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 
-# 8-series GPU is No longer supported so just drop this
-# in until nvidia decides to remove it (see README.txt).
-install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION-nvidia
-
 # Don't forget separate libvdpau package on SBo.
 install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 
@@ -138,6 +139,8 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia
   install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
   install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/libEGL.so.$VERSION-nvidia
+  install -m 755 32/libGLESv1_CM.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv1_CM.so.$VERSION
+  install -m 755 32/libGLESv2.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGLESv2.so.$VERSION
   install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-eglcore.so.$VERSION $PKG/usr/lib/
@@ -146,10 +149,9 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
   install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-glsi.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-ifr.so.$VERSION $PKG/usr/lib/
+  install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
   install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
-  install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/
   install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/
 fi
@@ -191,8 +193,8 @@ done
 
 install -m 644 nvidia-smi.1.gz $PKG/usr/man/man1/
 
-# New CUDA proxy server for 64-bit Linux only, and requires a device that supports
-# Unified Virtual Address (UVA) and CUDA 4.0+.
+# New CUDA MPS server for 64-bit Linux only, and requires a device that supports
+# Unified Virtual Address (UVA) and CUDA 4.0+. See NVIDIA docs.
 if [ "$ARCH" = "x86_64" -a "${CPROXY}" = "yes" ]; then
    install -m 755 nvidia-cuda-mps-control $PKG/usr/bin/
    install -m 755 nvidia-cuda-mps-server $PKG/usr/bin/
@@ -321,8 +323,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/usr/share/nvidia
 install -m 755 nvidia-application-profiles-$VERSION-key-documentation $PKG/usr/share/nvidia/
 install -m 755 nvidia-application-profiles-$VERSION-rc $PKG/usr/share/nvidia/
-install -m 755 monitoring.conf $PKG/usr/share/nvidia/
-install -m 755 pci.ids $PKG/usr/share/nvidia/
 
 mkdir -p $PKG/install
 sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index e2790a1090..1c7124fe04 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-driver"
-VERSION="346.59"
+VERSION="352.30"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/346.59/NVIDIA-Linux-x86-346.59.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-346.59.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-346.59.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-346.59.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-346.59.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-346.59.tar.bz2"
-MD5SUM="565800c3d9bf347eb35a393f48a6b7f3 \
-        a032b8329634846518d2d5ae805b6554 \
-		e0540c388ef95c2d9ccf09657bdc7b00 \
-		d35e08ddd5cae933935db626d6eab78b \
-		dec65c0a477cb7c429b637a1349ba0bc  \
-		ec89b8d99ade5efa675cdefbf7d14bdf"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/346.59/NVIDIA-Linux-x86_64-346.59.run \
-                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-346.59.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-346.59.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-346.59.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-346.59.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-346.59.tar.bz2"
-MD5SUM_x86_64="48af6c1e518bbfa204849003a1a44bc5 \
-        a032b8329634846518d2d5ae805b6554 \
-		e0540c388ef95c2d9ccf09657bdc7b00 \
-		d35e08ddd5cae933935db626d6eab78b \
-		dec65c0a477cb7c429b637a1349ba0bc  \
-		ec89b8d99ade5efa675cdefbf7d14bdf"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/352.30/NVIDIA-Linux-x86-352.30.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.30.tar.bz2 \
+	      ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.30.tar.bz2 \
+	      ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.30.tar.bz2 \
+	      ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.30.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.30.tar.bz2"
+MD5SUM="7e59d84eafe2482b2f02df692b9168d5 \
+        c672951b0faa31089f4940d28ccd5463 \
+        0e263655eaf8cf9a68697bda61e6050f \
+        7975a29438550c109479b2f2bed51401 \
+        e0cd59a13b5651ec2396727e7e2e54a5 \ 
+        1a6b4de9c3a91ef3680fa4f0bc80951b"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/352.30/NVIDIA-Linux-x86_64-352.30.run \
+                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-352.30.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-352.30.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-352.30.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-352.30.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-352.30.tar.bz2"
+MD5SUM_x86_64="c0575f929dd3b7735d586c1d862b0380 \
+        c672951b0faa31089f4940d28ccd5463 \
+        0e263655eaf8cf9a68697bda61e6050f \
+        7975a29438550c109479b2f2bed51401 \
+        e0cd59a13b5651ec2396727e7e2e54a5 \ 
+        1a6b4de9c3a91ef3680fa4f0bc80951b"
 REQUIRES="libvdpau nvidia-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index 0d559c28b5..cee93f291e 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -58,7 +58,7 @@ save_GL(){
     fi
     mv libGL.la-nvidia libGL.la
     mv libEGL.so.$NV_VERSION-nvidia libEGL.so.$NV_VERSION
-    ln -sf libEGL.so.$NV_VERSION libGEL.so.1.0.0
+    ln -sf libEGL.so.$NV_VERSION libEGL.so.1.0.0
     ln -sf libEGL.so.$NV_VERSION libEGL.so.1
     ln -sf libEGL.so.$NV_VERSION libEGL.so
   fi
diff --git a/system/nvidia-kernel/10-nvidia.conf b/system/nvidia-kernel/10-nvidia.conf
deleted file mode 100644
index a8992c2a0d..0000000000
--- a/system/nvidia-kernel/10-nvidia.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "Device"
-    Identifier  "Device0"
-    Driver  "nvidia"
-    VendorName "Nvidia Corporation"
-    BoardName ""
-EndSection