libraries/ois: Updated for version 1.4.0

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

3 files changed, 39 insertions, 86 deletions

diff --git a/libraries/ois/gcc-4.7.patch b/libraries/ois/gcc-4.7.patch
deleted file mode 100644
index 16c103b040..0000000000
--- a/libraries/ois/gcc-4.7.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur ois-v1-3.orig/demos/FFConsoleDemo.cpp ois-v1-3/demos/FFConsoleDemo.cpp
---- ois-v1-3.orig/demos/FFConsoleDemo.cpp	2010-04-01 03:38:04.000000000 +0000
-+++ ois-v1-3/demos/FFConsoleDemo.cpp	2012-07-10 02:40:07.339818611 +0000
-@@ -3,6 +3,7 @@
- #include <math.h>

- #include <cstdlib>

- #include <iostream>

-+#include <unistd.h>

- #include <iomanip>

- #include <ios>

- #include <sstream>

-diff -Naur ois-v1-3.orig/demos/OISConsole.cpp ois-v1-3/demos/OISConsole.cpp
---- ois-v1-3.orig/demos/OISConsole.cpp	2010-08-15 22:51:34.000000000 +0000
-+++ ois-v1-3/demos/OISConsole.cpp	2012-07-10 02:38:39.624815796 +0000
-@@ -10,6 +10,7 @@
- #include "OISForceFeedback.h"

- 

- #include <iostream>

-+#include <unistd.h>

- #include <vector>

- #include <sstream>

- 

-@@ -77,7 +78,7 @@
- 	}

- 	bool keyReleased( const KeyEvent &arg ) {

- 		if( arg.key == KC_ESCAPE || arg.key == KC_Q )

--			appRunning = false;
-+			appRunning = false;

- 		std::cout << "KeyReleased {" << ((Keyboard*)(arg.device))->getAsString(arg.key) << "}\n";

- 		return true;

- 	}

-diff -Naur ois-v1-3.orig/src/linux/LinuxForceFeedback.cpp ois-v1-3/src/linux/LinuxForceFeedback.cpp
---- ois-v1-3.orig/src/linux/LinuxForceFeedback.cpp	2010-04-01 03:06:55.000000000 +0000
-+++ ois-v1-3/src/linux/LinuxForceFeedback.cpp	2012-07-10 02:33:03.871465001 +0000
-@@ -33,7 +33,8 @@
- #define OIS_LINUX_JOYFF_DEBUG 1

- 

- #ifdef OIS_LINUX_JOYFF_DEBUG

--# include <iostream>

-+#include <iostream>

-+#include <unistd.h>

-   using namespace std;

- #endif

- 

-diff -Naur ois-v1-3.orig/src/linux/LinuxJoyStickEvents.cpp ois-v1-3/src/linux/LinuxJoyStickEvents.cpp
---- ois-v1-3.orig/src/linux/LinuxJoyStickEvents.cpp	2010-07-26 01:28:41.000000000 +0000
-+++ ois-v1-3/src/linux/LinuxJoyStickEvents.cpp	2012-07-10 02:27:07.663922138 +0000
-@@ -31,12 +31,13 @@
- #include "OISException.h"

- 

- #include <fcntl.h>        //Needed to Open a file descriptor

--#include <cassert>	

-+#include <cassert>

- #include <linux/input.h>

- 

- 

- #include <sstream>

--# include <iostream>

-+#include <iostream>

-+#include <unistd.h>

- using namespace std;

- 

- using namespace OIS;

diff --git a/libraries/ois/ois.SlackBuild b/libraries/ois/ois.SlackBuild
index 080ca5f67a..b660e64090 100644
--- a/libraries/ois/ois.SlackBuild
+++ b/libraries/ois/ois.SlackBuild
@@ -2,17 +2,36 @@
 
 # Slackware build script for ois
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ois
-VERSION=${VERSION:-1.3.0}
-SRCVER=${SRCVER:-v1-3}
-BUILD=${BUILD:-2}
+SRCDIR=OIS
+VERSION=${VERSION:-1.4.0}
+SRCVER=${SRCVER:-1.4}
+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
@@ -23,8 +42,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"
@@ -42,18 +61,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/${PRGNAM}_${SRCVER}.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $SRCDIR-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $SRCDIR-$SRCVER
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix for gcc 4.7.x.
-patch -p1 < $CWD/gcc-4.7.patch
+ \( -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 {} \;
 
 [ ! -x ./bootstrap ] && chmod +x ./bootstrap
 ./bootstrap
@@ -69,11 +85,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ReadMe.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/ois/ois.info b/libraries/ois/ois.info
index 5aab834b57..0847977d33 100644
--- a/libraries/ois/ois.info
+++ b/libraries/ois/ois.info
@@ -1,8 +1,8 @@
 PRGNAM="ois"
-VERSION="1.3.0"
-HOMEPAGE="https://sourceforge.net/projects/wgois/"
-DOWNLOAD="https://downloads.sourceforge.net/wgois/ois_v1-3.tar.gz"
-MD5SUM="9697fead17eac6025151cd2e1fca1518"
+VERSION="1.4.0"
+HOMEPAGE="https://github.com/wgois/OIS"
+DOWNLOAD="https://github.com/wgois/OIS/archive/v1.4/ois-1.4.tar.gz"
+MD5SUM="f9f426c3fd835dd3b811c0f5be07e583"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""