package/solarus: bump to version 1.6.2
PATCH v3 1/3 package/solarus: bump to version 1.6.2
Switch to gitlab to retrieve latest version
---
Changes v2 -> v3:
- Use tar.bz2 tarball
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Fix SOLARUS_SITE (missing '-/' in URL)
package/solarus/solarus.hash | 2 +- package/solarus/solarus.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
package/solarus/solarus.hash +1 -1
@@ -1,4 +1,4 @@ # Locally calculated -sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751 solarus-1.6.0-src.tar.gz +sha256 c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b solarus-v1.6.2.tar.bz2 sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt
package/solarus/solarus.mk +4 -3
@@ -4,9 +4,10 @@ # ################################################################################ -SOLARUS_VERSION = 1.6.0 -SOLARUS_SITE = http://www.solarus-games.org/downloads/solarus -SOLARUS_SOURCE = solarus-$(SOLARUS_VERSION)-src.tar.gz +SOLARUS_VERSION = 1.6.2 +SOLARUS_SITE = \ + https://gitlab.com/solarus-games/solarus/-/archive/v$(SOLARUS_VERSION) +SOLARUS_SOURCE = solarus-v$(SOLARUS_VERSION).tar.bz2 SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \ CC-BY-SA-3.0 (GUI icons)
Signature · 1 line
2.24.0
PATCH v3 2/3 package/solarus: allow building with lua 5.1
Build with lua 5.1 has been fixed since version 1.6.1 and
https://gitlab.com/solarus-games/solarus/commit/611f81a90d42692e986c78c67090541ffd1c5973
---
Changes v1 -> v2 (after review of Romain Naour and Peter Korsgaard):
- Update commit title
- Move lua dependency under !BR2_PACKAGE_LUAJIT statement
package/solarus/Config.in | 9 ++++----- package/solarus/solarus.mk | 10 +++++++++- 2 files changed, 13 insertions(+), 6 deletions(-)
package/solarus/Config.in +4 -5
@@ -1,7 +1,7 @@ config BR2_PACKAGE_SOLARUS bool "solarus" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
@@ -11,7 +11,6 @@ config BR2_PACKAGE_SOLARUS select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_OPENAL select BR2_PACKAGE_PHYSFS select BR2_PACKAGE_SDL2
@@ -25,9 +24,9 @@ config BR2_PACKAGE_SOLARUS http://www.solarus-games.org https://github.com/solarus-games/solarus -comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS +comment "solarus needs OpenGL, a Lua 5.1 interpreter and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library" depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ - || !BR2_PACKAGE_HAS_LIBGL + || !BR2_PACKAGE_HAS_LIBGL \ + || !(BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT)
package/solarus/solarus.mk +9 -1
@@ -16,10 +16,18 @@ SOLARUS_LICENSE_FILES = license.txt # Install libsolarus.so SOLARUS_INSTALL_STAGING = YES -SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \ +SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \ sdl2_image sdl2_ttf # Disable launcher GUI (requires Qt5) SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF +ifeq ($(BR2_PACKAGE_LUAJIT),y) +SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=ON +SOLARUS_DEPENDENCIES += luajit +else +SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=OFF +SOLARUS_DEPENDENCIES += lua +endif + $(eval $(cmake-package))
Signature · 1 line
2.24.0
Thomas Petazzoni
AppliedPATCH v3 2/3 package/solarus: allow building with lua 5.1
Quoted 18 lines · On Sun, 15 Dec 2019 14:13:57 +0100 Fabrice Fontaine…
Build with lua 5.1 has been fixed since version 1.6.1 and
https://gitlab.com/solarus-games/solarus/commit/611f81a90d42692e986c78c67090541ffd1c5973Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Romain Naour and Peter Korsgaard):
- Update commit title
- Move lua dependency under !BR2_PACKAGE_LUAJIT statementpackage/solarus/Config.in | 9 ++++----- package/solarus/solarus.mk | 10 +++++++++- 2 files changed, 13 insertions(+), 6 deletions(-)package/solarus/Config.in +0
-0
package/solarus/Config.in line 4
Quoted 5 lines
package/solarus/Config.in +1
-1@@ -1,7 +1,7 @@ config BR2_PACKAGE_SOLARUS bool "solarus" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
I am not a big fan of this change, as it could break existing setups, so instead I've used:
select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1
and of course re-adjusted the dependencies and comments accordingly.
I've applied to master with this change.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 3/3 package/solarus: disable tests
In reply to Fabrice FontaineSet -DSOLARUS_TESTS=OFF to disable tests (option added in version 1.6.1 with:
https://gitlab.com/solarus-games/solarus/commit/1829189c6050e36086b12c3806932e8657265467)
--- package/solarus/solarus.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
package/solarus/solarus.mk +3 -1
@@ -20,7 +20,9 @@ SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \ sdl2_image sdl2_ttf # Disable launcher GUI (requires Qt5) -SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF +SOLARUS_CONF_OPTS = \ + -DSOLARUS_GUI=OFF \ + -DSOLARUS_TESTS=OFF ifeq ($(BR2_PACKAGE_LUAJIT),y) SOLARUS_CONF_OPTS += -DSOLARUS_USE_LUAJIT=ON
Signature · 1 line
2.24.0
Thomas Petazzoni
AppliedPATCH v3 3/3 package/solarus: disable tests
Quoted 9 lines · On Sun, 15 Dec 2019 14:13:58 +0100 Fabrice Fontaine…
Set -DSOLARUS_TESTS=OFF to disable tests (option added in version 1.6.1 with:
https://gitlab.com/solarus-games/solarus/commit/1829189c6050e36086b12c3806932e8657265467)Reviewed-by Romain Naour <[email protected]>Signed-off-by Fabrice Fontaine <[email protected]>--- package/solarus/solarus.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH v3 1/3 package/solarus: bump to version 1.6.2
In reply to Fabrice FontaineQuoted 6 lines · On Sun, 15 Dec 2019 14:13:56 +0100 Fabrice Fontaine…
Switch to gitlab to retrieve latest version
Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v2 -> v3:
- Use tar.bz2 tarball
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com