| 1 |
commit: 3879aa52afd9e9b5f9cacd67a5eb3a06b9806dee |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 1 09:44:53 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 1 09:45:03 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3879aa52 |
| 7 |
|
| 8 |
games-simulation/corsix-th: fix Lua detection |
| 9 |
|
| 10 |
I swear I remember checking the compile lines, too! I dunno what happened there. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{corsix-th-0.66.ebuild => corsix-th-0.66-r1.ebuild} | 1 + |
| 15 |
.../files/corsix-th-0.66-cmake_lua_detection.patch | 14 +++++++------- |
| 16 |
2 files changed, 8 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-simulation/corsix-th/corsix-th-0.66.ebuild b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild |
| 19 |
similarity index 98% |
| 20 |
rename from games-simulation/corsix-th/corsix-th-0.66.ebuild |
| 21 |
rename to games-simulation/corsix-th/corsix-th-0.66-r1.ebuild |
| 22 |
index 07f24a781502..37a6785596eb 100644 |
| 23 |
--- a/games-simulation/corsix-th/corsix-th-0.66.ebuild |
| 24 |
+++ b/games-simulation/corsix-th/corsix-th-0.66-r1.ebuild |
| 25 |
@@ -56,6 +56,7 @@ PATCHES=( |
| 26 |
|
| 27 |
src_configure() { |
| 28 |
local mycmakeargs=( |
| 29 |
+ -DLUA_VERSION=$(lua_get_version) |
| 30 |
-DWITH_AUDIO=$(usex sound) |
| 31 |
-DWITH_FREETYPE2=$(usex truetype) |
| 32 |
-DWITH_MOVIES=$(usex videos) |
| 33 |
|
| 34 |
diff --git a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch |
| 35 |
index b201aa4877f8..f85d1bfb0b89 100644 |
| 36 |
--- a/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch |
| 37 |
+++ b/games-simulation/corsix-th/files/corsix-th-0.66-cmake_lua_detection.patch |
| 38 |
@@ -1,13 +1,13 @@ |
| 39 |
diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt |
| 40 |
-index 1544810..d9d3332 100644 |
| 41 |
+index 1544810..05ed3b0 100644 |
| 42 |
--- a/CorsixTH/CMakeLists.txt |
| 43 |
+++ b/CorsixTH/CMakeLists.txt |
| 44 |
-@@ -129,7 +129,7 @@ endif() |
| 45 |
- |
| 46 |
- # Find Lua |
| 47 |
- if(MSVC AND USE_VCPKG_DEPS) |
| 48 |
-- find_package(Lua CONFIG REQUIRED) |
| 49 |
-+ find_package(Lua ${LUA_VERSION} EXACT REQUIRED) |
| 50 |
+@@ -133,7 +133,7 @@ if(MSVC AND USE_VCPKG_DEPS) |
| 51 |
target_link_libraries(CorsixTH_lib lua) |
| 52 |
target_link_libraries(CorsixTH lua) |
| 53 |
else() |
| 54 |
+- find_package(Lua REQUIRED) |
| 55 |
++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED) |
| 56 |
+ if(Lua_FOUND OR LUA_FOUND) |
| 57 |
+ target_link_libraries(CorsixTH ${LUA_LIBRARY}) |
| 58 |
+ include_directories(${LUA_INCLUDE_DIR}) |
Archives