diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-games/ois/files | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'dev-games/ois/files')
-rw-r--r-- | dev-games/ois/files/ois-1.3-automake-1.13.patch | 11 | ||||
-rw-r--r-- | dev-games/ois/files/ois-1.3-gcc47.patch | 40 | ||||
-rw-r--r-- | dev-games/ois/files/ois-1.5-libdir.patch | 28 |
3 files changed, 0 insertions, 79 deletions
diff --git a/dev-games/ois/files/ois-1.3-automake-1.13.patch b/dev-games/ois/files/ois-1.3-automake-1.13.patch deleted file mode 100644 index af7aa641e6ae..000000000000 --- a/dev-games/ois/files/ois-1.3-automake-1.13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -5,7 +5,7 @@ - - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE( [OIS], 1.3.0 ) --AM_CONFIG_HEADER([includes/config.h]) -+AC_CONFIG_HEADERS([includes/config.h]) - - dnl Check for programs - AC_PROG_CC diff --git a/dev-games/ois/files/ois-1.3-gcc47.patch b/dev-games/ois/files/ois-1.3-gcc47.patch deleted file mode 100644 index 71c7565e17df..000000000000 --- a/dev-games/ois/files/ois-1.3-gcc47.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/demos/FFConsoleDemo.cpp.old 2012-07-17 08:41:33.667876985 +0200 -+++ b/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;
-
---- a/demos/OISConsole.cpp.old 2012-07-17 08:43:44.637681119 +0200 -+++ b/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
---- a/src/linux/LinuxJoyStickEvents.cpp.old 2012-07-17 08:37:56.065155660 +0200 -+++ b/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>
---- a/src/linux/LinuxForceFeedback.cpp.old 2012-07-17 08:40:02.633268854 +0200 -+++ b/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/files/ois-1.5-libdir.patch b/dev-games/ois/files/ois-1.5-libdir.patch deleted file mode 100644 index 71157bca59cc..000000000000 --- a/dev-games/ois/files/ois-1.5-libdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/wgois/OIS/commit/0536741549a157627d4306f6e19f1cc5cb52cef8 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS) - - endif() - --set(LIB_INSTALL_DIR "lib") -+if(UNIX) -+ include(GNUInstallDirs) -+ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) -+else() -+ set(LIB_INSTALL_DIR "lib") -+endif() -+ - set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) - - file(GLOB PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/includes/*.h") -@@ -240,8 +246,8 @@ install(FILES ${PUBLIC_HEADERS} - - install(TARGETS OIS - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - FRAMEWORK DESTINATION Library/Frameworks - ) |