system/nvidia-legacy340-driver: Removed nvidia-installer, cleanups.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 22 insertions, 43 deletions

diff --git a/system/nvidia-legacy340-driver/changelog.txt b/system/nvidia-legacy340-driver/changelog.txt
index 5e6c0caf8d..a8b0918a50 100644
--- a/system/nvidia-legacy340-driver/changelog.txt
+++ b/system/nvidia-legacy340-driver/changelog.txt
@@ -1,23 +1,24 @@
-1.0		20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1		10-APR-2011	updated to new version, testing 13.37rc4.6692
-1.2		27-MAY-2011	new version, allow multilib option, minor edits
+1.0	20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
+1.1	10-APR-2011	updated to new version, testing 13.37rc4.6692
+1.2	27-MAY-2011	new version, allow multilib option, minor edits
 1.2.1	20-JUN-2011	minor edits, thanks to Robby and Roberto
-1.5		01-JUL-2011	new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6		27-AUG-2011	version bump, minor edits
-1.7		21-OCT-2011	version bump
-1.8		24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
-1.9		02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
-2.0		21-AUG-2012	new version (important security fix), missing vdpau-nvidia, dropped *.h
-2.1		25-AUG-2012	new version -Long Lived Branch, fixed symlinks (per Das email)
-2.2		22-NOV-2012	new version -Long Lived Branch. Updates: libs, apps
-2.3		15-FEB-2013	new version -Long Lived Branch.
-2.4		19-MAY-2013	new version -Long Lived Branch.
-2.6		20-OCT-2013	new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
-3.0		13-NOV-2013	new version (LLB), update libs
-3.1		12-APR-2014	new version (LLB), update libs
+1.5	01-JUL-2011	new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
+1.6	27-AUG-2011	version bump, minor edits
+1.7	21-OCT-2011	version bump
+1.8	24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
+1.9	02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
+2.0	21-AUG-2012	new version (important security fix), missing vdpau-nvidia, dropped *.h
+2.1	25-AUG-2012	new version -Long Lived Branch, fixed symlinks (per Das email)
+2.2	22-NOV-2012	new version -Long Lived Branch. Updates: libs, apps
+2.3	15-FEB-2013	new version -Long Lived Branch.
+2.4	19-MAY-2013	new version -Long Lived Branch.
+2.6	20-OCT-2013	new version -Long Lived Branch, add new lib, fix nvidia-switch --remove
+3.0	13-NOV-2013	new version (LLB), update libs
+3.1	12-APR-2014	new version (LLB), update libs
 3.2a	12-JUL-2014	new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm
-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 legacy branch, version update, bug fixes
-4.1     05-SEP-2015 version update LLB
-4.1     13-DEC-2015 version update, X.Org 1.18 support
+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 legacy branch, version update, bug fixes
+4.1	05-SEP-2015	version update LLB
+4.2	13-DEC-2015	version update, X.Org 1.18 support
+4.3	19-MAR-2016	remove nvidia-installer (doesn't compile on 14.2RC1)
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
index 395ed39c5a..a6ca6cdb29 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
@@ -71,8 +71,6 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf nvidia-installer-$VERSION
-tar xvf $CWD/nvidia-installer-$VERSION.tar.bz2
 rm -rf nvidia-settings-$VERSION
 tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2
 rm -rf nvidia-xconfig-$VERSION
@@ -194,22 +192,6 @@ if [ "$ARCH" = "x86_64" -a "${CPROXY}" = "yes" ]; then
    install -m 644 nvidia-cuda-mps-control.1.gz $PKG/usr/man/man1/
 fi
 
-# Compiling nvidia-installer from source
-# Not really needed for this SBo package
-cd $TMP/nvidia-installer-$VERSION
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-  CFLAGS="$SLKCFLAGS" LDFLAGS="-lz" make
-
-  install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
-  install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
-cd -
-
 # Compiling nvidia-settings from source
 cd $TMP/nvidia-settings-$VERSION
   chown -R root:root .
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
index afd5b504b4..3a5d232efd 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
@@ -2,25 +2,21 @@ PRGNAM="nvidia-legacy340-driver"
 VERSION="340.96"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.96.tar.bz2 \
 	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.96.tar.bz2 \
 	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.96.tar.bz2 \
 	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.96.tar.bz2 \
           ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.96.tar.bz2"
 MD5SUM="cb64b165b638671bcdc75bcf297b8d90 \
-        6a5a18d9cbe49f2a5b3da5d5830059d5 \
         36e7509064a3900139c3dbda05e04283 \
         7174be57b82be6a875e5cb21b0d1fe92 \
         ea8a4563ffb751141037c82958d19c43 \
         c4456cffe24d88ecde5782f981b540ee"
 DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96.run \
-                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-340.96.tar.bz2 \
                  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.96.tar.bz2 \
                  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.96.tar.bz2 \
                  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.96.tar.bz2 \
                  ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.96.tar.bz2"
 MD5SUM_x86_64="f66b4f01a1edab6ce7d7b90d9b209cd1 \
-        6a5a18d9cbe49f2a5b3da5d5830059d5 \
         36e7509064a3900139c3dbda05e04283 \
         7174be57b82be6a875e5cb21b0d1fe92 \
         ea8a4563ffb751141037c82958d19c43 \