package/minetest: bump to version 5.2.0
PATCH 1/4 package/minetest: bump to version 5.2.0
Update indentation of hash file (two spaces)
See:
https://dev.minetest.net/Changelog#5.1.0_.E2.86.92_5.2.0
--- package/minetest/minetest.hash | 4 ++-- package/minetest/minetest.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/minetest/minetest.hash +2 -2
@@ -1,4 +1,4 @@ # Locally calculated -sha256 ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906 minetest-5.1.0.tar.gz +sha256 4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d minetest-5.2.0.tar.gz -sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt +sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt
package/minetest/minetest.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.1.0 +MINETEST_VERSION = 5.2.0 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
Signature · 1 line
2.25.4
PATCH 2/4 package/minetest_game: bump to version 5.2.0
Update mods/player_api/license.txt hash due to [1][2].
Update indentation of hash file (two spaces)
[1] https://github.com/minetest/minetest_game/commit/7caa5d36f26de6ac84592216899ab10152b5aa99
[2] https://github.com/minetest/minetest_game/commit/258332578a2b8d117f83c0a87f0c658f2e51c227
--- package/minetest-game/minetest-game.hash | 66 ++++++++++++------------ package/minetest-game/minetest-game.mk | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-)
package/minetest-game/minetest-game.hash +33 -33
@@ -1,35 +1,35 @@ # Locally calculated -sha256 f165fac0081bf4797cf9094282cc25034b2347b3ea94e6bb8d9329c5ee63f41b minetest-game-5.1.0.tar.gz +sha256 0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94 minetest-game-5.2.0.tar.gz -sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt -sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt -sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt -sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt -sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt -sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt -sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt -sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt -sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt -sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt -sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt -sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt -sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt -sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt -sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt -sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt -sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt -sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt -sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt -sha256 8acd4a18781a508f641b9364a0b491fccb0affd4c638b74b215238d0b0ee7b76 mods/player_api/license.txt -sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt -sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt -sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt -sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt -sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt -sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt -sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt -sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt -sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt -sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt +sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt +sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt +sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt +sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt +sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt +sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt +sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt +sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt +sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt +sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt +sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt +sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt +sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt +sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt +sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt +sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt +sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt +sha256 65133ccf7fb7bf8ffe5e9bc148b193af7362bba925b15ab507da28494156297a mods/player_api/license.txt +sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt +sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt +sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt +sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt +sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt +sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt +sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt +sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt +sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt +sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt
package/minetest-game/minetest-game.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.1.0 +MINETEST_GAME_VERSION = 5.2.0 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)
Signature · 1 line
2.25.4
Thomas Petazzoni
AppliedPATCH 2/4 package/minetest_game: bump to version 5.2.0
Quoted 4 lines · On Mon, 4 May 2020 01:07:52 +0200 Romain Naour <[email protected]> wrote:
Update
mods/player_api/license.txthash due to [1][2].Update indentation of hash file (two spaces)
Quoted 8 lines
[1] https://github.com/minetest/minetest_game/commit/7caa5d36f26de6ac84592216899ab10152b5aa99
[2] https://github.com/minetest/minetest_game/commit/258332578a2b8d117f83c0a87f0c658f2e51c227Signed-off-by Romain Naour <[email protected]>--- package/minetest-game/minetest-game.hash | 66 ++++++++++++------------ package/minetest-game/minetest-game.mk | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-)
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/4 package/libpng: enable neon support for aarch64
In reply to Romain NaourNEON support is enabled by default on aarch64, so we can enable it unconditionaly.
--- package/libpng/libpng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libpng/libpng.mk +1 -1
@@ -15,7 +15,7 @@ LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon
Signature · 1 line
2.25.4
PATCH 3/4 package/libpng: enable neon support for aarch64
Quoted 13 lines · On Mon, 4 May 2020 01:07:53 +0200 Romain Naour <[email protected]> wrote:
NEON support is enabled by default on aarch64, so we can enable it unconditionaly.
Signed-off-by Romain Naour <[email protected]>--- package/libpng/libpng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/libpng/libpng.mk +0
-0
package/libpng/libpng.mk LIBPNG_DEPENDENCIES = host-pkgconf zlib · line 21
Quoted 8 lines
package/libpng/libpng.mk +1
-1@@ -15,7 +15,7 @@ LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon
I've applied to next. However, I find it not so nice that the option BR2_ARM_CPU_HAS_NEON is never true for AArch64, even though there is NEON support on AArch64.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 4/4 package/irrlicht: disable bundled libpng NEON support
In reply to Romain NaourIrrlicht fail to detect properly the NEON support on aarch64 or ARM with NEON FPU support. While linking an application with libIrrlicht.so, we get an undefined reference to png_init_filter_functions_neon.
Some files are missing in the libpng bundled in Irrlicht, in particular arm/arm_init.c [1], so disable NEON support completely.
This can be reproduced by building minetest using this defconfig for aarch64:
BR2_aarch64=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_MINETEST=y
BR2_PACKAGE_MINETEST_CLIENT=y
BR2_PACKAGE_MINETEST_SERVER=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y
BR2_PACKAGE_XORG7=y
Or for ARM with NEON FPU support:
BR2_arm=y
BR2_cortex_a15=y
BR2_ARM_FPU_NEON=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_MINETEST=y
BR2_PACKAGE_MINETEST_CLIENT=y
BR2_PACKAGE_MINETEST_SERVER=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_GLX=y
BR2_PACKAGE_XORG7=y
[1] https://github.com/glennrp/libpng/tree/v1.6.37/arm
---
This issue is not related to the minetest version bump (5.2.0).
--- package/irrlicht/irrlicht.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/irrlicht/irrlicht.mk +7 -0
@@ -38,6 +38,13 @@ ifeq ($(BR2_STATIC_LIBS),) IRRLICHT_CONF_OPTS += sharedlib endif +# Irrlicht fail to detect properly the NEON support on aarch64 or ARM with NEON FPU support. +# While linking an application with libIrrlicht.so, we get an undefined reference to +# png_init_filter_functions_neon. +# Some files are missing in the libpng bundled in Irrlicht, in particular arm/arm_init.c, +# so disable NEON support completely. +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0" + define IRRLICHT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(IRRLICHT_SUBDIR) $(IRRLICHT_CONF_OPTS)
Signature · 1 line
2.25.4
PATCH 4/4 package/irrlicht: disable bundled libpng NEON support
Quoted 30 lines · On Mon, 4 May 2020 01:07:54 +0200 Romain Naour <[email protected]> wrote:
Irrlicht fail to detect properly the NEON support on aarch64 or ARM with NEON FPU support. While linking an application with libIrrlicht.so, we get an undefined reference to
png_init_filter_functions_neon.
Some files are missing in the libpng bundled in Irrlicht, in particulararm/arm_init.c[1], so disable NEON support completely.This can be reproduced by building minetest using this defconfig for aarch64:
BR2_aarch64=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_MINETEST=y
BR2_PACKAGE_MINETEST_CLIENT=y
BR2_PACKAGE_MINETEST_SERVER=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y
BR2_PACKAGE_XORG7=yOr for ARM with NEON FPU support:
BR2_arm=y
BR2_cortex_a15=y
BR2_ARM_FPU_NEON=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_MINETEST=y
BR2_PACKAGE_MINETEST_CLIENT=y
BR2_PACKAGE_MINETEST_SERVER=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_GLX=y
BR2_PACKAGE_XORG7=y
Quoted 8 lines
[1] https://github.com/glennrp/libpng/tree/v1.6.37/arm
Signed-off-by Romain Naour <[email protected]>---
This issue is not related to the minetest version bump (5.2.0).--- package/irrlicht/irrlicht.mk | 7 +++++++ 1 file changed, 7 insertions(+)
Since this is apparently a bug fix, I've applied to master. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/4 package/minetest: bump to version 5.2.0
In reply to Romain NaourQuoted 10 lines · On Mon, 4 May 2020 01:07:51 +0200 Romain Naour <[email protected]> wrote:
Update indentation of hash file (two spaces)
See:
https://dev.minetest.net/Changelog#5.1.0_.E2.86.92_5.2.0Signed-off-by Romain Naour <[email protected]>--- package/minetest/minetest.hash | 4 ++-- package/minetest/minetest.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com