[minetest-v04x] 01/02: Fix FTBFS on mipsel, arm64, ppc64el

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository minetest-v04x.

commit e8e12b8cfb42972582d0c2d8003976cbeaee5a7f
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Mar 17 09:27:14 2015 +0100

    Fix FTBFS on mipsel, arm64, ppc64el
    
    Do not add embedded lua subdirectory to build because it was removed.
---
 debian/patches/FindIrrlicht.cmake.patch |  2 +-
 debian/patches/rawlua.patch             | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/patches/FindIrrlicht.cmake.patch b/debian/patches/FindIrrlicht.cmake.patch
index 986369b..42ec116 100644
--- a/debian/patches/FindIrrlicht.cmake.patch
+++ b/debian/patches/FindIrrlicht.cmake.patch
@@ -8,7 +8,7 @@ Forwarded: https://github.com/minetest/minetest/pull/2371
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
-index dce78fb..bc781a2 100644
+index dce78fb..a84765d 100644
 --- a/cmake/Modules/FindIrrlicht.cmake
 +++ b/cmake/Modules/FindIrrlicht.cmake
 @@ -44,7 +44,7 @@ else()
diff --git a/debian/patches/rawlua.patch b/debian/patches/rawlua.patch
index ac495f1..ef57a65 100644
--- a/debian/patches/rawlua.patch
+++ b/debian/patches/rawlua.patch
@@ -3,23 +3,24 @@ Date: Fri, 20 Feb 2015 22:46:25 +0100
 Subject: rawlua
 
 ---
- src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ src/CMakeLists.txt | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 93083f3..5536eb9 100644
+index 93083f3..9bcab4e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -284,9 +284,9 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
+@@ -284,10 +284,9 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
  endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
  
  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")
-+    message (STATUS "LuaJIT not found, using the version of Lua provided by the system.")
+-	add_subdirectory(lua)
++	message (STATUS "LuaJIT not found, using the version of Lua provided by the system.")
 +	set(LUA_INCLUDE_DIR "/usr/include/lua5.1/")
 +	set(LUA_LIBRARY "lua5.1")
- 	add_subdirectory(lua)
  endif(NOT USE_LUAJIT)
  
+ mark_as_advanced(LUA_LIBRARY)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-v04x.git