system/nvidia-legacy340-driver: Fix script.

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

4 files changed, 13 insertions, 17 deletions

diff --git a/system/nvidia-legacy340-driver/changelog.txt b/system/nvidia-legacy340-driver/changelog.txt
index fbcf48088b776..186143460bf63 100644
--- a/system/nvidia-legacy340-driver/changelog.txt
+++ b/system/nvidia-legacy340-driver/changelog.txt
@@ -24,4 +24,5 @@
 4.3	19-MAR-2016	remove nvidia-installer (doesn't compile on 14.2RC1)
 5.0	15-FEB-2017	version update, security fixes.
 5.1	21-OCT-2017	new version for recent kernels
-5.2	11-SEP-2019	version update, patch for kernels 4.4.168+ (thanks to Mats T.)
+5.2	11-SEP-2019	version update, patch for kernels 4.4.168+ (thanks to MatsT.)
+5.3 18-JAN-2020 version update, last version, X.Org 1.20 support
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
index b886f16e0ae68..543b3e65167ff 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
@@ -5,7 +5,7 @@
 PRGNAM=nvidia-legacy340-driver
 VERSION=${VERSION:-340.108}
 MVERS=340
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 CPROXY=${CPROXY:-yes}
 
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
index 82a53144d8de1..27bb2d11f68b5 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
@@ -22,5 +22,5 @@ MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1\
 	       86944ff799d5798f407c5051282699b3 \
 	       da1c2d34014a4aa4e66627ba18364779"
 REQUIRES="nvidia-legacy340-kernel"
-MAINTAINER="Mats B. Tegner"
-EMAIL="mats.bertil.tegner@gmail.com"
+MAINTAINER="Edward W. Koenig"
+EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy340-driver/nvidia-switch b/system/nvidia-legacy340-driver/nvidia-switch
index 9226a103bdffd..fd90c8794979f 100644
--- a/system/nvidia-legacy340-driver/nvidia-switch
+++ b/system/nvidia-legacy340-driver/nvidia-switch
@@ -41,6 +41,7 @@ XMOD="${LIB}/xorg/modules"
 XLIB="$XMOD/extensions"
 NV_VERSION='PKGVERSION' # This will be replaced in the build script
 GL_VERSION="1.2.0"
+EGL_VERSION="1.0.0"
 NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf"
 
 save_GL(){
@@ -48,37 +49,33 @@ save_GL(){
   if [ "$1" = "nvidia" ]; then
     if [ ! -e libGL.so.$GL_VERSION-xorg ]; then
        mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
-       mv libGL.la libGL.la-xorg
     fi
     mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION
     ln -sf libGL.so.$NV_VERSION libGL.so.1
     ln -sf libGL.so.$NV_VERSION libGL.so
-    if [ ! -e libEGL.so.1.0.0-xorg ]; then
-       mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg
+    if [ ! -e libEGL.so.$EGL_VERSION-xorg ]; then
+       mv libEGL.so.$EGL_VERSION libEGL.so.$EGL_VERSION-xorg
     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.$EGL_VERSION
     ln -sf libEGL.so.$NV_VERSION libEGL.so.1
     ln -sf libEGL.so.$NV_VERSION libEGL.so
   fi
 
   if [ "$1" = "xorg" ]; then
      mv libGL.so.$NV_VERSION libGL.so.$NV_VERSION-nvidia
-     mv libGL.la libGL.la-nvidia
      if [ -e libGL.so.$GL_VERSION-xorg ]; then
         mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
         ln -sf libGL.so.$GL_VERSION libGL.so.1
         ln -sf libGL.so.$GL_VERSION libGL.so
-        mv libGL.la-xorg libGL.la
      else
 	echo WARNING: libGL.so is missing.
      fi
      mv libEGL.so.$NV_VERSION libEGL.so.$NV_VERSION-nvidia
-     if [ -e libEGL.so.1.0.0-xorg ]; then
-         mv libEGL.so.1.0.0-xorg libEGL.so.1.0.0
-         ln -sf libEGL.so.1.0.0 libEGL.so.1
-         ln -sf libEGL.so.1.0.0 libEGL.so
+     if [ -e libEGL.so.$EGL_VERSION-xorg ]; then
+         mv libEGL.so.$EGL_VERSION-xorg libEGL.so.$EGL_VERSION
+         ln -sf libEGL.so.$EGL_VERSION libEGL.so.1
+         ln -sf libEGL.so.$EGL_VERSION libEGL.so
      fi
 
   fi
@@ -111,7 +108,6 @@ save_glx(){
   cd "$XLIB"
   if [ "$1" = "nvidia" ]; then
 	if [ ! -e libglx.so-xorg ]; then
-	    mv libglx.la libglx.la-xorg
 	    mv libglx.so libglx.so-xorg
 	fi
 	ln -sf libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION
@@ -120,7 +116,6 @@ save_glx(){
 	rm -f libglx.so.$NV_VERSION
 	rm -f libglx.so
 	mv libglx.so-xorg libglx.so
-	mv libglx.la-xorg libglx.la
   fi
 cd "$CWD"
 }