system/nvidia-driver: Revert commit 7ff6d19.

This reverts commit 7ff6d19b442d77c72dc3f1798535e2a657e80724.
Merged in error during public update 20170109.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

1 files changed, 35 insertions, 29 deletions

diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index 5222c31dbd..e44212da19 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -1,18 +1,13 @@
 This is the proprietary binary video driver from NVidia for the X.Org
-X-server. This package does not include the kernel module - it is a part
+X-server. This package does not include the kernel-module - it is a part
 of the nvidia-kernel package at SlackBuilds.org.
 
 Installing the 32-bit compatibility libraries is available: if desired, do:
   COMPAT32="yes" ./nvidia-driver.SlackBuild
-  
-This script installs the new GLVND versions of the libraries by default. If
-this causes compatibility issues, you can switch back to the legacy 
-non-GLVND versions with:
-  GLVND="no" ./nvidia-driver.SlackBuild
 
-Several useful utilities are included: nvidia-xconfig, nvidia-smi,
-nvidia-settings, etc.  Please refer to the Nvidia documentation and man 
-pages for details and usage.
+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, you might need to include the
 following line in your /etc/rc.d/rc.local:
@@ -21,23 +16,34 @@ following line in your /etc/rc.d/rc.local:
 /usr/bin/nvidia-modprobe -c 0 -u
 ------------->8---------------
 
-Due to the current complexity of the driver, it is currently no longer possible to 
-automate restoring the open source files. Here are the affected files:
-
-  /usr/lib[64]/libGL.la
-  /usr/lib[64]/libGL.so.1
-  /usr/lib[64]/libGL.so.1.0.0
-  /usr/lib[64]/libGLESv1_CM.la
-  /usr/lib[64]/libGLESv1_CM.so
-  /usr/lib[64]/libGLESv1_CM.so.1
-  /usr/lib[64]/libGLESv2.so
-  /usr/lib[64]/libGLESv2.so.2
-  /usr/lib[64]/libEGL.so
-  /usr/lib[64]/libEGL.so.1
-  /usr/lib[64]/xorg/modules/libwfb.so
-  /usr/lib[64]/xorg/modules/extensions/libglx.so
-  /usr/lib[64]/xorg/modules/extensions/libglx.la
-
-The simplest way, for now, to get all the files and symlinks into the right 
-place is to use pkgtools or slackpkg to reinstall the original mesa and 
-xorg-server packages *after* uninstalling this nvidia package.
+Since this nvidia-driver conflicts with some files of xorg, it's a bit
+complex to install/uninstall the driver.  However, installation of the
+nvidia-driver package itself backs up the conflicting files and puts
+the nvidia-specific files into place.
+
+Included is a script called nvidia-switch, which is used to switch from
+the xorg driver to the nvidia driver, but it will not edit xorg.conf
+for you; you have to do that manually.  The nvidia-switch script is
+installed to /usr/sbin. NOTE: Although nvidia-switch is aware of a
+COMPAT32 environment, its use therein is not supported.
+
+Usage of nvidia-switch:
+  nvidia-switch --install  <--> install the nvidia files and save the
+                                stock xorg files.
+  nvidia-switch --remove   <--> remove the nvidia files and symlinks and
+                                restore the stock xorg files.
+
+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 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.