[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-280-g36382b6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  36382b6bb5c84b4e1996922874bee30b7e47567d (commit)
       via  417fd4b48faa35f9a58a4dddd1962530bed96979 (commit)
      from  7e7bd077d994b5d685ef94ac9916f56ee8e427b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 36382b6bb5c84b4e1996922874bee30b7e47567d
Author: Julien Boibessot <jul...@ar...>
Date:   Sat Jul 2 15:43:23 2011 +0200

    [BUILDROOT] Fixes SDL crash in slideshow (temporary)

commit 417fd4b48faa35f9a58a4dddd1962530bed96979
Author: Julien Boibessot <jul...@ar...>
Date:   Sat Jul 2 13:36:15 2011 +0200

    [BUILDROOT] Add gdb on target option in apf27test_defconfig

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf27test_defconfig         |    4 +-
 patches/buildroot/2010.11/034-slideshow.patch |   40 +++++++++++++++++++++---
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 79e9b2c..e620c8e 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Buildroot version: 2010.11
-# Fri Jul  1 15:50:55 2011
+# Sat Jul  2 11:33:01 2011
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_arm=y
@@ -172,7 +172,7 @@ BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 #
 # Gdb Options
 #
-# BR2_PACKAGE_GDB is not set
+BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
 BR2_GDB_VERSION_6_7_1=y
diff --git a/patches/buildroot/2010.11/034-slideshow.patch b/patches/buildroot/2010.11/034-slideshow.patch
index 1cc3d52..5b074ed 100644
--- a/patches/buildroot/2010.11/034-slideshow.patch
+++ b/patches/buildroot/2010.11/034-slideshow.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 Index: buildroot/package/Config.in
 ===================================================================
 --- buildroot.orig/package/Config.in	2011-07-01 17:40:50.000000000 +0200
-+++ buildroot/package/Config.in	2011-07-01 21:32:32.000000000 +0200
++++ buildroot/package/Config.in	2011-07-02 13:22:14.000000000 +0200
 @@ -113,6 +113,7 @@
  source "package/sdl_net/Config.in"
  source "package/sdl_ttf/Config.in"
@@ -30,8 +30,8 @@ Index: buildroot/package/slideshow/Config.in
 Index: buildroot/package/slideshow/slideshow.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow.mk	2011-07-01 21:32:17.000000000 +0200
-@@ -0,0 +1,35 @@
++++ buildroot/package/slideshow/slideshow.mk	2011-07-02 11:49:00.000000000 +0200
+@@ -0,0 +1,39 @@
 +#############################################################
 +#
 +# slideshow
@@ -54,6 +54,10 @@ Index: buildroot/package/slideshow/slideshow.mk
 +	cp -dpf $(SLIDESHOW_DIR)/slideshow $(TARGET_DIR)/usr/bin
 +endef
 +
++define SLIDESHOW_CLEAN_CMDS
++	$(MAKE) clean -C $(SLIDESHOW_DIR)
++endef
++
 +define SLIDESHOW_UNINSTALL_TARGET_CMDS
 +	rm -f $(TARGET_DIR)/usr/bin/slideshow
 +endef
@@ -166,8 +170,12 @@ Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
 Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch	2011-07-01 19:02:28.000000000 +0200
-@@ -0,0 +1,24 @@
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch	2011-07-02 13:29:28.000000000 +0200
+@@ -0,0 +1,28 @@
++On recent gcc some includes are needed to have string stuff defined.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
 +Index: slideshow-1.1/file_list.cpp
 +===================================================================
 +--- slideshow-1.1.orig/file_list.cpp	2011-07-01 18:58:49.000000000 +0200
@@ -192,3 +200,25 @@ Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_rece
 + #include "SDL.h"
 + #include "cache.h"
 + 
+Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch	2011-07-02 13:24:02.000000000 +0200
+@@ -0,0 +1,17 @@
++Otherwise crashes on APF27.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++Index: slideshow-1.1/slideshow.cpp
++===================================================================
++--- slideshow-1.1.orig/slideshow.cpp	2011-07-02 13:19:00.000000000 +0200
+++++ slideshow-1.1/slideshow.cpp	2011-07-02 13:19:17.000000000 +0200
++@@ -416,7 +416,7 @@
++ 	else
++ 		flags |= SDL_FULLSCREEN;
++ 
++-	m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 32, flags);
+++	m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 16 /*32*/, flags);
++ 
++ 	if ( !m_sdl )
++ 	{


hooks/post-receive
-- 
armadeus


