[Buildroot] [PATCH] package/ltris: bump version to 1.2.3

[Peter Korsgaard]

>>>>> "julien" == julien boibessot <julien.boibessot at armadeus.com> writes:

 > From: Julien BOIBESSOT <julien.boibessot at armadeus.com>
 > 0001-fix-build-with-gcc-4.8.patch was integrated mainline and cross-compilation
 > slightly changed.
 > ---
 >  .../ltris/0001-fix-build-with-gcc-4.8.patch   | 20 -------------------
 >  package/ltris/ltris.hash                      |  4 ++--
 >  package/ltris/ltris.mk                        |  4 ++--
 >  3 files changed, 4 insertions(+), 24 deletions(-)
 >  delete mode 100644 package/ltris/0001-fix-build-with-gcc-4.8.patch

 > diff --git a/package/ltris/0001-fix-build-with-gcc-4.8.patch b/package/ltris/0001-fix-build-with-gcc-4.8.patch
 > deleted file mode 100644
 > index d6bbf6a946..0000000000
 > --- a/package/ltris/0001-fix-build-with-gcc-4.8.patch
 > +++ /dev/null
 > @@ -1,20 +0,0 @@
 > -Fix build with gcc 4.8
 > -
 > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
 > -[Upstream status: https://sourceforge.net/p/lgames/patches/28]
 > -Index: ltris/src/bowl.c
 > -===================================================================
 > ---- ltris/src/bowl.c	(révision 421)
 > -+++ ltris/src/bowl.c	(copie de travail)
 > -@@ -828,9 +828,10 @@
 > - */
 > - void bowl_init_block_masks() 
 > - {
 > -+	int i;
 > - 	int masksize = sizeof(block_masks[0].mask); // same for all
 > - 
 > --	for (int i = 0; i < 7; i++) {
 > -+	for (i = 0; i < 7; i++) {
 > - 		block_masks[i].rx = 2;
 > - 		block_masks[i].ry = 2;
 > - 		memset(block_masks[i].mask, 0, masksize );
 > diff --git a/package/ltris/ltris.hash b/package/ltris/ltris.hash
 > index f696e3af17..20f34342ff 100644
 > --- a/package/ltris/ltris.hash
 > +++ b/package/ltris/ltris.hash
 > @@ -1,3 +1,3 @@
 >  # Locally computed:
 > -sha256  a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195  ltris-1.2.tar.gz
 > -sha256  67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34  COPYING
 > +sha256	0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8  ltris-1.2.3.tar.gz
 > +sha256	67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34  COPYING

NIT: The style used (as checked by check-package) is two spaces after
sha256, not a tab.


 > diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk
 > index 9b59613417..6e37bdbd19 100644
 > --- a/package/ltris/ltris.mk
 > +++ b/package/ltris/ltris.mk
 > @@ -5,7 +5,7 @@
 >  ################################################################################
 
 >  LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris
 > -LTRIS_VERSION = 1.2
 > +LTRIS_VERSION = 1.2.3
 >  LTRIS_LICENSE = GPL-2.0+
 >  LTRIS_LICENSE_FILES = COPYING
 
 > @@ -13,7 +13,7 @@ LTRIS_DEPENDENCIES = sdl $(TARGET_NLS_DEPENDENCIES)
 >  LTRIS_LIBS = $(TARGET_NLS_LIBS)
 
 >  LTRIS_CONF_ENV = \
 > -	SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
 > +	PATH="$(PATH):$(STAGING_DIR)/usr/bin" \

That's no good. This would mean that the wrong sdl-config would get
picked up if the build machine has sdl-config.

Looking at the configure script, I see it has a --with-sdl-exec-prefix,
so we could pass --with-sdl-exec-prefix=$(STAGING_DIR)/usr, which goes
fine all the way until the configure script throws away all the sdl
detection and does:

CFLAGS="$CFLAGS $(sdl-config --cflags)"
LIBS="$LIBS $(sdl-config --libs)"

This is even done after prepending /usr/bin to the PATH, so we cannot
even do like in nodejs and put sdl-config in a dedicated directory and
stick it in the front of the path :/

I guess they should just do:

CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS SDL_LIBS"

Care to send a patch upstream for that and send an updated patch to us?
In the mean time I have marked the patch as changes requested.

-- 
Bye, Peter Korsgaard