diff options
| author |   Martin-Kevin Neumann <maddin081591@gmail.com> | 2016-05-17 16:40:36 +0200 |
|---|---|---|
| committer |   Ian Delaney <idella4@gentoo.org> | 2016-05-18 20:11:11 +0800 |
| commit | de8027e60d545e101694b41bbabd68f08c7c4661 (patch) | |
| tree | 28543bb6ad451041ffea94e1fecd8dba960ff28c /games-action/minetest/files | |
| parent | games-action/minetest_game: Bump to version 0.4.14 (diff) | |
| download | gentoo-de8027e60d545e101694b41bbabd68f08c7c4661.tar.gz gentoo-de8027e60d545e101694b41bbabd68f08c7c4661.tar.bz2 gentoo-de8027e60d545e101694b41bbabd68f08c7c4661.zip | |
games-action/minetest: Removal of version 0.4.10
Removes 0.4.10-r1, 0.4.10-r2 and the corresponding patches.
Closes: https://github.com/gentoo/gentoo/pull/1471
Signed-off-by: Ian Delaney <idella4@gentoo.org>
Diffstat (limited to 'games-action/minetest/files')
3 files changed, 0 insertions, 95 deletions
diff --git a/games-action/minetest/files/minetest-0.4.10-as-needed.patch b/games-action/minetest/files/minetest-0.4.10-as-needed.patch deleted file mode 100644 index 83d1ca7b0b9e..000000000000 --- a/games-action/minetest/files/minetest-0.4.10-as-needed.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd -Author: hasufell <hasufell@gentoo.org> -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} - ) diff --git a/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch b/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch deleted file mode 100644 index b552c0937039..000000000000 --- a/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84 -Author: hasufell <julian.ospald@googlemail.com> -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() - diff --git a/games-action/minetest/files/minetest-0.4.10-system-lua.patch b/games-action/minetest/files/minetest-0.4.10-system-lua.patch deleted file mode 100644 index c31c8514ea29..000000000000 --- a/games-action/minetest/files/minetest-0.4.10-system-lua.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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) |