hasufell 14/07/07 13:35:56
Added: minetest-0.4.10-system-lua.patch
minetest-0.4.10-shared-irrlicht.patch
minetest-0.4.10-as-needed.patch
Log:
version bump
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
BDEED020)
Revision Changes Path
1.1
games-action/minetest/files/minetest-0.4.10-system-lua.patch
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
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
Index: minetest-0.4.10-system-lua.patch
===================================================================
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -215,8 +215,6 @@
message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
else (NOT ${DISABLE_LUAJIT} MATCHES "1")
message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)")
- set(LUA_LIBRARY "")
- set(LUA_INCLUDE_DIR "")
endif (NOT DISABLE_LUAJIT)
set(USE_LUAJIT 0)
@@ -267,11 +265,22 @@
endif (VALID_LUAJIT_VERSION)
endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
+OPTION(WITH_BUNDLED_LUA "Use bundled lua")
+
if(NOT USE_LUAJIT)
message (STATUS "LuaJIT not found, using bundled Lua.")
- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
- set(LUA_LIBRARY "lua")
- add_subdirectory(lua)
+ if (WITH_BUNDLED_LUA)
+ set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
+ set(LUA_LIBRARY "lua")
+ add_subdirectory(lua)
+ else (WITH_BUNDLED_LUA)
+ find_package(Lua51)
+ if(LUA51_FOUND)
+ message (STATUS "Lua51 found")
+ else(LUA51_FOUND)
+ message (FATAL_ERROR "Lua51 not found!")
+ endif(LUA51_FOUND)
+ endif(WITH_BUNDLED_LUA)
endif(NOT USE_LUAJIT)
mark_as_advanced(LUA_LIBRARY)
1.1
games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch
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
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
Index: minetest-0.4.10-shared-irrlicht.patch
===================================================================
commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
Author: hasufell <[email protected]>
Date: Sat Jun 8 13:40:30 2013 +0200
CMAKE: use shared lib from Irrlicht
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index bd00422..4632993 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -50,10 +50,11 @@ else()
/usr/include/irrlicht
)
- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
PATHS
/usr/local/lib
/usr/lib
+ /usr/lib64
)
endif()
1.1 games-action/minetest/files/minetest-0.4.10-as-needed.patch
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
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
Index: minetest-0.4.10-as-needed.patch
===================================================================
commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
Author: hasufell <[email protected]>
Date: Mon Nov 25 00:28:55 2013 +0100
CMAKE: fix linking order
this also fixes linking with as-needed wrt
https://github.com/minetest/minetest/issues/617
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1fee7a..a72bd4a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -427,18 +427,18 @@ if(BUILD_CLIENT)
set(minetest_LIBS
${PROJECT_NAME}
${ZLIB_LIBRARIES}
- ${IRRLICHT_LIBRARY}
+ ${X11_LIBRARIES}
${OPENGL_LIBRARIES}
+ ${OPENGLES2_LIBRARIES}
${JPEG_LIBRARIES}
${BZIP2_LIBRARIES}
${PNG_LIBRARIES}
- ${X11_LIBRARIES}
+ ${IRRLICHT_LIBRARY}
${GETTEXT_LIBRARY}
${SOUND_LIBRARIES}
${SQLITE3_LIBRARY}
${LUA_LIBRARY}
${JSON_LIBRARY}
- ${OPENGLES2_LIBRARIES}
${PLATFORM_LIBS}
${CLIENT_PLATFORM_LIBS}
)
