package/minetest: new package
PATCH v3 1/10 package/minetest: new package
---
v3: Simplify Config.in entry (ThomasP)
fix Alphabetic ordering (ThomasP)
Improve license informations (ThomasP)
jpeg removed from mendatory dependencies (minetest client only) Drop Intl patch that was required before BR2_SYSTEM_ENABLE_NLS. Add license hash.
v2: add package dependencies comments
add hash file (Bernd)
bump to 0.4.16 (Bernd)
version 0.4.15 Tested-by Bernd
Add a new patch fixing linking with libintl when necessary
--- DEVELOPERS | 1 + package/Config.in | 1 + package/minetest/Config.in | 53 ++++++++++++++++++++++++++++++++++++++++++ package/minetest/minetest.hash | 4 ++++ package/minetest/minetest.mk | 44 +++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 package/minetest/Config.in create mode 100644 package/minetest/minetest.hash create mode 100644 package/minetest/minetest.mk
DEVELOPERS +1 -0
@@ -1437,6 +1437,7 @@ F: package/libspatialindex/ F: package/linux-syscall-support/ F: package/lugaru/ F: package/mcelog/ +F: package/minetest/ F: package/openpowerlink/ F: package/physfs/ F: package/stress-ng/
package/Config.in +1 -0
@@ -228,6 +228,7 @@ menu "Games" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" source "package/lugaru/Config.in" + source "package/minetest/Config.in" source "package/opentyrian/Config.in" source "package/opentyrian-data/Config.in" source "package/prboom/Config.in"
package/minetest/Config.in new file +53 -0
53 lines not on this page · raw message
package/minetest/minetest.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Locally calculated +sha256 0ef3793de9f569746ea78af7a66fe96ef65400019e5e64a04a5c3fa26a707655 minetest-0.4.16.tar.gz + +sha256 e48121374512b8f2fada00ac1c8e100a767e2a2edd2853557ccf1995e35a4be0 README.txt
package/minetest/minetest.mk new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
2.9.4
PATCH v3 2/10 package/minetest: add libcurl optional dependency
Curl support is strongly recommended for multiplayer game.
The build system warn when curl is disabled:
cURL is required to load the server list
cURL is required to announce to the server list
---
v3: Add a note in the commit log about curl support.
--- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
@@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib MINETEST_CONF_OPTS = \ -DDEFAULT_RUN_IN_PLACE=OFF \ - -DENABLE_CURL=OFF \ -DENABLE_GETTEXT=OFF \ -DENABLE_SOUND=OFF \ -DENABLE_GLES=OFF \
@@ -41,4 +40,11 @@ else MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +MINETEST_DEPENDENCIES += libcurl +MINETEST_CONF_OPTS += -DENABLE_CURL=ON +else +MINETEST_CONF_OPTS += -DENABLE_CURL=OFF +endif + $(eval $(cmake-package))
Signature · 1 line
2.9.4
PATCH v3 3/10 package/minetest: add NLS optional dependency
In reply to Romain Naour---
v3: enable gettext support only if BR2_SYSTEM_ENABLE_NLS is set.
Also add $(TARGET_NLS_DEPENDENCIES) to the dependencies. --- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
@@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib MINETEST_CONF_OPTS = \ -DDEFAULT_RUN_IN_PLACE=OFF \ - -DENABLE_GETTEXT=OFF \ -DENABLE_SOUND=OFF \ -DENABLE_GLES=OFF \ -DENABLE_FREETYPE=OFF \
@@ -47,4 +46,11 @@ else MINETEST_CONF_OPTS += -DENABLE_CURL=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))
Signature · 1 line
2.9.4
PATCH v3 4/10 package/minetest: add freetype optional dependency
In reply to Romain Naour--- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
@@ -15,7 +15,6 @@ MINETEST_CONF_OPTS = \ -DDEFAULT_RUN_IN_PLACE=OFF \ -DENABLE_SOUND=OFF \ -DENABLE_GLES=OFF \ - -DENABLE_FREETYPE=OFF \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \ -DENABLE_POSTGRESQL=OFF \
@@ -39,6 +38,13 @@ else MINETEST_CONF_OPTS += -DBUILD_SERVER=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_LIBCURL),y) MINETEST_DEPENDENCIES += libcurl MINETEST_CONF_OPTS += -DENABLE_CURL=ON
Signature · 1 line
2.9.4
PATCH v3 5/10 package/minetest: enable sound support
In reply to Romain Naour---
v3: Add comment in Config.in (ThomasP)
--- package/minetest/Config.in | 13 +++++++++++++ package/minetest/minetest.mk | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
package/minetest/Config.in +13 -0
@@ -37,6 +37,19 @@ config BR2_PACKAGE_MINETEST_SERVER help Build Minetest server. +config BR2_PACKAGE_MINETEST_SOUND + bool "enable sound" + depends on BR2_PACKAGE_MINETEST_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_OPENAL_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + endif comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads"
package/minetest/minetest.mk +7 -1
@@ -13,7 +13,6 @@ MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib MINETEST_CONF_OPTS = \ -DDEFAULT_RUN_IN_PLACE=OFF \ - -DENABLE_SOUND=OFF \ -DENABLE_GLES=OFF \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \
@@ -38,6 +37,13 @@ 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_FREETYPE),y) MINETEST_DEPENDENCIES += freetype MINETEST_CONF_OPTS += -DENABLE_FREETYPE=ON
Signature · 1 line
2.9.4
PATCH v3 6/10 package/minetest: add postgresql optional dependency
In reply to Romain Naour--- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
@@ -16,7 +16,6 @@ MINETEST_CONF_OPTS = \ -DENABLE_GLES=OFF \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \ - -DENABLE_POSTGRESQL=OFF \ -DENABLE_LEVELDB=OFF \ -DENABLE_REDIS=OFF \ -DENABLE_SPATIAL=OFF \
@@ -58,6 +57,13 @@ else MINETEST_CONF_OPTS += -DENABLE_CURL=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
Signature · 1 line
2.9.4
PATCH v3 7/10 package/minetest: add hiredis optional dependency
In reply to Romain Naour--- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
@@ -17,7 +17,6 @@ MINETEST_CONF_OPTS = \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \ -DENABLE_LEVELDB=OFF \ - -DENABLE_REDIS=OFF \ -DENABLE_SPATIAL=OFF \ -DAPPLY_LOCALE_BLACKLIST=OFF \ -DENABLE_SYSTEM_GMP=ON \
@@ -50,6 +49,13 @@ else MINETEST_CONF_OPTS += -DENABLE_FREETYPE=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_LIBCURL),y) MINETEST_DEPENDENCIES += libcurl MINETEST_CONF_OPTS += -DENABLE_CURL=ON
Signature · 1 line
2.9.4
PATCH v3 8/10 package/minetest: add leveldb optional dependency
In reply to Romain Naour--- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
@@ -16,7 +16,6 @@ MINETEST_CONF_OPTS = \ -DENABLE_GLES=OFF \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \ - -DENABLE_LEVELDB=OFF \ -DENABLE_SPATIAL=OFF \ -DAPPLY_LOCALE_BLACKLIST=OFF \ -DENABLE_SYSTEM_GMP=ON \
@@ -56,6 +55,13 @@ 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
Signature · 1 line
2.9.4
PATCH v3 9/10 package/minetest: add libspatialindex optional dependency
In reply to Romain Naour--- package/minetest/minetest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/minetest/minetest.mk +7 -1
@@ -16,7 +16,6 @@ MINETEST_CONF_OPTS = \ -DENABLE_GLES=OFF \ -DENABLE_LUAJIT=ON \ -DENABLE_CURSES=OFF \ - -DENABLE_SPATIAL=OFF \ -DAPPLY_LOCALE_BLACKLIST=OFF \ -DENABLE_SYSTEM_GMP=ON \ -DENABLE_SYSTEM_JSONCPP=ON
@@ -69,6 +68,13 @@ 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
Signature · 1 line
2.9.4
PATCH v3 10/10 package/minetest_game: new package
In reply to Romain Naour---
v3: use "cp -dpfr" instead of rsync (ThomasP).
remove nyancat mod license.
sort licenses by name.
add licenses hashes.
v2: update to 0.4.16
update license file
Add a hash file
backport an upstream patch due to regression.
--- DEVELOPERS | 1 + package/Config.in | 1 + ...lt-Revert-Default-Shorter-and-better-ABMs.patch | 54 ++++++++++++++++++++++ package/minetest_game/Config.in | 7 +++ package/minetest_game/minetest_game.hash | 25 ++++++++++ package/minetest_game/minetest_game.mk | 39 ++++++++++++++++ 6 files changed, 127 insertions(+) create mode 100644 package/minetest_game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch create mode 100644 package/minetest_game/Config.in create mode 100644 package/minetest_game/minetest_game.hash create mode 100644 package/minetest_game/minetest_game.mk
DEVELOPERS +1 -0
@@ -1438,6 +1438,7 @@ F: package/linux-syscall-support/ F: package/lugaru/ F: package/mcelog/ F: package/minetest/ +F: package/minetest_game/ F: package/openpowerlink/ F: package/physfs/ F: package/stress-ng/
package/Config.in +1 -0
@@ -229,6 +229,7 @@ menu "Games" source "package/ltris/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" source "package/prboom/Config.in"
package/minetest_game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch new file +54 -0
54 lines not on this page · raw message
package/minetest_game/Config.in new file +7 -0
@@ -0,0 +1,7 @@ +config BR2_PACKAGE_MINETEST_GAME + bool "minetest_game" + depends on BR2_PACKAGE_MINETEST + help + The main subgame for the Minetest engine. + + https://github.com/minetest/minetest_game
package/minetest_game/minetest_game.hash new file +25 -0
@@ -0,0 +1,25 @@ +# Locally calculated +sha256 ea914555949b4faccda5e13143cb021d2f9a5fa19abd1f5e4b7b65004cbd2b5a minetest_game-0.4.16.tar.gz + +sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt +sha256 3382f3bf99566089543621ee3256f7f98bf9364d3b852c5ed08202d435215d7d mods/beds/license.txt +sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt +sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt +sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt +sha256 c0eca35bf446b1b9c8a0d1eefa0613bf2996187cd1f9382e7424b3d0b0dd7851 mods/creative/license.txt +sha256 0542a1ff8212197bf350b6135fb4d29f8a2341d9ddc1407ec812d7fb609a5c0f mods/default/license.txt +sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt +sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt +sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt +sha256 a8647ac7609fdaea96bd0ec58ac5837fd17d049fd450008fd7922162979a292e mods/flowers/license.txt +sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt +sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt +sha256 a82dfda1c9feb704997ea42116eb6a15a1f3f99ee8c49215fbbd32d519e8ad74 mods/stairs/license.txt +sha256 1d42ffae6bad0da2e76966532f5f759bbeb5adb395ee4bf7bacca1fdfef745a6 mods/tnt/license.txt +sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt +sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt +sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt +sha256 54fd170807a31712e3d6489287a27cdf5aa42eaff10e321aea040fb5b3e5a60a mods/xpanes/license.txt
package/minetest_game/minetest_game.mk new file +39 -0
@@ -0,0 +1,39 @@ +################################################################################ +# +# minetest_game +# +################################################################################ + +MINETEST_GAME_VERSION = 0.4.16 +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) +MINETEST_GAME_LICENSE_FILES = LICENSE.txt \ + mods/beds/license.txt \ + mods/boats/license.txt \ + mods/bones/license.txt \ + mods/bucket/license.txt \ + mods/carts/license.txt \ + mods/creative/license.txt \ + mods/default/license.txt \ + mods/doors/license.txt \ + mods/dye/license.txt \ + mods/farming/license.txt \ + mods/fire/license.txt \ + mods/flowers/license.txt \ + mods/give_initial_stuff/license.txt \ + mods/screwdriver/license.txt \ + mods/sethome/license.txt \ + mods/stairs/license.txt \ + mods/tnt/license.txt \ + mods/vessels/license.txt \ + mods/walls/license.txt \ + mods/wool/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 +endef + +$(eval $(generic-package))
Signature · 1 line
2.9.4
PATCH v3 1/10 package/minetest: new package
In reply to Romain NaourHello,
Quoted 13 lines · Romain Naour
Signed-off-by Romain Naour <[email protected]>---
v3: Simplify Config.in entry (ThomasP)
fix Alphabetic ordering (ThomasP)
Improve license informations (ThomasP)
jpeg removed from mendatory dependencies (minetest client only) Drop Intl patch that was required beforeBR2_SYSTEM_ENABLE_NLS. Add license hash.
v2: add package dependencies comments
add hash file (Bernd)
bump to 0.4.16 (Bernd)
version 0.4.15 Tested-by Bernd
Add a new patch fixing linking with libintl when necessary
Quoted 10 lines
--- DEVELOPERS | 1 + package/Config.in | 1 + package/minetest/Config.in | 53 ++++++++++++++++++++++++++++++++++++++++++ package/minetest/minetest.hash | 4 ++++ package/minetest/minetest.mk | 44 +++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 package/minetest/Config.in create mode 100644 package/minetest/minetest.hash create mode 100644 package/minetest/minetest.mk
To be honest, we hesitated a bit with this patch series. Indeed packaging games is really not the priority in Buildroot, and it takes review time to look at those patches. On the other hand, the patches were clean, and having a few games for demos is interesting.
The only change I did to the series is to rename minetest_game to minetest-game, just because - is a nicer separator than _ in package names.
All applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com