From c43abfa0900b0f60ccce92878b496ac260b88deb Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Fri, 29 Nov 2019 16:06:16 -0500
Subject: system/linuxconsoletools: Updated for version 1.7.0.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 system/linuxconsoletools/README                       |  4 ++++
 system/linuxconsoletools/linuxconsoletools.SlackBuild | 11 +++++++++--
 system/linuxconsoletools/linuxconsoletools.info       |  6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'system/linuxconsoletools')

diff --git a/system/linuxconsoletools/README b/system/linuxconsoletools/README
index aaac1d084e..7d3b6e9b5a 100644
--- a/system/linuxconsoletools/README
+++ b/system/linuxconsoletools/README
@@ -9,6 +9,10 @@ to test and configure joysticks, connect legacy devices to the kernel's
 input subsystem (providing support for serial mice, touchscreens etc.),
 and test the input event layer.
 
+Optional dependency: SDL2. This is only required for ffmvforce (force
+orientation test for force-feedback devices). If SDL2 is not installed,
+ffmvforce won't be included in the package.
+
 Notes:
 
 - This replaces the "joystick" build that was previously available.
diff --git a/system/linuxconsoletools/linuxconsoletools.SlackBuild b/system/linuxconsoletools/linuxconsoletools.SlackBuild
index 129224725c..9de107a555 100644
--- a/system/linuxconsoletools/linuxconsoletools.SlackBuild
+++ b/system/linuxconsoletools/linuxconsoletools.SlackBuild
@@ -22,6 +22,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20191129 bkw: update for v1.7.0, document new optional SDL2 dep.
 # 20181030 bkw: add GPM_COMPAT=yes option, minor cleanups, BUILD=2
 # 20161015 bkw: update for v1.6.0
 # 20160726 bkw: update for v1.5.1
@@ -30,8 +31,8 @@
 #               replaced patch with a bit of sed.
 
 PRGNAM=linuxconsoletools
-VERSION=${VERSION:-1.6.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -73,6 +74,12 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# 20191129 bkw: allow building without SDL2 installed.
+if ! pkg-config --exists sdl2; then
+  sed -i '/^PROGRAMS/s,ffmvforce ,,' utils/Makefile
+  sed -i 's,ffmvforce\.1 ,,' docs/Makefile
+fi
+
 # install manpages in /usr/man instead of /usr/share/man
 sed -i 's,share/man,man,g' docs/Makefile
 
diff --git a/system/linuxconsoletools/linuxconsoletools.info b/system/linuxconsoletools/linuxconsoletools.info
index dd647eb667..a337df9362 100644
--- a/system/linuxconsoletools/linuxconsoletools.info
+++ b/system/linuxconsoletools/linuxconsoletools.info
@@ -1,8 +1,8 @@
 PRGNAM="linuxconsoletools"
-VERSION="1.6.0"
+VERSION="1.7.0"
 HOMEPAGE="https://sourceforge.net/projects/linuxconsole/"
-DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.6.0.tar.bz2"
-MD5SUM="fd52fa4a81455eb95a6c81efb087ce98"
+DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.7.0.tar.bz2"
+MD5SUM="b30c4daa2329d9af316045657370ee27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3