Minetest: bump version

This commit is contained in:
Gerasim Troeglazov
2020-04-19 14:09:19 +10:00
parent f281dc7e60
commit d0f9037879
2 changed files with 14 additions and 14 deletions

View File

@@ -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="2019 The Minetest Team"
COPYRIGHT="2020 The Minetest Team"
LICENSE="GNU LGPL v2.1
Apache v2"
REVISION="4"
REVISION="1"
SOURCE_URI="https://github.com/minetest/minetest/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906"
CHECKSUM_SHA256="4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d"
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="f165fac0081bf4797cf9094282cc25034b2347b3ea94e6bb8d9329c5ee63f41b"
CHECKSUM_SHA256_2="0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94"
SOURCE_FILENAME_2="minetest_game-$portVersion.tar.gz"
SOURCE_DIR_2="minetest_game-$portVersion"
PATCHES="minetest-$portVersion.patchset"
@@ -55,7 +55,7 @@ BUILD_REQUIRES="
devel:libiconv$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libIrrlicht$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix >= 9
devel:libjpeg$secondaryArchSuffix
devel:libjsoncpp$secondaryArchSuffix
devel:libluajit_5.1$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix

View File

@@ -1,11 +1,11 @@
From 9eef88584c36bf3f24f983fb4526396d23c5a7c9 Mon Sep 17 00:00:00 2001
From df7d81ba866de26c6fb5f8f26b501b1ce6ba47c3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 5 Mar 2019 20:24:16 +1000
Date: Sun, 19 Apr 2020 12:15:25 +1000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36528d0..4128a95 100644
index 7613e68..edbb30a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,7 +187,7 @@ install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs")
@@ -38,12 +38,12 @@ index 6f361e8..15d6f87 100644
)
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70a5ab3..bfea208 100644
index 6afa5b8..39bf8fe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -301,7 +301,11 @@ else()
endif(APPLE)
@@ -315,7 +315,11 @@ else()
endif(BUILD_CLIENT)
find_package(ZLIB REQUIRED)
- set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
+ if(HAIKU)
@@ -55,10 +55,10 @@ index 70a5ab3..bfea208 100644
set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
else()
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 01ee97a..f8c3ee0 100644
index 472522b..5ec64eb 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -439,6 +439,11 @@ void set_default_settings(Settings *settings)
@@ -450,6 +450,11 @@ void set_default_settings(Settings *settings)
settings->setDefault("fps_max", "0");
#endif
@@ -128,5 +128,5 @@ index 76fd592..908780a 100644
#else
--
2.24.0
2.26.0