Skip to contentSkip to conversation

sdl_ttf: bump to version 2.0.11

PATCH New Gilles Talis 2 participants 8 messages Jan 17, 2013 – Jan 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 sdl_ttf: bump to version 2.0.11

---
 package/sdl_ttf/sdl_ttf.mk |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
package/sdl_ttf/sdl_ttf.mk +6 -3
index b9747d8..e9bc537 100644
@@ -3,9 +3,12 @@
 # SDL_ttf
 #
 #############################################################
-SDL_TTF_VERSION:=2.0.9
-SDL_TTF_SOURCE:=SDL_ttf-$(SDL_TTF_VERSION).tar.gz
-SDL_TTF_SITE:=http://www.libsdl.org/projects/SDL_ttf/release/
+
+SDL_TTF_VERSION = 2.0.11
+SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz
+SDL_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release/
+SDL_TTF_LICENSE = zlib
+SDL_TTF_LICENSE_FILES = COPYING
 
 SDL_TTF_INSTALL_STAGING = YES
 SDL_TTF_DEPENDENCIES = sdl freetype
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 2/3 sdl_mixer: bump to version 1.2.12

---
 package/sdl_mixer/sdl_mixer.mk |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
package/sdl_mixer/sdl_mixer.mk +6 -3
index 411b65d..a062c35 100644
@@ -3,9 +3,12 @@
 # SDL_mixer
 #
 #############################################################
-SDL_MIXER_VERSION:=1.2.11
-SDL_MIXER_SOURCE:=SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
-SDL_MIXER_SITE:=http://www.libsdl.org/projects/SDL_mixer/release/
+
+SDL_MIXER_VERSION = 1.2.12
+SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
+SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release/
+SDL_MIXER_LICENSE = zlib
+SDL_MIXER_LICENSE_FILES = COPYING
 
 SDL_MIXER_INSTALL_STAGING = YES
 SDL_MIXER_DEPENDENCIES = sdl
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 2/3 sdl_mixer: bump to version 1.2.12

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gilles" == Gilles Talis <[email protected]> writes:

Gilles> Signed-off-by: Gilles Talis <[email protected]>

Committed, thanks.

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

PATCH 3/3 sdl_gfx: bump to version 2.0.24

In reply to Gilles Talis
---
 package/sdl_gfx/sdl_gfx.mk |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
package/sdl_gfx/sdl_gfx.mk +4 -1
index c1c7f91..440e7ea 100644
@@ -3,9 +3,12 @@
 # SDL_gfx addon for SDL
 #
 #############################################################
-SDL_GFX_VERSION = 2.0.19
+
+SDL_GFX_VERSION = 2.0.24
 SDL_GFX_SOURCE = SDL_gfx-$(SDL_GFX_VERSION).tar.gz
 SDL_GFX_SITE = http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+SDL_GFX_LICENSE = zlib
+SDL_GFX_LICENSE_FILES = COPYING LICENSE
 SDL_GFX_INSTALL_STAGING = YES
 SDL_GFX_DEPENDENCIES = sdl
 SDL_GFX_CONF_OPT = \
Signature · 1 line
1.7.4.1
#4 lore raw

PATCH 3/3 sdl_gfx: bump to version 2.0.24

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gilles" == Gilles Talis <[email protected]> writes:

Gilles> Signed-off-by: Gilles Talis <[email protected]>

I'm having problems building 2.0.24, as it ends up trying to run aclocal during the build step:

Quoted 1 line
Quoted 1 line
Quoted 1 line

sdl_gfx 2.0.24 Building

PATH="/home/peko/source/buildroot/testsdl/host/bin:/home/peko/source/buildroot/testsdl/host/usr/bin:/home/peko/source/buildroot/testsdl/host/usr/sbin/:/home/peko/bin:/home/peko/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/opt/barco/current/usr/bin:/opt/barco/current/usr/bin" PERLLIB="/home/peko/source/buildroot/testsdl/host/usr/lib/perl" /usr/bin/make -j8 -C /home/peko/source/buildroot/testsdl/build/sdl_gfx-2.0.24/ CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash
/home/peko/source/buildroot/testsdl/build/sdl_gfx-2.0.24/missing --run
aclocal-1.11 -I m4

I haven't figured out why yet. 2.0.23 builds fine and I don't see any significant changes to the build system between 23 and 24 (besides that aclocal.m4 has been generated by a newer aclocal version).

So I've changed it to use 2.0.23 for now instead.

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

PATCH 3/3 sdl_gfx: bump to version 2.0.24

finally found some time to look into this.
The issue comes from the fact that even though aclocal.m4 and configure.inare identical across 2.0.23 and 2.0.24, configure.in timestamp has changed, making it newer than aclocal.m4. This leads "make" to try and re-generate aclocal.m4.
I am not expert enough in aclocal and m4 to fix the missing variables issue. The only quick & dirty workaround I have found is to change configure.in file timestamp to what it was in 2.0.23 (touch -t .....).

Would it be an acceptable patch to bump sdl_gfx to 2.0.24?

thanks
Gilles.

2013/1/19 Peter Korsgaard <[email protected]>

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gilles" == Gilles Talis <[email protected]> writes:

Gilles> Signed-off-by: Gilles Talis <[email protected]>

I'm having problems building 2.0.24, as it ends up trying to run aclocal during the build step:

Quoted 1 line
Quoted 1 line
Quoted 1 line

sdl_gfx 2.0.24 Building

PATH="/home/peko/source/buildroot/testsdl/host/bin:/home/peko/source/buildroot/testsdl/host/usr/bin:/home/peko/source/buildroot/testsdl/host/usr/sbin/:/home/peko/bin:/home/peko/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/opt/barco/current/usr/bin:/opt/barco/current/usr/bin" PERLLIB="/home/peko/source/buildroot/testsdl/host/usr/lib/perl"
/usr/bin/make -j8 -C
/home/peko/source/buildroot/testsdl/build/sdl_gfx-2.0.24/
CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash
/home/peko/source/buildroot/testsdl/build/sdl_gfx-2.0.24/missing --run
aclocal-1.11 -I m4

Quoted 9 lines

I haven't figured out why yet. 2.0.23 builds fine and I don't see any significant changes to the build system between 23 and 24 (besides that aclocal.m4 has been generated by a newer aclocal version).

So I've changed it to use 2.0.23 for now instead.

--
Bye, Peter Korsgaard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130124/ee856b0d/attachment-0001.html>

#6 lore raw

PATCH 3/3 sdl_gfx: bump to version 2.0.24

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gilles" == Gilles Talis <[email protected]> writes:

Gilles> finally found some time to look into this.

Gilles> The issue comes from the fact that even though aclocal.m4 and Gilles> configure.in are identical across 2.0.23 and 2.0.24, Gilles> ?configure.in timestamp has changed, making it newer than Gilles> aclocal.m4. This leads "make" to try and re-generate Gilles> aclocal.m4. I am not expert enough in aclocal and m4 to fix Gilles> the missing variables issue. The only quick & dirty workaround Gilles> I have found is to change configure.in file timestamp to what Gilles> it was in 2.0.23 (touch -t .....).

Gilles> Would it be an acceptable patch to bump sdl_gfx to 2.0.24?

Is there any strong reason to go for 2.0.24 over 23? Perhaps you could bring it up with sdl_gfx and get them to do a 2.0.25 release with aclocal.m4 regenerated?

Signature · 1 line
Bye, Peter Korsgaard