[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-39-g8a4a868

[Julien B a. A. <ar...@us...>]

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  8a4a868e5f4796162d70a8e23cb3916e8c483c1a (commit)
      from  942fa6e8d15e96782d0f2b9f7178d4b603e6e061 (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 8a4a868e5f4796162d70a8e23cb3916e8c483c1a
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Dec 11 10:51:11 2009 +0100

    [BUILDROOT] Add missing dependancies to demos

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

Summary of changes:
 buildroot/package/armadeus/demos/demos.mk          |   16 +++++++++++++++-
 .../093-sdl_ttf-add_freetype_dependancy.patch      |   17 +++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch

diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index dd8edc6..b268d1f 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -13,10 +13,12 @@ ARMADEUS-DEMOS_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID),y)
 ARMADEUS-DEMOS_SUBDIRS+=armanoid
+ARMADEUS-DEMOS_DEPS=sdl
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT),y)
 ARMADEUS-DEMOS_SUBDIRS+=backlight_control
+ARMADEUS-DEMOS_DEPS=sdl
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPIO),y)
@@ -29,10 +31,12 @@ endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_INPUT),y)
 ARMADEUS-DEMOS_SUBDIRS+=input_test
+ARMADEUS-DEMOS_DEPS=sdl
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
 ARMADEUS-DEMOS_SUBDIRS+=music_player
+ARMADEUS-DEMOS_DEPS=sdl
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO),y)
@@ -41,10 +45,20 @@ endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
 ARMADEUS-DEMOS_SUBDIRS+=show_image
+ARMADEUS-DEMOS_DEPS=sdl
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD),y)
 ARMADEUS-DEMOS_SUBDIRS+=test_lcd
+ARMADEUS-DEMOS_DEPS=sdl
+endif
+
+
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER),y)
+ARMADEUS-DEMOS_DEPS+=sdl_ttf sdl_mixer
+endif
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE),y)
+ARMADEUS-DEMOS_DEPS+=sdl_image
 endif
 
 
@@ -74,7 +88,7 @@ $(ARMADEUS-DEMOS_DIR)/.installed: $(ARMADEUS-DEMOS_DIR)/.compiled
         done
 	touch $@
 
-armadeus-demos: $(ARMADEUS-DEMOS_DIR)/.installed
+armadeus-demos: $(ARMADEUS-DEMOS_DEPS) $(ARMADEUS-DEMOS_DIR)/.installed
 
 armadeus-demos-clean:
 	rm -rf $(ARMADEUS-DEMOS_TARGET_DIR)
diff --git a/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
new file mode 100644
index 0000000..bd7560c
--- /dev/null
+++ b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
@@ -0,0 +1,17 @@
+SDL_ttf needs freetype to be built and installed first.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/sdl_ttf/sdl_ttf.mk
+===================================================================
+--- buildroot.orig/package/sdl_ttf/sdl_ttf.mk	2009-12-11 10:14:53.000000000 +0100
++++ buildroot/package/sdl_ttf/sdl_ttf.mk	2009-12-11 10:15:09.000000000 +0100
+@@ -60,7 +60,7 @@
+ 	cp -dpf $(STAGING_DIR)/usr/lib/libSDL_ttf*.so* $(TARGET_DIR)/usr/lib/
+ 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL_ttf.so
+ 
+-sdl_ttf: uclibc sdl $(TARGET_DIR)/usr/lib/libSDL_ttf.so
++sdl_ttf: uclibc sdl freetype $(TARGET_DIR)/usr/lib/libSDL_ttf.so
+ 
+ sdl_ttf-clean:
+ 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_TTF_DIR) uninstall


hooks/post-receive
-- 
armadeus