[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-347-g9086a07

[Fabien M <fa...@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  9086a079108a959449b1fd128058c6538a7ed529 (commit)
      from  034bf43cbdf0422284d11d0795820d1ad81d2403 (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 9086a079108a959449b1fd128058c6538a7ed529
Author: Fabien Marteau <fab...@ar...>
Date:   Wed May 12 10:12:33 2010 +0200

    [buildroot] fix some bugs in demos package

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

Summary of changes:
 buildroot/package/armadeus/demos/Config.in |    2 --
 buildroot/package/armadeus/demos/demos.mk  |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index 5e204ff..e15ce36 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -45,8 +45,6 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
 config BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE
 	bool "Camera capture"
 	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_SDL_TTF
-	select BR2_PACKAGE_SDL_MIXER
 	help
         capture and print camera video stream.
 
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index 8c41002..19c6d83 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -26,7 +26,8 @@ ARMADEUS-DEMOS_SUBDIRS+=gpio
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE),y)
-ARMADEUS-DEMOS_SUBDIRS+=capture
+ARMADEUS-DEMOS_SUBDIRS+=camera/capture
+ARMADEUS-DEMOS_DEPS=sdl
 endif
 
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPS),y)


hooks/post-receive
-- 
armadeus