package/minetest{-game}: bump to version 5.5.1
Release announcement: 5.5.0: https://forum.minetest.net/viewtopic.php?f=18&t=27754 5.1.1: https://forum.minetest.net/viewtopic.php?p=410344#p410344 Back in 2021, the minetest project forked the irrlicht library due to lack of upstream release [1]. But the irrlicht upstream project is not really halted since a stable 1.8.5 version has been released [2] and there is still svn activity. But the Mintest fork (called irrlichtMt) is attractive since: - It use a CMake build system instead of hand written makefiles [3] - Bundled libraries has been removed [4] [5] - It allows to remove the NEON support workaround for bundled libpng - It use git as VCS - Improve the licensing information This irrlichtmt is required since mintest 5.5.0 version but contains several changes specific to Minetest, so add irrlichtmt as additional sources using EXTRA_DOWNLOADS. minetest: - Add zstd dependency for MapBlock compression [6] - Freetype is now a build requirement for mintest client [7] - gcc >= 5.x is now required [8] - remove upstream patch [9] minetest-game: - Add new license files: mods/keys/license.txt mods/mtg_craftguide/license.txt mods/weather/license.txt [1] https://forum.minetest.net/viewtopic.php?p=393565 [2] https://irrlicht.sourceforge.io/forum/viewtopic.php?f=2&t=52775 [3]6ce98dce77[4]67f1402410[5]264f8b72c1[6]d1624a5521[7]76dbd0d2d0[8]a90b2a4d4f[9]7c2826cbc0Signed-off-by: Romain Naour <romain.naour@gmail.com> [Arnout: simplify symlink command] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Romain Naour
Arnout Vandecappelle (Essensium/Mind)
parent
0ddfece7f7
commit
f26f32882e
@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 b4bfa0755b88230cf4bdb6af6a0951dd1248f6cdf87fecc340e43ac12c80b0b2 minetest-game-5.4.1.tar.gz
|
||||
sha256 5a24fec4ed838744906f020096c35616e7ba76eeec2b93b980a40af011107e7c minetest-game-5.5.1.tar.gz
|
||||
|
||||
sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt
|
||||
sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt
|
||||
@ -21,7 +21,9 @@ sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/f
|
||||
sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt
|
||||
sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt
|
||||
sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt
|
||||
sha256 aca908299369e2187ae9107e5e870721ea0dcb699a470fec1fd7fabce4bcbcdf mods/keys/license.txt
|
||||
sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt
|
||||
sha256 babdfff9fe0cc4a3d4346b5388129d4ba79e50b517c82ca37cfdfd78086b83aa mods/mtg_craftguide/license.txt
|
||||
sha256 88385cd60d15c4fb4856c3c4c551c76c30958268c5c1160c1aa4e520c037a623 mods/player_api/license.txt
|
||||
sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt
|
||||
sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt
|
||||
@ -31,5 +33,6 @@ sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/s
|
||||
sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt
|
||||
sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt
|
||||
sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt
|
||||
sha256 84f4ed8b688ab385eb9d5b482eb35c26cd7a45e065ed93ff6ad477d29ff3c708 mods/weather/license.txt
|
||||
sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt
|
||||
sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MINETEST_GAME_VERSION = 5.4.1
|
||||
MINETEST_GAME_VERSION = 5.5.1
|
||||
MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION))
|
||||
MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \
|
||||
CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods)
|
||||
@ -28,7 +28,9 @@ MINETEST_GAME_LICENSE_FILES = LICENSE.txt \
|
||||
mods/flowers/license.txt \
|
||||
mods/game_commands/license.txt \
|
||||
mods/give_initial_stuff/license.txt \
|
||||
mods/keys/license.txt \
|
||||
mods/map/license.txt \
|
||||
mods/mtg_craftguide/license.txt \
|
||||
mods/player_api/license.txt \
|
||||
mods/screwdriver/license.txt \
|
||||
mods/sethome/license.txt \
|
||||
@ -38,6 +40,7 @@ MINETEST_GAME_LICENSE_FILES = LICENSE.txt \
|
||||
mods/tnt/license.txt \
|
||||
mods/vessels/license.txt \
|
||||
mods/walls/license.txt \
|
||||
mods/weather/license.txt \
|
||||
mods/wool/license.txt \
|
||||
mods/xpanes/license.txt
|
||||
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From a327c06f5dee9f432666b503203fd15e4ccafc1b Mon Sep 17 00:00:00 2001
|
||||
From: lhofhansl <larsh@apache.org>
|
||||
Date: Thu, 6 May 2021 10:24:30 -0700
|
||||
Subject: [PATCH] Fix build for newer versions of GCC (#11246)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
(cherry picked from commit 7c2826cbc0f36027d4a9781f433150d1c5d0d03f)
|
||||
|
||||
Fixes:
|
||||
|
||||
minetest-5.4.1/src/clientiface.h:444:36: error: ‘shared_ptr’ in namespace ‘std’ does not name a template type
|
||||
444 | ClientInterface(const std::shared_ptr<con::Connection> &con);
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
src/clientiface.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/clientiface.h b/src/clientiface.h
|
||||
index cc5292b71..dfd976741 100644
|
||||
--- a/src/clientiface.h
|
||||
+++ b/src/clientiface.h
|
||||
@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
#include <list>
|
||||
#include <vector>
|
||||
#include <set>
|
||||
+#include <memory>
|
||||
#include <mutex>
|
||||
|
||||
class MapBlock;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
config BR2_PACKAGE_MINETEST
|
||||
bool "minetest"
|
||||
depends on BR2_INSTALL_LIBSTDCPP # irrlicht
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
|
||||
depends on BR2_INSTALL_LIBSTDCPP # irrlichtMt (bundled)
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_XORG7 # irrlicht
|
||||
depends on BR2_PACKAGE_HAS_LIBGL # irrlicht
|
||||
depends on BR2_PACKAGE_XORG7 # irrlichtMt (bundled)
|
||||
depends on BR2_PACKAGE_HAS_LIBGL # irrlichtMt (bundled)
|
||||
depends on BR2_PACKAGE_LUAJIT
|
||||
select BR2_PACKAGE_IRRLICHT
|
||||
select BR2_PACKAGE_GMP
|
||||
select BR2_PACKAGE_JSONCPP
|
||||
select BR2_PACKAGE_SQLITE
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_ZSTD
|
||||
# At least one option must be enabled
|
||||
select BR2_PACKAGE_MINETEST_CLIENT if !BR2_PACKAGE_MINETEST_SERVER
|
||||
help
|
||||
@ -25,6 +25,7 @@ if BR2_PACKAGE_MINETEST
|
||||
config BR2_PACKAGE_MINETEST_CLIENT
|
||||
bool "minetest client"
|
||||
select BR2_PACKAGE_BZIP2
|
||||
select BR2_PACKAGE_FREETYPE
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_XLIB_LIBXXF86VM
|
||||
@ -51,14 +52,14 @@ comment "sound support needs a toolchain w/ threads NPTL"
|
||||
|
||||
endif
|
||||
|
||||
comment "minetest needs a toolchain w/ C++, gcc >= 4.9, threads"
|
||||
comment "minetest needs a toolchain w/ C++, gcc >= 5.1, threads"
|
||||
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP \
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \
|
||||
|| !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
comment "minetest needs X11 and an OpenGL provider"
|
||||
depends on (BR2_INSTALL_LIBSTDCPP \
|
||||
&& BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
|
||||
&& BR2_TOOLCHAIN_GCC_AT_LEAST_5 \
|
||||
&& BR2_TOOLCHAIN_HAS_THREADS)
|
||||
depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
# Locally calculated
|
||||
sha256 de9e4410583c845c104b4be25f9d0b8743d8573c120149b8910ae2519f9ab14e minetest-5.4.1.tar.gz
|
||||
sha256 dc0ae5188ef351db85c38b27f38f8549b133ed82aa46daea6deee148aa3454f4 minetest-5.5.1.tar.gz
|
||||
sha256 6d38dd7f3e3c8d768e1f5776b98dd5359b184c2e6740ddf733f4dc8615191bef irrlicht-1.9.0mt5.tar.gz
|
||||
|
||||
sha256 5bc4bb4ff369d5039bcfff5a83a378335240ca86c58299e7de25097153c70132 LICENSE.txt
|
||||
sha256 d1d8a63f7f70d89a3a899f3b9fb5ca1ea7dbbd4eb449be2a7b2ff861b1f09192 LICENSE.txt
|
||||
sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 lib/irrlichtmt/doc/irrlicht-license.txt
|
||||
|
||||
@ -4,12 +4,25 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MINETEST_VERSION = 5.4.1
|
||||
MINETEST_VERSION = 5.5.1
|
||||
MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION))
|
||||
MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds)
|
||||
MINETEST_LICENSE_FILES = LICENSE.txt
|
||||
MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds), Zlib (irrlicht)
|
||||
MINETEST_LICENSE_FILES = LICENSE.txt lib/irrlichtmt/doc/irrlicht-license.txt
|
||||
|
||||
MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib
|
||||
MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd
|
||||
|
||||
MINETEST_IRRLICHTMT_VERSION = 1.9.0mt5
|
||||
MINETEST_EXTRA_DOWNLOADS = $(call github,minetest,irrlicht,$(MINETEST_IRRLICHTMT_VERSION))/irrlicht-$(MINETEST_IRRLICHTMT_VERSION).tar.gz
|
||||
|
||||
define MINETEST_IRRLICHTMT_EXTRACT
|
||||
mkdir -p $(@D)/lib
|
||||
$(foreach f, $(notdir $(MINETEST_EXTRA_DOWNLOADS)), \
|
||||
$(call suitable-extractor,$(f)) $(MINETEST_DL_DIR)/$(f) | \
|
||||
$(TAR) -C $(@D)/lib $(TAR_OPTIONS) -
|
||||
)
|
||||
ln -sf irrlicht-$(MINETEST_IRRLICHTMT_VERSION) $(@D)/lib/irrlichtmt
|
||||
endef
|
||||
MINETEST_POST_EXTRACT_HOOKS += MINETEST_IRRLICHTMT_EXTRACT
|
||||
|
||||
MINETEST_CONF_OPTS = \
|
||||
-DDEFAULT_RUN_IN_PLACE=OFF \
|
||||
@ -22,7 +35,7 @@ MINETEST_CONF_OPTS = \
|
||||
-DBUILD_UNITTESTS=OFF
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y)
|
||||
MINETEST_DEPENDENCIES += bzip2 jpeg libgl libpng xlib_libXxf86vm
|
||||
MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXxf86vm
|
||||
MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON
|
||||
else
|
||||
MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF
|
||||
@ -41,13 +54,6 @@ else
|
||||
MINETEST_CONF_OPTS += -DENABLE_SOUND=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
MINETEST_DEPENDENCIES += freetype
|
||||
MINETEST_CONF_OPTS += -DENABLE_FREETYPE=ON
|
||||
else
|
||||
MINETEST_CONF_OPTS += -DENABLE_FREETYPE=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HIREDIS),y)
|
||||
MINETEST_DEPENDENCIES += hiredis
|
||||
MINETEST_CONF_OPTS += -DENABLE_REDIS=ON
|
||||
|
||||
Loading…
Reference in New Issue
Block a user