Skip to contentSkip to conversation

package/solarus: bump to version 1.6.2

PATCH New Fabrice Fontaine 4 participants 9 messages Dec 1, 2019 – Dec 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/solarus: bump to version 1.6.2

Switch to gitlab to retrieve latest version

---
 package/solarus/solarus.hash | 2 +-
 package/solarus/solarus.mk   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
package/solarus/solarus.hash +1 -1
index dab8d1a1fa..596c0e3bdf 100644
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751  solarus-1.6.0-src.tar.gz
+sha256 a752c26ef9d7a22c8b054d5e22967f5e24519b9b3b22aaff265224e8088c833f  solarus-1.6.2.tar.gz
 
 sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f  license.txt
package/solarus/solarus.mk +3 -3
index fd7bbea2c7..6f65a53fea 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-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_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
#1 lore raw

PATCH 2/3 package/solarus: luajit is optional, not mandatory

Build with lua 5.1 has been fixed since version 1.6.1 and
https://gitlab.com/solarus-games/solarus/commit/611f81a90d42692e986c78c67090541ffd1c5973

---
 package/solarus/Config.in  |  9 ++++-----
 package/solarus/solarus.mk | 12 ++++++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)
package/solarus/Config.in +4 -5
index 359ad15e02..290d5a756c 100644
@@ -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 +10 -2
index 6f65a53fea..c17483d339 100644
@@ -15,10 +15,18 @@ SOLARUS_LICENSE_FILES = license.txt
 # Install libsolarus.so
 SOLARUS_INSTALL_STAGING = YES
 
-SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \
-	sdl2_image sdl2_ttf
+SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \
+	sdl2_image sdl2_ttf \
+	$(if $(BR2_PACKAGE_LUA_5_1),lua)
 
 # 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
+endif
+
 $(eval $(cmake-package))
Signature · 1 line
2.24.0
#2 lore raw

PATCH 2/3 package/solarus: luajit is optional, not mandatory

Hi Fabrice,

Le 01/12/2019 ? 10:28, Fabrice Fontaine a ?crit?:

Quoted 2 lines

Build with lua 5.1 has been fixed since version 1.6.1 and
https://gitlab.com/solarus-games/solarus/commit/611f81a90d42692e986c78c67090541ffd1c5973

When I packaged solarus, I never considered to test it with lua 5.1 interpreter instead of luajit.
But ok, if you have a use case where luajit is not available :)

Quoted 53 lines
---
 package/solarus/Config.in  |  9 ++++-----
 package/solarus/solarus.mk | 12 ++++++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)
package/solarus/Config.in +4 -5
index 359ad15e02..290d5a756c 100644
@@ -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 +2 -2
index 6f65a53fea..c17483d339 100644
@@ -15,10 +15,18 @@ SOLARUS_LICENSE_FILES = license.txt
 # Install libsolarus.so
 SOLARUS_INSTALL_STAGING = YES
 
-SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis luajit openal physfs sdl2 \
-	sdl2_image sdl2_ttf
+SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \
+	sdl2_image sdl2_ttf \

package/solarus/solarus.mk SOLARUS_LICENSE_FILES = license.txt · line 29

Quoted 10 lines
package/solarus/solarus.mk +6 -0
+	$(if $(BR2_PACKAGE_LUA_5_1),lua)
 
 # 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

Maybe just add here:
SOLARUS_DEPENDENCIES += lua

Instead of the line above
$(if $(BR2_PACKAGE_LUA_5_1),lua)

The dependency on lua 5.1 is guaranteed by Config.in

Best regards,
Romain

Quoted 4 lines
package/solarus/solarus.mk +2 -0
+endif
+
 $(eval $(cmake-package))
#3 lore raw

PATCH 2/3 package/solarus: luajit is optional, not mandatory

In reply to Fabrice Fontaine
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Build with lua 5.1 has been fixed since version 1.6.1 and
https://gitlab.com/solarus-games/solarus/commit/611f81a90d42692e986c78c67090541ffd1c5973

A better commit message would IMHO be 'package/solarus: allow building with lua 5.1'

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 3/3 package/solarus: disable tests

In reply to 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)

---
 package/solarus/solarus.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/solarus/solarus.mk +3 -1
index c17483d339..19de91f614 100644
@@ -20,7 +20,9 @@ SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \
 	$(if $(BR2_PACKAGE_LUA_5_1),lua)
 
 # 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
#5 lore raw

PATCH 3/3 package/solarus: disable tests

Le 01/12/2019 ? 10:28, Fabrice Fontaine a ?crit?:

Quoted 5 lines

Set -DSOLARUS_TESTS=OFF to disable tests (option added in version 1.6.1 with:
https://gitlab.com/solarus-games/solarus/commit/1829189c6050e36086b12c3806932e8657265467)

Best regards,
Romain

Quoted 20 lines
---
 package/solarus/solarus.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/solarus/solarus.mk +3 -1
index c17483d339..19de91f614 100644
@@ -20,7 +20,9 @@ SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \
 	$(if $(BR2_PACKAGE_LUA_5_1),lua)
 
 # 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
#6 lore raw

PATCH 1/3 package/solarus: bump to version 1.6.2

In reply to Fabrice Fontaine

Hi Fabrice,

Le 01/12/2019 ? 10:28, Fabrice Fontaine a ?crit?:

Quoted 1 line

Switch to gitlab to retrieve latest version

Here is a discussion about downloading archive from gitlab:
https://gitlab.com/solarus-games/solarus/issues/1410

Are you sure that the archive hash will be the same over the time?

Also, there is no official release archive in gitlab:
https://gitlab.com/solarus-games/solarus/releases

The issue has been reported:
https://gitlab.com/solarus-games/solarus-website-pages/issues/37
https://gitlab.com/solarus-games/solarus-website-pages/issues/38

Best regards,
Romain

Quoted 35 lines
---
 package/solarus/solarus.hash | 2 +-
 package/solarus/solarus.mk   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
package/solarus/solarus.hash +1 -1
index dab8d1a1fa..596c0e3bdf 100644
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751  solarus-1.6.0-src.tar.gz
+sha256 a752c26ef9d7a22c8b054d5e22967f5e24519b9b3b22aaff265224e8088c833f  solarus-1.6.2.tar.gz
 
 sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f  license.txt
package/solarus/solarus.mk +3 -3
index fd7bbea2c7..6f65a53fea 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-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_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
 	CC-BY-SA-3.0 (GUI icons)
#7 lore raw

PATCH 1/3 package/solarus: bump to version 1.6.2

Hi Romain,

Le dim. 1 d?c. 2019 ? 11:05, Romain Naour <[email protected]> a ?crit :

Quoted 10 lines

Hi Fabrice,

Le 01/12/2019 ? 10:28, Fabrice Fontaine a ?crit :

Quoted 1 line

Switch to gitlab to retrieve latest version

Here is a discussion about downloading archive from gitlab:
https://gitlab.com/solarus-games/solarus/issues/1410

Are you sure that the archive hash will be the same over the time?

Nope, I'm not sure but this issue was opened three months ago so I think we should move forward and retrieve this archive like we already do with some github projects that don't provide official tarball either.
If the archive hash changes, then I assume that we'll fallback on our own cached tarball.

Quoted 43 lines

Also, there is no official release archive in gitlab:
https://gitlab.com/solarus-games/solarus/releases

The issue has been reported:
https://gitlab.com/solarus-games/solarus-website-pages/issues/37
https://gitlab.com/solarus-games/solarus-website-pages/issues/38

Best regards,
Romain

Quoted 32 lines
---
 package/solarus/solarus.hash | 2 +-
 package/solarus/solarus.mk   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
package/solarus/solarus.hash +1 -1
index dab8d1a1fa..596c0e3bdf 100644
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256 d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751  solarus-1.6.0-src.tar.gz
+sha256 a752c26ef9d7a22c8b054d5e22967f5e24519b9b3b22aaff265224e8088c833f  solarus-1.6.2.tar.gz
 
 sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f  license.txt
package/solarus/solarus.mk +3 -3
index fd7bbea2c7..6f65a53fea 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-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)
 
Quoted 4 lines

package/solarus/solarus.mk line 12

Quoted 3 lines
package/solarus/solarus.mk +0 -0
 SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
      CC-BY-SA-3.0 (GUI icons)

Best Regards,

Fabrice

#8 lore raw

PATCH 1/3 package/solarus: bump to version 1.6.2

In reply to Fabrice Fontaine

Review

Quoted 6 lines · On Sun, 1 Dec 2019 10:28:21 +0100 Fabrice Fontaine…
(quoted diff) +3 -3
-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)

Here, this URL doesn't work, it downloads a blurb of HTML. To get an actual tarball, I need to do the following change:

package/solarus/solarus.hash +1 -1
index 596c0e3bdf..3c14b92b1b 100644
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256 a752c26ef9d7a22c8b054d5e22967f5e24519b9b3b22aaff265224e8088c833f  solarus-1.6.2.tar.gz
+sha256 a752c26ef9d7a22c8b054d5e22967f5e24519b9b3b22aaff265224e8088c833f  solarus-v1.6.2.tar.gz
 
 sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f  license.txt
package/solarus/solarus.mk +2 -1
index 6f65a53fea..b8965f3c5e 100644
@@ -5,8 +5,9 @@
 ################################################################################
 
 SOLARUS_VERSION = 1.6.2
+SOLARUS_SOURCE = solarus-v$(SOLARUS_VERSION).tar.gz
 SOLARUS_SITE = \
-       https://gitlab.com/solarus-games/solarus/archive/v$(SOLARUS_VERSION)
+       https://gitlab.com/solarus-games/solarus/-/archive/v$(SOLARUS_VERSION)
 
 SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
        CC-BY-SA-3.0 (GUI icons)

But then, the hash doesn't match:

ERROR: solarus-v1.6.2.tar.gz has wrong sha256 hash:
ERROR: expected: a752c26ef9d7a22c8b054d5e22967f5e24519b9b3b22aaff265224e8088c833f
ERROR: got : cec4da0fb041dec3ec1f1cba79c40a519e994b562d582cd56e37fc444c8c656c

Could you double check ?

Also, you had some comments on PATCH 2/3, so I guess a v2 for this series is needed. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com