4 files changed, 26 insertions, 48 deletions
diff --git a/development/envytools/README b/development/envytools/README
index 2e6697f974ce0..e7bd622527800 100644
--- a/development/envytools/README
+++ b/development/envytools/README
@@ -2,33 +2,21 @@ Tools for people envious of nvidia's blob driver.
 
 Contents:
 
-* docs:    plain-text documentation of the GPUs, nVidia binary driver, and
-           the tools (in-sync HTML version at http://envytools.rtfd.org)
+* docs: plain-text documentation of the GPUs, nVidia binary driver, and
+the tools (in-sync HTML version at http://envytools.rtfd.org)
 * envydis: Disassembler and assembler for various ISAs found on nvidia GPUs
-* rnn:     Tools and libraries for rules-ng-ng XML register database format
-* rnndb:   rnn database of nvidia MMIO registers, FIFO methods, and memory
-           structures
-* nvbios:  Tools to decode card description structures found in nvidia VBIOS
+* rnn: Tools and libraries for the rules-ng-ng XML register database format
+* rnndb: rnn database of nvidia MMIO registers, FIFO methods, and memory structures.
+* nvbios: Tools to decode the card description structures found in nvidia VBIOS
+* nva: Tools to directly access the GPU registers
 * vstream: Tools to decode and encode raw video bitstreams
-* easm:    Utility code dealing with assembly language parsing & printing
-* util:    Misc utility code shared between envytools modules
-* nva:     Tools to directly access the GPU registers
-* hwtest:  undocumented tool
-* vdpow:   A tool aiding in VP3 reverse engineering
-* nvapy:   undocumented tool
-           (requires optional dependency python3)
-* cupti_trace:
-           tool for REing performance counters
-           (requires optional dependency cudatoolkit)
-* demmt:   undocumented tool
-           (sandboxing requires optional dependency libseccomp)
+* vdpow: A tool aiding in VP3 reverse engineering
+* easm: Utility code dealing with assembly language parsing & printing.
+* util: Misc utility code shared between envytools modules
 
-The nva, hwtest and vdpow tools are built by default, but can be disabled,
-for example
+Some parts of envytools can be disabled with:
+HWTEST="no" NVA="no" VDPOW="no" ./envytools.SlackBuild
 
-  NVA="no" HWTEST="no" VDPOW="no" ./envytools.SlackBuild
+Both hwtest and vdpow require nva.
 
-Note that if the nva tool is disabled, the hwtest and vdpow tools will
-also be disabled.
-
-Optional dependencies (see above): cudatoolkit, libseccomp, and python3
+Some optional dependencies include cudatoolkit, libseccomp, and python3.
diff --git a/development/envytools/envytools.SlackBuild b/development/envytools/envytools.SlackBuild
index f986cdabdec6d..ae66b8ff6a509 100644
--- a/development/envytools/envytools.SlackBuild
+++ b/development/envytools/envytools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for envytools
 
-# Copyright 2016 Hunter Sezen California, USA
+# Copyright 2016-2017 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=envytools
-VERSION=${VERSION:-2016.08.04_3214d7d}
+VERSION=${VERSION:-2017.01.11_aae0c52a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,20 +69,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-NVA="${NVA:-yes}"
-HWTEST="${HWTEST:-yes}"
-VDPOW="${VDPOW:-yes}"
-
-BUILDOPTS=""
-if [ "$NVA" = "no" ]; then
-  BUILDOPTS="-DDISABLE_NVA=ON"
-fi
-if [ "$HWTEST" = "no" ] || [ "$NVA" = "no" ]; then
-  BUILDOPTS="$BUILDOPTS -DDISABLE_HWTEST=ON"
-fi
-if [ "$VDPOW" = "no" ] || [ "$NVA" = "no" ]; then
-  BUILDOPTS="$BUILDOPTS -DDISABLE_VDPOW=ON"
-fi
+HWTEST=${HWTEST:-yes} NVA=${NVA:-yes} VDPOW=${VDPOW:-yes}
+if [ "${HWTEST:-no}" = "no" ]; then hwtest="-DDISABLE_HWTEST=ON"; else hwtest=""; fi
+if [ "${NVA:-no}" = "no" ]; then nva="-DDISABLE_NVA=ON"; else nva=""; fi
+if [ "${VDPOW:-no}" = "no" ]; then vdpow="-DDISABLE_VDPOW=ON"; else vdpow=""; fi
 
 mkdir -p build
 cd build
@@ -91,7 +81,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \
-    $BUILDOPTS \
+    $hwtest $nva $vdpow \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/development/envytools/envytools.info b/development/envytools/envytools.info
index c8a2f3e50327b..f455b430eb969 100644
--- a/development/envytools/envytools.info
+++ b/development/envytools/envytools.info
@@ -1,8 +1,8 @@
 PRGNAM="envytools"
-VERSION="2016.08.04_3214d7d"
+VERSION="2017.01.11_aae0c52a"
 HOMEPAGE="https://github.com/envytools/envytools/"
-DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/envytools-2016.08.04_3214d7d.tar.xz"
-MD5SUM="44b74da9fdcc343abf346568e92b0e33"
+DOWNLOAD="http://ks392457.kimsufi.com/orbea/stuff/slackbuilds/src/envytools-2017.01.11_aae0c52a.tar.xz"
+MD5SUM="a5870250ecfca50653a1369ac6850181"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/envytools/slack-desc b/development/envytools/slack-desc
index f41112de5474b..870dc47ec40c5 100644
--- a/development/envytools/slack-desc
+++ b/development/envytools/slack-desc
@@ -6,10 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-envytools: envytools (development tools for nouveau)
+envytools: envytools (Tools for people envious of nvidia's blob driver)
 envytools:
-envytools: Development tools for nouveau ("tools for people envious of nvidia's
-envytools: blob driver").
+envytools: Tools for people envious of nvidia's blob driver.
 envytools:
 envytools: Homepage: https://github.com/envytools/envytools/
 envytools:
@@ -17,3 +16,4 @@ envytools:
 envytools:
 envytools:
 envytools:
+envytools: