From fdaf3ce1a00738f2ac9c269a4ff26a2e75027ba9 Mon Sep 17 00:00:00 2001
From: "M.Dinslage" <daedra1980@gmail.com>
Date: Sat, 8 Oct 2016 07:52:25 +0700
Subject: system/conky: Updated for version 1.10.5.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/conky/README           |  8 ++++++++
 system/conky/conky.SlackBuild | 14 ++++++++++++--
 system/conky/conky.info       |  6 +++---
 3 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'system')

diff --git a/system/conky/README b/system/conky/README
index f809bfb185c8..5ae0068d578d 100644
--- a/system/conky/README
+++ b/system/conky/README
@@ -19,3 +19,11 @@ branch.
 Audacious is disabled by default because it requires libaudclient.
 libaudclient is available here at SBo.  You can enable audacious
 support the build by passing AUDACIOUS=yes ./conky.SlackBuild.
+
+If you are using the binary Nvidia drivers, conky has native support
+for monitoring your video cards hardware.  To enable this feature
+you must install the binary drivers using the nvidia_kernel and
+nvidia_driver packages available here at SBo, or you can use the
+binary run installer provided by Nvidia. Once the driver is
+installed you must also install libxnvctrl, also available here
+at SBo.  Then pass NVIDIA=yes to the build script.
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index aeb8735832fd..03cce39038a9 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=conky
-VERSION=${VERSION:-1.10.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.10.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -43,6 +43,9 @@ OUTPUT=${OUTPUT:-/tmp}
 # Pass AUDACIOUS=yes if you want to build audacious player support.
 AUDACIOUS=${AUDACIOUS:-"no"}
 
+# Pass NVIDIA=yes if you want to build NVIDIA hardware monitoring support.
+NVIDIA=${NVIDIA:-"no"}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -65,6 +68,12 @@ else
   audacious="OFF"
 fi
 
+if [ "${NVIDIA:-yes}" = "yes" ]; then
+  nvidia="ON"
+else
+  nvidia="OFF"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -93,6 +102,7 @@ cd build
     -DMAINTAINER_MODE=ON \
     -DBUILD_XDBE=ON \
     -DBUILD_AUDACIOUS=$audacious \
+    -DBUILD_NVIDIA=$nvidia \
     -DBUILD_CURL=ON \
     -DBUILD_WLAN=ON \
     -DBUILD_RSS=ON \
diff --git a/system/conky/conky.info b/system/conky/conky.info
index 63b5b711d9a8..db381725f9fd 100644
--- a/system/conky/conky.info
+++ b/system/conky/conky.info
@@ -1,8 +1,8 @@
 PRGNAM="conky"
-VERSION="1.10.4"
+VERSION="1.10.5"
 HOMEPAGE="http://conky.sourceforge.net"
-DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.10.4.tar.gz"
-MD5SUM="28259c21f50279472fd9a9a8299b70cb"
+DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.10.5.tar.gz"
+MD5SUM="b3c198e27c4ff61f4ffddf560378df8f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="tolua++ imlib2"
-- 
cgit v1.2.3