Minetest: bump version

This commit is contained in:
Gerasim Troeglazov
2020-08-31 16:01:12 +10:00
parent 6f2de09ff7
commit e3bd3401c5
2 changed files with 16 additions and 16 deletions

View File

@@ -6,11 +6,11 @@ LICENSE="GNU LGPL v2.1
Apache v2"
REVISION="1"
SOURCE_URI="https://github.com/minetest/minetest/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d"
CHECKSUM_SHA256="65dc2049f24c93fa544500f310a61e289c1b8fa47bf60877b746a2c27a7238d6"
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="0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94"
CHECKSUM_SHA256_2="06c6c1d4b97af211dd0fa518a3e68a205f594e9816a4b2477e48d4d21d278e2d"
SOURCE_FILENAME_2="minetest_game-$portVersion.tar.gz"
SOURCE_DIR_2="minetest_game-$portVersion"
PATCHES="minetest-$portVersion.patchset"

View File

@@ -1,14 +1,14 @@
From df7d81ba866de26c6fb5f8f26b501b1ce6ba47c3 Mon Sep 17 00:00:00 2001
From a3230804c6cb2b91603638361cdf557b38712731 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 Apr 2020 12:15:25 +1000
Date: Mon, 31 Aug 2020 15:46:49 +1000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7613e68..edbb30a 100644
index 8d33a2a..731ff4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,7 +187,7 @@ install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs")
@@ -188,7 +188,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 6afa5b8..39bf8fe 100644
index 3d6d1b0..9f2dfb4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -315,7 +315,11 @@ else()
@@ -335,7 +335,11 @@ else()
endif(BUILD_CLIENT)
find_package(ZLIB REQUIRED)
@@ -55,10 +55,10 @@ index 6afa5b8..39bf8fe 100644
set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
else()
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 472522b..5ec64eb 100644
index abb6593..2dfb094 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -450,6 +450,11 @@ void set_default_settings(Settings *settings)
@@ -459,6 +459,11 @@ void set_default_settings(Settings *settings)
settings->setDefault("fps_max", "0");
#endif
@@ -71,11 +71,11 @@ index 472522b..5ec64eb 100644
#ifdef __ANDROID__
settings->setDefault("screen_w", "0");
diff --git a/src/porting.cpp b/src/porting.cpp
index 76fd592..908780a 100644
index d902d37..cb75c20 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -43,6 +43,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <sys/pstat.h>
@@ -56,6 +56,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <crt_externs.h>
#endif
+#if defined(__HAIKU__)
@@ -89,7 +89,7 @@ index 76fd592..908780a 100644
#include "config.h"
#include "debug.h"
#include "filesys.h"
@@ -232,7 +240,16 @@ bool getCurrentWorkingDir(char *buf, size_t len)
@@ -244,7 +252,16 @@ bool getCurrentWorkingDir(char *buf, size_t len)
bool getExecPathFromProcfs(char *buf, size_t buflen)
{
@@ -107,7 +107,7 @@ index 76fd592..908780a 100644
buflen--;
ssize_t len;
@@ -484,6 +501,19 @@ bool setSystemPaths()
@@ -496,6 +513,19 @@ bool setSystemPaths()
return true;
}
@@ -128,5 +128,5 @@ index 76fd592..908780a 100644
#else
--
2.26.0
2.28.0