minetest: bump version.

This commit is contained in:
Jerome Duval
2019-11-24 20:21:27 +01:00
parent cc0f985b26
commit 4006823b36
2 changed files with 13 additions and 13 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="aa771cf178ad1b436d5723e5d6dd24e42b5d56f1cfe9c930f6426b7f24bb1635"
CHECKSUM_SHA256="ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906"
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="965d2cf3ac8c822bc9e60fb8f508182fb2f24dde46f46b000caf225ebe2ec519"
CHECKSUM_SHA256_2="f165fac0081bf4797cf9094282cc25034b2347b3ea94e6bb8d9329c5ee63f41b"
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
devel:libjpeg$secondaryArchSuffix >= 9
devel:libjsoncpp$secondaryArchSuffix
devel:libluajit_5.1$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix

View File

@@ -1,11 +1,11 @@
From 8f372e66ab5254248a303f59aa31ecc5de8747e8 Mon Sep 17 00:00:00 2001
From 9eef88584c36bf3f24f983fb4526396d23c5a7c9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 5 Mar 2019 20:24:16 +1000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1210866..5b0e40c 100644
index 36528d0..4128a95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,7 +187,7 @@ install(FILES "doc/texture_packs.txt" DESTINATION "${DOCDIR}" COMPONENT "Docs")
@@ -18,7 +18,7 @@ index 1210866..5b0e40c 100644
install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
install(FILES "misc/net.minetest.minetest.appdata.xml" DESTINATION "${APPDATADIR}")
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index 37349b8..1d48114 100644
index 6f361e8..15d6f87 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -42,6 +42,7 @@ else()
@@ -27,9 +27,9 @@ index 37349b8..1d48114 100644
/usr/include/irrlicht
+ /system/develop/headers/x86/irrlicht #Haiku hybrid
/system/develop/headers/irrlicht #Haiku
PATH_SUFFIXES "include/irrlicht"
)
@@ -49,6 +50,7 @@ else()
@@ -50,6 +51,7 @@ else()
PATHS
/usr/local/lib
/usr/lib
@@ -38,10 +38,10 @@ index 37349b8..1d48114 100644
)
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7647067..c2d254f 100644
index 70a5ab3..bfea208 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -318,7 +318,11 @@ else()
@@ -301,7 +301,11 @@ else()
endif(APPLE)
endif(BUILD_CLIENT)
find_package(ZLIB REQUIRED)
@@ -55,10 +55,10 @@ index 7647067..c2d254f 100644
set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
else()
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 1df6dcc..9cc7aab 100644
index 01ee97a..f8c3ee0 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -425,6 +425,11 @@ void set_default_settings(Settings *settings)
@@ -439,6 +439,11 @@ void set_default_settings(Settings *settings)
settings->setDefault("fps_max", "0");
#endif
@@ -128,5 +128,5 @@ index 76fd592..908780a 100644
#else
--
2.19.1
2.24.0