diff --git a/games-action/minetest/minetest-5.3.0.recipe b/games-action/minetest/minetest-5.4.0.recipe similarity index 94% rename from games-action/minetest/minetest-5.3.0.recipe rename to games-action/minetest/minetest-5.4.0.recipe index b936ac79d..b310031bb 100644 --- a/games-action/minetest/minetest-5.3.0.recipe +++ b/games-action/minetest/minetest-5.4.0.recipe @@ -1,16 +1,16 @@ SUMMARY="An InfiniMiner/Minecraft inspired game" DESCRIPTION="Minetest, an open source infinite-world block sandbox game engine with support for survival and crafting." HOMEPAGE="https://www.minetest.net/" -COPYRIGHT="2020 The Minetest Team" +COPYRIGHT="2021 The Minetest Team" LICENSE="GNU LGPL v2.1 Apache v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/minetest/minetest/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="65dc2049f24c93fa544500f310a61e289c1b8fa47bf60877b746a2c27a7238d6" +CHECKSUM_SHA256="6e9b299e156651be9bcf973a9232cff32215de31dfae5ea770a71d1757cab014" SOURCE_FILENAME="minetest-$portVersion.tar.gz" SOURCE_DIR="minetest-$portVersion" SOURCE_URI_2="https://github.com/minetest/minetest_game/archive/$portVersion.tar.gz" -CHECKSUM_SHA256_2="06c6c1d4b97af211dd0fa518a3e68a205f594e9816a4b2477e48d4d21d278e2d" +CHECKSUM_SHA256_2="520d2056085ec11e8806cf5a8f928537797d27a86704770bf408c113ea9881cb" SOURCE_FILENAME_2="minetest_game-$portVersion.tar.gz" SOURCE_DIR_2="minetest_game-$portVersion" PATCHES="minetest-$portVersion.patchset" diff --git a/games-action/minetest/patches/minetest-5.3.0.patchset b/games-action/minetest/patches/minetest-5.4.0.patchset similarity index 84% rename from games-action/minetest/patches/minetest-5.3.0.patchset rename to games-action/minetest/patches/minetest-5.4.0.patchset index e0c026136..11fc14d97 100644 --- a/games-action/minetest/patches/minetest-5.3.0.patchset +++ b/games-action/minetest/patches/minetest-5.4.0.patchset @@ -1,14 +1,14 @@ -From a3230804c6cb2b91603638361cdf557b38712731 Mon Sep 17 00:00:00 2001 +From 0923ec70cbaed6b87069bbccef77c9d142f34481 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 31 Aug 2020 15:46:49 +1000 +Date: Sun, 28 Feb 2021 17:54:22 +1000 Subject: Add haiku support diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d33a2a..731ff4d 100644 +index f6a0d22..3b71804 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -188,7 +188,7 @@ install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs") +@@ -184,7 +184,7 @@ install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs") install(FILES "doc/world_format.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs") install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") @@ -38,10 +38,10 @@ index 6f361e8..15d6f87 100644 ) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3d6d1b0..9f2dfb4 100644 +index 7bcf8d6..2b2db7d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -335,7 +335,11 @@ else() +@@ -312,7 +312,11 @@ else() endif(BUILD_CLIENT) find_package(ZLIB REQUIRED) @@ -55,10 +55,10 @@ index 3d6d1b0..9f2dfb4 100644 set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS}) else() diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp -index abb6593..2dfb094 100644 +index cda9530..eaf7c1e 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp -@@ -459,6 +459,11 @@ void set_default_settings(Settings *settings) +@@ -456,6 +456,11 @@ void set_default_settings() settings->setDefault("fps_max", "0"); #endif @@ -71,11 +71,11 @@ index abb6593..2dfb094 100644 #ifdef __ANDROID__ settings->setDefault("screen_w", "0"); diff --git a/src/porting.cpp b/src/porting.cpp -index d902d37..cb75c20 100644 +index 4c87bdd..334d4d3 100644 --- a/src/porting.cpp +++ b/src/porting.cpp -@@ -56,6 +56,14 @@ with this program; if not, write to the Free Software Foundation, Inc., - #include +@@ -60,6 +60,14 @@ with this program; if not, write to the Free Software Foundation, Inc., + #include #endif +#if defined(__HAIKU__) @@ -89,7 +89,7 @@ index d902d37..cb75c20 100644 #include "config.h" #include "debug.h" #include "filesys.h" -@@ -244,7 +252,16 @@ bool getCurrentWorkingDir(char *buf, size_t len) +@@ -248,7 +256,16 @@ bool getCurrentWorkingDir(char *buf, size_t len) bool getExecPathFromProcfs(char *buf, size_t buflen) { @@ -107,7 +107,7 @@ index d902d37..cb75c20 100644 buflen--; ssize_t len; -@@ -496,6 +513,19 @@ bool setSystemPaths() +@@ -506,6 +523,19 @@ bool setSystemPaths() return true; } @@ -128,5 +128,5 @@ index d902d37..cb75c20 100644 #else -- -2.28.0 +2.30.0