| 1 |
hasufell 14/07/07 13:35:56 |
| 2 |
|
| 3 |
Added: minetest-0.4.10-system-lua.patch |
| 4 |
minetest-0.4.10-shared-irrlicht.patch |
| 5 |
minetest-0.4.10-as-needed.patch |
| 6 |
Log: |
| 7 |
version bump |
| 8 |
|
| 9 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-action/minetest/files/minetest-0.4.10-system-lua.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.10-system-lua.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.10-system-lua.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: minetest-0.4.10-system-lua.patch |
| 18 |
=================================================================== |
| 19 |
--- a/src/CMakeLists.txt |
| 20 |
+++ b/src/CMakeLists.txt |
| 21 |
@@ -215,8 +215,6 @@ |
| 22 |
message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}") |
| 23 |
else (NOT ${DISABLE_LUAJIT} MATCHES "1") |
| 24 |
message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)") |
| 25 |
- set(LUA_LIBRARY "") |
| 26 |
- set(LUA_INCLUDE_DIR "") |
| 27 |
endif (NOT DISABLE_LUAJIT) |
| 28 |
|
| 29 |
set(USE_LUAJIT 0) |
| 30 |
@@ -267,11 +265,22 @@ |
| 31 |
endif (VALID_LUAJIT_VERSION) |
| 32 |
endif (LUA_LIBRARY AND LUA_INCLUDE_DIR) |
| 33 |
|
| 34 |
+OPTION(WITH_BUNDLED_LUA "Use bundled lua") |
| 35 |
+ |
| 36 |
if(NOT USE_LUAJIT) |
| 37 |
message (STATUS "LuaJIT not found, using bundled Lua.") |
| 38 |
- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") |
| 39 |
- set(LUA_LIBRARY "lua") |
| 40 |
- add_subdirectory(lua) |
| 41 |
+ if (WITH_BUNDLED_LUA) |
| 42 |
+ set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") |
| 43 |
+ set(LUA_LIBRARY "lua") |
| 44 |
+ add_subdirectory(lua) |
| 45 |
+ else (WITH_BUNDLED_LUA) |
| 46 |
+ find_package(Lua51) |
| 47 |
+ if(LUA51_FOUND) |
| 48 |
+ message (STATUS "Lua51 found") |
| 49 |
+ else(LUA51_FOUND) |
| 50 |
+ message (FATAL_ERROR "Lua51 not found!") |
| 51 |
+ endif(LUA51_FOUND) |
| 52 |
+ endif(WITH_BUNDLED_LUA) |
| 53 |
endif(NOT USE_LUAJIT) |
| 54 |
|
| 55 |
mark_as_advanced(LUA_LIBRARY) |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.1 games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch?rev=1.1&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch?rev=1.1&content-type=text/plain |
| 63 |
|
| 64 |
Index: minetest-0.4.10-shared-irrlicht.patch |
| 65 |
=================================================================== |
| 66 |
commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84 |
| 67 |
Author: hasufell <julian.ospald@××××××××××.com> |
| 68 |
Date: Sat Jun 8 13:40:30 2013 +0200 |
| 69 |
|
| 70 |
CMAKE: use shared lib from Irrlicht |
| 71 |
|
| 72 |
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake |
| 73 |
index bd00422..4632993 100644 |
| 74 |
--- a/cmake/Modules/FindIrrlicht.cmake |
| 75 |
+++ b/cmake/Modules/FindIrrlicht.cmake |
| 76 |
@@ -50,10 +50,11 @@ else() |
| 77 |
/usr/include/irrlicht |
| 78 |
) |
| 79 |
|
| 80 |
- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht |
| 81 |
+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht |
| 82 |
PATHS |
| 83 |
/usr/local/lib |
| 84 |
/usr/lib |
| 85 |
+ /usr/lib64 |
| 86 |
) |
| 87 |
endif() |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.1 games-action/minetest/files/minetest-0.4.10-as-needed.patch |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.10-as-needed.patch?rev=1.1&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.10-as-needed.patch?rev=1.1&content-type=text/plain |
| 96 |
|
| 97 |
Index: minetest-0.4.10-as-needed.patch |
| 98 |
=================================================================== |
| 99 |
commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd |
| 100 |
Author: hasufell <hasufell@g.o> |
| 101 |
Date: Mon Nov 25 00:28:55 2013 +0100 |
| 102 |
|
| 103 |
CMAKE: fix linking order |
| 104 |
|
| 105 |
this also fixes linking with as-needed wrt |
| 106 |
https://github.com/minetest/minetest/issues/617 |
| 107 |
|
| 108 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 109 |
index a1fee7a..a72bd4a 100644 |
| 110 |
--- a/src/CMakeLists.txt |
| 111 |
+++ b/src/CMakeLists.txt |
| 112 |
@@ -427,18 +427,18 @@ if(BUILD_CLIENT) |
| 113 |
set(minetest_LIBS |
| 114 |
${PROJECT_NAME} |
| 115 |
${ZLIB_LIBRARIES} |
| 116 |
- ${IRRLICHT_LIBRARY} |
| 117 |
+ ${X11_LIBRARIES} |
| 118 |
${OPENGL_LIBRARIES} |
| 119 |
+ ${OPENGLES2_LIBRARIES} |
| 120 |
${JPEG_LIBRARIES} |
| 121 |
${BZIP2_LIBRARIES} |
| 122 |
${PNG_LIBRARIES} |
| 123 |
- ${X11_LIBRARIES} |
| 124 |
+ ${IRRLICHT_LIBRARY} |
| 125 |
${GETTEXT_LIBRARY} |
| 126 |
${SOUND_LIBRARIES} |
| 127 |
${SQLITE3_LIBRARY} |
| 128 |
${LUA_LIBRARY} |
| 129 |
${JSON_LIBRARY} |
| 130 |
- ${OPENGLES2_LIBRARIES} |
| 131 |
${PLATFORM_LIBS} |
| 132 |
${CLIENT_PLATFORM_LIBS} |
| 133 |
) |
Archives