diff mbox series

[1/5] package/minetest: bump to version 5.9.1

Message ID 20250422141943.51161-1-mickael.tansorier@smile.fr
State New
Headers show
Series [1/5] package/minetest: bump to version 5.9.1 | expand

Commit Message

Mickaël Tansorier April 22, 2025, 2:19 p.m. UTC 
Update minetest version

See:
https://docs.luanti.org/about/changelog/#590--591

IrrlichtMt has been moved into the main Minetest repository during Minetest 5.9 development. [1]

[1] https://github.com/minetest/irrlicht/blob/master/README.md

Signed-off-by: Mickaël Tansorier <mickael.tansorier@smile.fr>
---
 package/minetest/Config.in     |  3 ---
 package/minetest/minetest.hash |  5 ++---
 package/minetest/minetest.mk   | 19 +++----------------
 3 files changed, 5 insertions(+), 22 deletions(-)
diff mbox series

Patch

diff --git a/package/minetest/Config.in b/package/minetest/Config.in
index 4e139ac3e2..c14768016b 100644
--- a/package/minetest/Config.in
+++ b/package/minetest/Config.in
@@ -1,10 +1,7 @@ 
 config BR2_PACKAGE_MINETEST
 	bool "minetest"
-	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 # irrlichtMt (bundled)
-	depends on BR2_PACKAGE_HAS_LIBGL # irrlichtMt (bundled)
 	depends on BR2_PACKAGE_LUAJIT
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_JSONCPP
diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash
index ec67d4136d..0477dc5d2a 100644
--- a/package/minetest/minetest.hash
+++ b/package/minetest/minetest.hash
@@ -1,6 +1,5 @@ 
 # Locally calculated
-sha256  1440603e19dca70e2691e86a74c822ee2c4a36fceee32b2d85ae74772149e9a3  minetest-5.6.1.tar.gz
-sha256  27594242da8c7cc1e5ef45922e1dfdd130c37d77719b5d927359eb47992051e0  irrlicht-1.9.0mt8.tar.gz
+sha256  f8173436782b5a2544aa19c54f572a81831b6cfc89480737ccf6768992c651ea  minetest-5.9.1.tar.gz
 
 sha256  b38c8d428ceddf8e9b49dca63610c74499d952895d756b7eab5f5d4cef2954f6  LICENSE.txt
-sha256  ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409  lib/irrlichtmt/doc/irrlicht-license.txt
+sha256  2c9434886d3144ead606b959cf61dc41935d1754c074f473541da4a3dd404efa  irr/LICENSE
diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
index 3904bd687c..b07ea57ea7 100644
--- a/package/minetest/minetest.mk
+++ b/package/minetest/minetest.mk
@@ -4,27 +4,14 @@ 
 #
 ################################################################################
 
-MINETEST_VERSION = 5.6.1
+MINETEST_VERSION = 5.9.1
 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION))
-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_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds)
+MINETEST_LICENSE_FILES = LICENSE.txt
 MINETEST_CPE_ID_VENDOR = minetest
 
 MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd
 
-MINETEST_IRRLICHTMT_VERSION = 1.9.0mt8
-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 \
 	-DENABLE_GLES=OFF \