1 files changed, 24 insertions, 11 deletions
diff --git a/games/roccat-tools/roccat-tools.SlackBuild b/games/roccat-tools/roccat-tools.SlackBuild
index 5d26b064f75da..948305a567e4f 100644
--- a/games/roccat-tools/roccat-tools.SlackBuild
+++ b/games/roccat-tools/roccat-tools.SlackBuild
@@ -22,16 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20170603 bkw: Modified by B. Watson <yalhcru@gmail.com>:
+# - update for latest version (5.6.0), since the old version won't build
+#   with modern libgaminggear.
+# - i486 => i586.
+# - use getent to check for group existence, instead of grepping /etc/group.
+# Note: I am not taking over as maintainer. Someone who actually owns roccat
+# hardware should do that.
+
 PRGNAM=roccat-tools
-VERSION=${VERSION:-3.7.1}
+VERSION=${VERSION:-5.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -41,8 +48,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +67,7 @@ set -e
 GROUP=${GROUP:-roccat}
 
 # Check the system group for roccat:
-if ! grep -q ^"$GROUP": /etc/group ; then
+if ! getent group $GROUP >/dev/null; then
   echo "  You will need a dedicated group to run roccat-tools"
   echo "    # groupadd -r -g 318 $GROUP"
   echo "  should do the job."
@@ -86,11 +93,17 @@ else
         HW="-DDEVICES='$DEVICES'"
 fi
 
-if [ "${LUAVERSION:-no}" == "no" ]; then
-        LUA=""
-else
-        LUA="-DWITH_LUA='$LUAVERSION'"
-fi
+# 20170603 bkw: lua is now a required dep, per upstream. However their
+# autodetection is broken so we have to do it ourselves. Note that the
+# WITH_LUA cmake option takes the major.minor version (e.g. 5.1, not 5.1.5).
+# Also note: the cmake script searches for luajit as well as lua, but
+# if luajit's not found, the build succeeds anyway. Not being a lua guy,
+# I don't know what (if anything) is different when built with or
+# without luajit. I only mention it to bring it to the attention of
+# the future maintainer of this script (whoever that turns out to be).
+
+LUAVERSION="$( lua -e 'print(_VERSION)' | cut -d' ' -f2 )"
+LUA="-DWITH_LUA='$LUAVERSION'"
 
 mkdir -p build
 cd build