Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78c80b3ec28c763f0eb368e55f0c5b9625d14bb8
commit 78c80b3ec28c763f0eb368e55f0c5b9625d14bb8 Author: crazy <[email protected]> Date: Thu Jun 2 02:49:03 2016 +0200 ois-1.3-2-x86_64 * rebuild * makedepends=() fix * added an patch to fix the build diff --git a/source/lib-extra/ois/FrugalBuild b/source/lib-extra/ois/FrugalBuild index 7aef161..2d762a0 100644 --- a/source/lib-extra/ois/FrugalBuild +++ b/source/lib-extra/ois/FrugalBuild @@ -3,10 +3,10 @@ pkgname=ois pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Object Oriented Input System" depends=('glibc') -makedepends=('libxaw') +makedepends=('libxaw' 'x11-protos') archs=('i686' 'x86_64') url="http://sourceforge.net/projects/wgois"; groups=('lib-extra') @@ -14,9 +14,11 @@ _F_sourceforge_dirname="wgois" _F_sourceforge_sep="_v" _F_sourceforge_pkgver=${pkgver/./-} Finclude sourceforge +source+=(gcc5.patch) up2date="$up2date | sed 's/-/\./g'" _F_cd_path=${pkgname}-v${_F_sourceforge_pkgver} -sha1sums=('860f366f87e5103109e72724ce096ce8559c2d3d') +sha1sums=('860f366f87e5103109e72724ce096ce8559c2d3d' \ + 'cb3d05a8aeefbfa9afa62f0f878c9156ecf10030') build() { @@ -25,3 +27,5 @@ build() ./bootstrap Fbuild } + +# optimization OK diff --git a/source/lib-extra/ois/gcc5.patch b/source/lib-extra/ois/gcc5.patch new file mode 100644 index 0000000..e8d73d5 --- /dev/null +++ b/source/lib-extra/ois/gcc5.patch @@ -0,0 +1,56 @@ +diff -Naur ois-v1-3/demos/FFConsoleDemo.cpp ois-v1-3-p/demos/FFConsoleDemo.cpp +--- ois-v1-3/demos/FFConsoleDemo.cpp 2010-04-01 05:38:04.000000000 +0200 ++++ ois-v1-3-p/demos/FFConsoleDemo.cpp 2016-06-02 02:44:37.148477338 +0200 +@@ -7,7 +7,7 @@ + #include <ios> + #include <sstream> + #include <vector> +- ++#include <unistd.h> + using namespace std; + + ////////////////////////////////////Needed Windows Headers//////////// +diff -Naur ois-v1-3/demos/OISConsole.cpp ois-v1-3-p/demos/OISConsole.cpp +--- ois-v1-3/demos/OISConsole.cpp 2010-08-16 00:51:34.000000000 +0200 ++++ ois-v1-3-p/demos/OISConsole.cpp 2016-06-02 02:47:39.066187911 +0200 +@@ -12,6 +12,7 @@ + #include <iostream> + #include <vector> + #include <sstream> ++#include <unistd.h> + + ////////////////////////////////////Needed Windows Headers//////////// + #if defined OIS_WIN32_PLATFORM +@@ -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/src/linux/LinuxForceFeedback.cpp ois-v1-3-p/src/linux/LinuxForceFeedback.cpp +--- ois-v1-3/src/linux/LinuxForceFeedback.cpp 2010-04-01 05:06:55.000000000 +0200 ++++ ois-v1-3-p/src/linux/LinuxForceFeedback.cpp 2016-06-02 02:39:39.975788107 +0200 +@@ -26,6 +26,7 @@ + #include <cstdlib> + #include <errno.h> + #include <memory.h> ++#include <unistd.h> + + using namespace OIS; + +diff -Naur ois-v1-3/src/linux/LinuxJoyStickEvents.cpp ois-v1-3-p/src/linux/LinuxJoyStickEvents.cpp +--- ois-v1-3/src/linux/LinuxJoyStickEvents.cpp 2010-07-26 03:28:41.000000000 +0200 ++++ ois-v1-3-p/src/linux/LinuxJoyStickEvents.cpp 2016-06-02 02:40:12.303624219 +0200 +@@ -31,7 +31,8 @@ + #include "OISException.h" + + #include <fcntl.h> //Needed to Open a file descriptor +-#include <cassert> ++#include <cassert> ++#include <unistd.h> + #include <linux/input.h> + + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
