1 files changed, 25 insertions, 20 deletions
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index e6d268f4bd..9196cf7b8a 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -43,22 +43,20 @@ LIB="${ROOT}usr/lib${LIBSUFFIX}"
 LIB32="${ROOT}usr/lib"
 
 save_GL(){
-# backup original mesa conflict
+# backup original mesa conflicts
   cd $2
   case "$1" in
     "nvidia")
-      if [ -e libGL.la ]; then
-        mv libGL.la libGL.la-xorg
-      fi
-      /sbin/ldconfig
+      cp libGL{,ES*}.la /var/log/nvidia/$3
+      mv libGL{.so.1.2.0,ESv1_CM.so.1.1.0,ESv2.so.2.0.0} /var/log/nvidia/$3
+      sed -i s/1.2.0/1.7.0/g libGL.la
+      sed -i s/1.1.0/1.2.0/g libGLESv1_CM.la
+      sed -i s/2.0.0/2.1.0/g libGLESv2.la
     ;;
 
     "xorg")
-      if [ -e libGL.la-xorg ]; then
-       mv libGL.la-xorg libGL.la
-      fi
-      /sbin/ldconfig
-  ;;
+      mv /var/log/nvidia/$3/* .
+ ;;
 
   *)
         echo "nothing to do for save_gl?"
@@ -75,11 +73,14 @@ nvidia_install(){
   echo "/etc/X11/xorg.conf.d.  Otherwise, this may lead to improperly"
   echo  -e "working drivers.\n"
 
-  save_GL "nvidia" $LIB
-
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "nvidia" $LIB32
+  if [ "$LIBSUFFIX" = "64" ]; then
+    save_GL "nvidia" $LIB "64"
+    # Check for multilib configuration
+    if [ "$COMPAT32" = "yes" ]; then
+      save_GL "nvidia" $LIB32 "32"
+    fi
+  else
+    save_GL "nvidia" $LIB "32"
   fi
 }
 
@@ -88,12 +89,16 @@ nvidia_remove(){
   echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf"
   echo "and in /usr/share/X11/xorg.conf.d and /etc/X11/xorg.conf.d."
   echo "Otherwise, this may lead to improperly working drivers."
-  echo -e "\nPlease run /sbin/ldconfing after removing nvidia-driver.\n"
+  echo -e "\nPLEASE run /sbin/ldconfing after removing nvidia-driver.\n"
 
-  save_GL "xorg" $LIB
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "xorg" $LIB32
+  if [ "$LIBSUFFIX" = "64" ]; then
+    save_GL "xorg" $LIB "64"
+    # Check for multilib configuration
+    if [ "$COMPAT32" = "yes" ]; then
+      save_GL "xorg" $LIB32 "32"
+    fi
+  else
+    save_GL "xorg" $LIB "32"
   fi
 }