summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/ois/ChangeLog6
-rw-r--r--dev-games/ois/files/ois-1.3-gcc47.patch40
-rw-r--r--dev-games/ois/ois-1.3.ebuild3
3 files changed, 47 insertions, 2 deletions
diff --git a/dev-games/ois/ChangeLog b/dev-games/ois/ChangeLog
index a43b83274d68..d573c26707bd 100644
--- a/dev-games/ois/ChangeLog
+++ b/dev-games/ois/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/ois
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ois/ChangeLog,v 1.9 2012/06/21 02:03:07 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ois/ChangeLog,v 1.10 2012/07/17 06:59:31 tupone Exp $
+
+ 17 Jul 2012; Tupone Alfredo <tupone@gentoo.org> ois-1.3.ebuild,
+ +files/ois-1.3-gcc47.patch:
+ Build with gcc-4.7 Bug #426442 by flameeyes@gentoo.org
21 Jun 2012; Jeff Horelick <jdhore@gentoo.org> ois-1.3.ebuild:
marked x86 per bug 422153
diff --git a/dev-games/ois/files/ois-1.3-gcc47.patch b/dev-games/ois/files/ois-1.3-gcc47.patch
new file mode 100644
index 000000000000..d002ec3cffb5
--- /dev/null
+++ b/dev-games/ois/files/ois-1.3-gcc47.patch
@@ -0,0 +1,40 @@
+--- demos/FFConsoleDemo.cpp.old 2012-07-17 08:41:33.667876985 +0200
++++ demos/FFConsoleDemo.cpp 2012-07-17 08:42:01.415928693 +0200
+@@ -7,6 +7,7 @@
+ #include <ios>
+ #include <sstream>
+ #include <vector>
++#include <unistd.h>
+
+ using namespace std;
+
+--- demos/OISConsole.cpp.old 2012-07-17 08:43:44.637681119 +0200
++++ demos/OISConsole.cpp 2012-07-17 08:44:06.653135337 +0200
+@@ -12,6 +12,7 @@
+ #include <iostream>
+ #include <vector>
+ #include <sstream>
++#include <unistd.h>
+
+ ////////////////////////////////////Needed Windows Headers////////////
+ #if defined OIS_WIN32_PLATFORM
+--- src/linux/LinuxJoyStickEvents.cpp.old 2012-07-17 08:37:56.065155660 +0200
++++ src/linux/LinuxJoyStickEvents.cpp 2012-07-17 08:38:33.236545721 +0200
+@@ -33,6 +33,7 @@
+ #include <fcntl.h> //Needed to Open a file descriptor
+ #include <cassert>
+ #include <linux/input.h>
++#include <unistd.h>
+
+
+ #include <sstream>
+--- src/linux/LinuxForceFeedback.cpp.old 2012-07-17 08:40:02.633268854 +0200
++++ src/linux/LinuxForceFeedback.cpp 2012-07-17 08:40:28.642442655 +0200
+@@ -26,6 +26,7 @@
+ #include <cstdlib>
+ #include <errno.h>
+ #include <memory.h>
++#include <unistd.h>
+
+ using namespace OIS;
+
diff --git a/dev-games/ois/ois-1.3.ebuild b/dev-games/ois/ois-1.3.ebuild
index f257ae793fca..23e6835a1a03 100644
--- a/dev-games/ois/ois-1.3.ebuild
+++ b/dev-games/ois/ois-1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ois/ois-1.3.ebuild,v 1.3 2012/06/21 02:03:07 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ois/ois-1.3.ebuild,v 1.4 2012/07/17 06:59:31 tupone Exp $
EAPI=4
inherit autotools autotools-utils
@@ -21,6 +21,7 @@ DEPEND="x11-libs/libXaw
S=${WORKDIR}/${MY_P}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc47.patch
eautoreconf
}