[Buildroot] [PATCH] package/{minetest, luanti}: Rename package minetest to luanti
Edgar Bonet
bonet at grenoble.cnrs.fr
Thu Apr 10 19:09:37 UTC 2025
Hello!
Mickaël Tansorier wrote:
> Minetest has been renamed to Luanti since version 5.10.0:
> https://github.com/luanti-org/luanti/releases/tag/5.10.0
>
> Bump luanti directly to the latest version available, 5.11.
>
> Add the `EXECUTABLE_OUTPUT_PATH` option to `luanti.mk` due to a missing definition needed to create the legacy alias of `minetestserver`. This issue appeared after commit `4b90e582b42c4881860100b10a9572d8d33a39da`.
>
> Signed-off-by: Mickaël Tansorier <mickael.tansorier at smile.fr>
> ---
> package/Config.in | 2 +-
> package/{minetest => luanti}/Config.in | 28 ++++----
> package/luanti/luanti.hash | 5 ++
> package/luanti/luanti.mk | 92 ++++++++++++++++++++++++++
> package/mineclonia/Config.in | 2 +-
> package/mineclonia/mineclonia.mk | 4 +-
> package/minetest-game/Config.in | 4 +-
> package/minetest-game/minetest-game.mk | 6 +-
> package/minetest/minetest.hash | 4 --
> package/minetest/minetest.mk | 87 ------------------------
> 10 files changed, 120 insertions(+), 114 deletions(-)
> rename package/{minetest => luanti}/Config.in (71%)
> create mode 100644 package/luanti/luanti.hash
> create mode 100644 package/luanti/luanti.mk
> delete mode 100644 package/minetest/minetest.hash
> delete mode 100644 package/minetest/minetest.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 1eb5e1e020..19ee2119ce 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -296,8 +296,8 @@ menu "Games"
> source "package/gnuchess/Config.in"
> source "package/lbreakout2/Config.in"
> source "package/ltris/Config.in"
> + source "package/luanti/Config.in"
> source "package/lugaru/Config.in"
> - source "package/minetest/Config.in"
> source "package/minetest-game/Config.in"
> source "package/opentyrian/Config.in"
> source "package/opentyrian-data/Config.in"
> diff --git a/package/minetest/Config.in b/package/luanti/Config.in
> similarity index 71%
> rename from package/minetest/Config.in
> rename to package/luanti/Config.in
> index c14768016b..6ec8b7b968 100644
> --- a/package/minetest/Config.in
> +++ b/package/luanti/Config.in
> @@ -1,5 +1,5 @@
> -config BR2_PACKAGE_MINETEST
> - bool "minetest"
> +config BR2_PACKAGE_LUANTI
> + bool "luanti"
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11
> depends on BR2_TOOLCHAIN_HAS_THREADS
> depends on BR2_PACKAGE_LUAJIT
> @@ -9,18 +9,18 @@ config BR2_PACKAGE_MINETEST
> 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
> + select BR2_PACKAGE_LUANTI_CLIENT if !BR2_PACKAGE_LUANTI_SERVER
> help
> Minetest is a near-infinite-world block sandbox game and a
This should probably be “Luanti (formerly Minetest) is a …”.
> game engine, inspired by InfiniMiner, Minecraft, and the
> like.
>
> - http://www.minetest.net
> + https://www.luanti.org/
>
> -if BR2_PACKAGE_MINETEST
> +if BR2_PACKAGE_LUANTI
>
> -config BR2_PACKAGE_MINETEST_CLIENT
> - bool "minetest client"
> +config BR2_PACKAGE_LUANTI_CLIENT
> + bool "luanti client"
> select BR2_PACKAGE_BZIP2
> select BR2_PACKAGE_FREETYPE
> select BR2_PACKAGE_LIBPNG
> @@ -29,33 +29,33 @@ config BR2_PACKAGE_MINETEST_CLIENT
> help
> Build Minetest client.
An this “Build Luanti client.”
>
> -config BR2_PACKAGE_MINETEST_SERVER
> - bool "minetest server"
> +config BR2_PACKAGE_LUANTI_SERVER
> + bool "luanti server"
> help
> Build Minetest server.
“Build Luanti server”.
>
> -config BR2_PACKAGE_MINETEST_SOUND
> +config BR2_PACKAGE_LUANTI_SOUND
> bool "enable sound"
> - depends on BR2_PACKAGE_MINETEST_CLIENT
> + depends on BR2_PACKAGE_LUANTI_CLIENT
> depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
> depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
> select BR2_PACKAGE_LIBVORBIS
> select BR2_PACKAGE_OPENAL
>
> comment "sound support needs a toolchain w/ threads NPTL"
> - depends on BR2_PACKAGE_MINETEST_CLIENT
> + depends on BR2_PACKAGE_LUANTI_CLIENT
> depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
> depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
>
> endif
>
> -comment "minetest needs a toolchain w/ C++, gcc >= 5.1, threads"
> +comment "luanti 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_5 \
> || !BR2_TOOLCHAIN_HAS_THREADS
>
> -comment "minetest needs X11 and an OpenGL provider"
> +comment "luanti needs X11 and an OpenGL provider"
> depends on (BR2_INSTALL_LIBSTDCPP \
> && BR2_TOOLCHAIN_GCC_AT_LEAST_5 \
> && BR2_TOOLCHAIN_HAS_THREADS)
> diff --git a/package/luanti/luanti.hash b/package/luanti/luanti.hash
> new file mode 100644
> index 0000000000..a3e211cd66
> --- /dev/null
> +++ b/package/luanti/luanti.hash
> @@ -0,0 +1,5 @@
> +# Locally calculated
> +sha256 70e531d0776988ce6e579ea5490fdf6be3e349a4ade5281f5111aa4fdd8ee510 luanti-5.11.0.tar.gz
> +
> +sha256 b38c8d428ceddf8e9b49dca63610c74499d952895d756b7eab5f5d4cef2954f6 LICENSE.txt
> +sha256 2c9434886d3144ead606b959cf61dc41935d1754c074f473541da4a3dd404efa irr/LICENSE
> diff --git a/package/luanti/luanti.mk b/package/luanti/luanti.mk
> new file mode 100644
> index 0000000000..4f2da41a21
> --- /dev/null
> +++ b/package/luanti/luanti.mk
> @@ -0,0 +1,92 @@
> +################################################################################
> +#
> +# luanti
> +#
> +################################################################################
> +
> +LUANTI_VERSION = 5.11.0
> +LUANTI_SOURCE = luanti-$(LUANTI_VERSION).tar.gz # Remove after renamed package
> +LUANTI_SITE = $(call github,luanti-org,luanti,$(LUANTI_VERSION))
> +LUANTI_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds), Zlib (irrlicht)
> +LUANTI_LICENSE_FILES = LICENSE.txt
> +LUANTI_CPE_ID_VENDOR = luanti
> +
> +LUANTI_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd
> +
> +LUANTI_CONF_OPTS = \
> + -DDEFAULT_RUN_IN_PLACE=OFF \
> + -DENABLE_GLES=OFF \
> + -DENABLE_LUAJIT=ON \
> + -DENABLE_CURSES=OFF \
> + -DAPPLY_LOCALE_BLACKLIST=OFF \
> + -DENABLE_SYSTEM_GMP=ON \
> + -DENABLE_SYSTEM_JSONCPP=ON \
> + -DBUILD_UNITTESTS=OFF
> +
> +# Fix wrong cross compiling condition into `src/CMakeListe.txt`
> +LUANTI_CONF_OPTS += \
> + -DEXECUTABLE_OUTPUT_PATH="$(LUANTI_BUILDDIR)/bin"
> +
> +ifeq ($(BR2_PACKAGE_LUANTI_CLIENT),y)
> +LUANTI_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXi
> +LUANTI_CONF_OPTS += -DBUILD_CLIENT=ON
> +else
> +LUANTI_CONF_OPTS += -DBUILD_CLIENT=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LUANTI_SERVER),y)
> +LUANTI_CONF_OPTS += -DBUILD_SERVER=ON
> +else
> +LUANTI_CONF_OPTS += -DBUILD_SERVER=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LUANTI_SOUND),y)
> +LUANTI_DEPENDENCIES += libvorbis openal
> +LUANTI_CONF_OPTS += -DENABLE_SOUND=ON
> +else
> +LUANTI_CONF_OPTS += -DENABLE_SOUND=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_HIREDIS),y)
> +LUANTI_DEPENDENCIES += hiredis
> +LUANTI_CONF_OPTS += -DENABLE_REDIS=ON
> +else
> +LUANTI_CONF_OPTS += -DENABLE_REDIS=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LEVELDB),y)
> +LUANTI_DEPENDENCIES += leveldb
> +LUANTI_CONF_OPTS += -DENABLE_LEVELDB=ON
> +else
> +LUANTI_CONF_OPTS += -DENABLE_LEVELDB=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBCURL),y)
> +LUANTI_DEPENDENCIES += libcurl
> +LUANTI_CONF_OPTS += -DENABLE_CURL=ON
> +else
> +LUANTI_CONF_OPTS += -DENABLE_CURL=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBSPATIALINDEX),y)
> +LUANTI_DEPENDENCIES += libspatialindex
> +LUANTI_CONF_OPTS += -DENABLE_SPATIAL=ON
> +else
> +LUANTI_CONF_OPTS += -DENABLE_SPATIAL=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
> +LUANTI_DEPENDENCIES += postgresql
> +LUANTI_CONF_OPTS += -DENABLE_POSTGRESQL=ON
> +else
> +LUANTI_CONF_OPTS += -DENABLE_POSTGRESQL=OFF
> +endif
> +
> +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
> +LUANTI_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
> +LUANTI_CONF_OPTS += -DENABLE_GETTEXT=ON
> +else
> +LUANTI_CONF_OPTS += -DENABLE_GETTEXT=OFF
> +endif
> +
> +$(eval $(cmake-package))
> diff --git a/package/mineclonia/Config.in b/package/mineclonia/Config.in
> index 03ca117a82..db4eb923c0 100644
> --- a/package/mineclonia/Config.in
> +++ b/package/mineclonia/Config.in
> @@ -1,6 +1,6 @@
> config BR2_PACKAGE_MINECLONIA
> bool "mineclonia"
> - depends on BR2_PACKAGE_MINETEST
> + depends on BR2_PACKAGE_LUANTI
> help
> The main subgame for the Minetest engine.
“… for the Luanti engine”.
>
> diff --git a/package/mineclonia/mineclonia.mk b/package/mineclonia/mineclonia.mk
> index ea3cc996d0..eb69eeaab9 100644
> --- a/package/mineclonia/mineclonia.mk
> +++ b/package/mineclonia/mineclonia.mk
> @@ -45,8 +45,8 @@ MINECLONIA_LICENSE_FILES = LICENSE.txt \
> mods/xpanes/license.txt
>
> define MINECLONIA_INSTALL_TARGET_CMDS
> - mkdir -p $(TARGET_DIR)/usr/share/minetest/games/mineclonia
> - cp -dpfr $(@D)/* $(TARGET_DIR)/usr/share/minetest/games/mineclonia
> + mkdir -p $(TARGET_DIR)/usr/share/luanti/games/mineclonia
> + cp -dpfr $(@D)/* $(TARGET_DIR)/usr/share/luanti/games/mineclonia
> endef
>
> $(eval $(generic-package))
> diff --git a/package/minetest-game/Config.in b/package/minetest-game/Config.in
> index cf92ea5241..2b8831bed5 100644
> --- a/package/minetest-game/Config.in
> +++ b/package/minetest-game/Config.in
> @@ -1,7 +1,7 @@
> config BR2_PACKAGE_MINETEST_GAME
> bool "minetest-game"
> - depends on BR2_PACKAGE_MINETEST
> + depends on BR2_PACKAGE_LUANTI
> help
> The main subgame for the Minetest engine.
”the Luanti engine”.
Regards,
Edgar.
>
> - https://github.com/minetest/minetest_game
> + https://github.com/luanti-org/minetest_game
> diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk
> index 6b611be0b7..41b032e947 100644
> --- a/package/minetest-game/minetest-game.mk
> +++ b/package/minetest-game/minetest-game.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> MINETEST_GAME_VERSION = 5.8.0
> -MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION))
> +MINETEST_GAME_SITE = $(call github,luanti-org,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)
> MINETEST_GAME_LICENSE_FILES = LICENSE.txt \
> @@ -45,8 +45,8 @@ MINETEST_GAME_LICENSE_FILES = LICENSE.txt \
> mods/xpanes/license.txt
>
> define MINETEST_GAME_INSTALL_TARGET_CMDS
> - mkdir -p $(TARGET_DIR)/usr/share/minetest/games/minetest_game
> - cp -dpfr $(@D)/* $(TARGET_DIR)/usr/share/minetest/games/minetest_game
> + mkdir -p $(TARGET_DIR)/usr/share/luanti/games/minetest_game
> + cp -dpfr $(@D)/* $(TARGET_DIR)/usr/share/luanti/games/minetest_game
> endef
>
> $(eval $(generic-package))
> diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash
> deleted file mode 100644
> index 5d859384ca..0000000000
> --- a/package/minetest/minetest.hash
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# Locally calculated
> -sha256 f8173436782b5a2544aa19c54f572a81831b6cfc89480737ccf6768992c651ea minetest-5.9.1.tar.gz
> -
> -sha256 b38c8d428ceddf8e9b49dca63610c74499d952895d756b7eab5f5d4cef2954f6 LICENSE.txt
> diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk
> deleted file mode 100644
> index b07ea57ea7..0000000000
> --- a/package/minetest/minetest.mk
> +++ /dev/null
> @@ -1,87 +0,0 @@
> -################################################################################
> -#
> -# minetest
> -#
> -################################################################################
> -
> -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)
> -MINETEST_LICENSE_FILES = LICENSE.txt
> -MINETEST_CPE_ID_VENDOR = minetest
> -
> -MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd
> -
> -MINETEST_CONF_OPTS = \
> - -DDEFAULT_RUN_IN_PLACE=OFF \
> - -DENABLE_GLES=OFF \
> - -DENABLE_LUAJIT=ON \
> - -DENABLE_CURSES=OFF \
> - -DAPPLY_LOCALE_BLACKLIST=OFF \
> - -DENABLE_SYSTEM_GMP=ON \
> - -DENABLE_SYSTEM_JSONCPP=ON \
> - -DBUILD_UNITTESTS=OFF
> -
> -ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y)
> -MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXi
> -MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON
> -else
> -MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_MINETEST_SERVER),y)
> -MINETEST_CONF_OPTS += -DBUILD_SERVER=ON
> -else
> -MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_MINETEST_SOUND),y)
> -MINETEST_DEPENDENCIES += libvorbis openal
> -MINETEST_CONF_OPTS += -DENABLE_SOUND=ON
> -else
> -MINETEST_CONF_OPTS += -DENABLE_SOUND=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_HIREDIS),y)
> -MINETEST_DEPENDENCIES += hiredis
> -MINETEST_CONF_OPTS += -DENABLE_REDIS=ON
> -else
> -MINETEST_CONF_OPTS += -DENABLE_REDIS=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_LEVELDB),y)
> -MINETEST_DEPENDENCIES += leveldb
> -MINETEST_CONF_OPTS += -DENABLE_LEVELDB=ON
> -else
> -MINETEST_CONF_OPTS += -DENABLE_LEVELDB=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_LIBCURL),y)
> -MINETEST_DEPENDENCIES += libcurl
> -MINETEST_CONF_OPTS += -DENABLE_CURL=ON
> -else
> -MINETEST_CONF_OPTS += -DENABLE_CURL=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_LIBSPATIALINDEX),y)
> -MINETEST_DEPENDENCIES += libspatialindex
> -MINETEST_CONF_OPTS += -DENABLE_SPATIAL=ON
> -else
> -MINETEST_CONF_OPTS += -DENABLE_SPATIAL=OFF
> -endif
> -
> -ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
> -MINETEST_DEPENDENCIES += postgresql
> -MINETEST_CONF_OPTS += -DENABLE_POSTGRESQL=ON
> -else
> -MINETEST_CONF_OPTS += -DENABLE_POSTGRESQL=OFF
> -endif
> -
> -ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
> -MINETEST_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
> -MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
> -else
> -MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
> -endif
> -
> -$(eval $(cmake-package))
More information about the buildroot
mailing list