[gentoo-commits] repo/gentoo:master commit in: dev-games/ois/, dev-games/ois/files/
commit: 04b54e8f303e6902f3dcde33a8377aa53e989668
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Feb 16 06:20:28 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Feb 16 06:55:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b54e8f
dev-games/ois: drop 1.3-r1, 1.5
Signed-off-by: Ionen Wolkens gentoo.org>
dev-games/ois/Manifest | 2 --
dev-games/ois/files/ois-1.3-automake-1.13.patch | 11 ---
dev-games/ois/files/ois-1.3-gcc47.patch | 40 -
dev-games/ois/files/ois-1.5-libdir.patch| 28 -
dev-games/ois/ois-1.3-r1.ebuild | 31 ---
dev-games/ois/ois-1.5.ebuild| 24 ---
6 files changed, 136 deletions(-)
diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
index 0a7659cd48a0..2c588041c02d 100644
--- a/dev-games/ois/Manifest
+++ b/dev-games/ois/Manifest
@@ -1,3 +1 @@
DIST ois-1.5.1.tar.gz 554124 BLAKE2B
a975cbd629b86618a607b275bfcd35fedfd897c8aec00ab1caad992762d2fef4197af5eb052ffd122c135b610f5611c76c9cce937ca002668e3c313bf08a1d4a
SHA512
20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340
-DIST ois-1.5.tar.gz 552786 BLAKE2B
2ac2d1d74c03804cdc1c0b8cd1e2a3661d9edfc8ae230d036f108dbffd6d8aa5778e2f708b468fd3364c0ba403d07b04c1744eb5a11b39d658ef5a21943a9df3
SHA512
5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513
-DIST ois_v1-3.tar.gz 136739 BLAKE2B
88dd3af2c8b253d9cacc5c65510c150ba50c6a47c1c2cd241bf366f38fba0560a7cef08392e338984e8b172020c4a4c37e5eab024fabc695b2f06f93393850ed
SHA512
48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3
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..
--- 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..
--- 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
- #include
- #include
-+#include
-
- 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
- #include
- #include
-+#include
-
- Needed Windows Headers
- #if defined OIS_WIN32_PLATFORM
a/src/linux/LinuxJoyStickEvents.cpp.old2012-07-17 08:37:56.065155660
+0200
-+++ b/src/linux/LinuxJoyStickEvents.cpp2012-07-17 08:38:33.236545721
+0200
-@@ -33,6 +33,7 @@
- #include //Needed to Open a file descriptor
- #include
- #include
-+#include
-
-
- #include
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
- #include
- #include
-+#include
-
- 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..
--- 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
- )
diff --git a/dev-games/ois/ois-1.3-r1.ebuild b/dev-games/ois/ois-1.3-r1.ebuild
deleted file mode 100644
index 7f4570d22647..
--- a/dev-games/ois/ois-1.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-#
[gentoo-commits] repo/gentoo:master commit in: dev-games/ois/, dev-games/ois/files/
commit: 0415d887f7f8bf2a5e0fcf00ba29f409aeb6e281
Author: Sam James gentoo org>
AuthorDate: Wed Mar 3 14:00:46 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 3 14:00:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0415d887
dev-games/ois: libdir patch has been upstreamed
Signed-off-by: Sam James gentoo.org>
dev-games/ois/files/ois-1.5-libdir.patch | 5 +
dev-games/ois/ois-1.5.ebuild | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-games/ois/files/ois-1.5-libdir.patch
b/dev-games/ois/files/ois-1.5-libdir.patch
index f7f3efbc837..71157bca59c 100644
--- a/dev-games/ois/files/ois-1.5-libdir.patch
+++ b/dev-games/ois/files/ois-1.5-libdir.patch
@@ -1,6 +1,4 @@
-https://github.com/wgois/OIS/pull/69
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 56b1c49..c4ce5a8 100644
+https://github.com/wgois/OIS/commit/0536741549a157627d4306f6e19f1cc5cb52cef8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS)
@@ -28,4 +26,3 @@ index 56b1c49..c4ce5a8 100644
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
FRAMEWORK DESTINATION Library/Frameworks
)
-
diff --git a/dev-games/ois/ois-1.5.ebuild b/dev-games/ois/ois-1.5.ebuild
index 42b17116883..2b19afc068f 100644
--- a/dev-games/ois/ois-1.5.ebuild
+++ b/dev-games/ois/ois-1.5.ebuild
@@ -20,5 +20,5 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-1.5-libdir.patch"
+ "${FILESDIR}/${P}-libdir.patch"
)
[gentoo-commits] repo/gentoo:master commit in: dev-games/ois/, dev-games/ois/files/
commit: 6c33f04eb2a4bddc30f01bc2d44613010ffd080f
Author: Sam James gentoo org>
AuthorDate: Thu Feb 25 06:29:51 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 25 06:36:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c33f04e
dev-games/ois: bump to 1.5
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
dev-games/ois/Manifest | 1 +
dev-games/ois/files/ois-1.5-libdir.patch | 31 +++
dev-games/ois/ois-1.5.ebuild | 24
3 files changed, 56 insertions(+)
diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
index 4610d18db10..8c9fffb98f2 100644
--- a/dev-games/ois/Manifest
+++ b/dev-games/ois/Manifest
@@ -1 +1,2 @@
+DIST ois-1.5.tar.gz 552786 BLAKE2B
2ac2d1d74c03804cdc1c0b8cd1e2a3661d9edfc8ae230d036f108dbffd6d8aa5778e2f708b468fd3364c0ba403d07b04c1744eb5a11b39d658ef5a21943a9df3
SHA512
5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513
DIST ois_v1-3.tar.gz 136739 BLAKE2B
88dd3af2c8b253d9cacc5c65510c150ba50c6a47c1c2cd241bf366f38fba0560a7cef08392e338984e8b172020c4a4c37e5eab024fabc695b2f06f93393850ed
SHA512
48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3
diff --git a/dev-games/ois/files/ois-1.5-libdir.patch
b/dev-games/ois/files/ois-1.5-libdir.patch
new file mode 100644
index 000..acd635c550b
--- /dev/null
+++ b/dev-games/ois/files/ois-1.5-libdir.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a5da3b7..90a8b77 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -210,8 +210,7 @@ if (OIS_BUILD_DEMOS)
+
+ endif()
+
+-set(LIB_INSTALL_DIR "lib")
+-set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
++set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+
+ file(GLOB PUBLIC_HEADERS "${CMAKE_SOURCE_DIR}/includes/*.h")
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90a8b77..3c1fe95 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -219,9 +219,9 @@ install(FILES ${PUBLIC_HEADERS}
+ )
+
+ install(TARGETS OIS
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ FRAMEWORK DESTINATION Library/Frameworks
+ )
+
diff --git a/dev-games/ois/ois-1.5.ebuild b/dev-games/ois/ois-1.5.ebuild
new file mode 100644
index 000..42b17116883
--- /dev/null
+++ b/dev-games/ois/ois-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Object-oriented Input System - A cross-platform C++ input
handling library"
+HOMEPAGE="https://github.com/wgois/OIS;
+SRC_URI="https://github.com/wgois/OIS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+ x11-libs/libXaw
+ x11-libs/libX11
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.5-libdir.patch"
+)
