Attachment 191433 Details for Bug 226541 – minetest-fixes.patch

[patch] minetest-fixes.patch

minetest-fixes.patch (text/plain), 2.40 KB, created by Val Packett on 2018-03-11 21:59:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2018-03-11 21:59:45 UTC

Size: 2.40 KB

patch

obsolete

>diff --git c/games/minetest/Makefile i/games/minetest/Makefile
>index 9de38a0c7dda..6eecbee25b0e 100644
>--- c/games/minetest/Makefile
>+++ i/games/minetest/Makefile
>@@ -43,8 +43,8 @@ CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
> CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
> CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
> 			libIrrlicht.so:x11-toolkits/irrlicht
>-CLIENT_USES=		jpeg
>-CLIENT_USE=		GL=gl XORG=x11,xext
>+CLIENT_USES=		jpeg ncurses
>+CLIENT_USE=		GL=gl,glu XORG=x11,xext,sm,ice
> SERVER_CMAKE_BOOL=	BUILD_SERVER
> CURL_CMAKE_BOOL=	ENABLE_CURL
> CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
>diff --git c/games/minetest/files/patch-cmake_Modules_FindLuaJIT.cmake i/games/minetest/files/patch-cmake_Modules_FindLuaJIT.cmake
>new file mode 100644
>index 000000000000..8f3ffa764753
>--- /dev/null
>+++ i/games/minetest/files/patch-cmake_Modules_FindLuaJIT.cmake
>@@ -0,0 +1,11 @@
>+--- cmake/Modules/FindLuaJIT.cmake.orig	2018-03-11 18:37:44 UTC
>++++ cmake/Modules/FindLuaJIT.cmake
>+@@ -9,7 +9,7 @@
>+ FIND_PATH(LUA_INCLUDE_DIR luajit.h
>+ 	HINTS
>+ 	$ENV{LUA_DIR}
>+-	PATH_SUFFIXES include/luajit-2.0 include/luajit-5_1-2.0 include
>++	PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.0 include
>+ 	PATHS
>+ 	~/Library/Frameworks
>+ 	/Library/Frameworks
>diff --git c/games/minetest/files/patch-src_content__mapblock.cpp i/games/minetest/files/patch-src_content__mapblock.cpp
>new file mode 100644
>index 000000000000..2b29d9a87b49
>--- /dev/null
>+++ i/games/minetest/files/patch-src_content__mapblock.cpp
>@@ -0,0 +1,11 @@
>+--- src/content_mapblock.cpp.orig	2018-03-11 21:42:16 UTC
>++++ src/content_mapblock.cpp
>+@@ -43,7 +43,7 @@ with this program; if not, write to the Free Software 
>+ // Corresponding offsets are listed in g_27dirs
>+ #define FRAMED_NEIGHBOR_COUNT 18
>+ 
>+-static constexpr v3s16 light_dirs[8] = {
>++static const v3s16 light_dirs[8] = {
>+ 	v3s16(-1, -1, -1),
>+ 	v3s16(-1, -1,  1),
>+ 	v3s16(-1,  1, -1),
>diff --git c/games/minetest/files/patch-src_util_cpp11.h i/games/minetest/files/patch-src_util_cpp11.h
>new file mode 100644
>index 000000000000..199eb03916d8
>--- /dev/null
>+++ i/games/minetest/files/patch-src_util_cpp11.h
>@@ -0,0 +1,11 @@
>+--- src/util/cpp11.h.orig	2018-03-11 21:36:29 UTC
>++++ src/util/cpp11.h
>+@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software 
>+ #ifndef MT_CPP11_HEADER
>+ #define MT_CPP11_HEADER
>+ 
>+-#if __cplusplus < 201103L || _MSC_VER < 1600
>++#if __cplusplus < 201103L
>+ #define USE_CPP11_FAKE_KEYWORD
>+ #endif
>+

Actions: View | Diff

Attachments on bug 226541: 191433