[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-346-g034bf43

[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  034bf43cbdf0422284d11d0795820d1ad81d2403 (commit)
      from  8b63e6fb540365e17afefcef27b8c04d68125ea9 (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 034bf43cbdf0422284d11d0795820d1ad81d2403
Author: Fabien Marteau <fab...@ar...>
Date:   Wed May 12 09:17:47 2010 +0200

    [buildroot] Adding camera capture tool in demos package

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

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

diff --git a/buildroot/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index d3f89ad..5e204ff 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -42,6 +42,14 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
 	help
 	  SDL based 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.
+
 config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
 	bool "Oscilloscope"
 	help
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index 75ee690..8c41002 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -25,6 +25,10 @@ ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPIO),y)
 ARMADEUS-DEMOS_SUBDIRS+=gpio
 endif
 
+ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE),y)
+ARMADEUS-DEMOS_SUBDIRS+=capture
+endif
+
 ifeq ($(BR2_PACKAGE_ARMADEUS_DEMOS_GPS),y)
 ARMADEUS-DEMOS_SUBDIRS+=gps
 endif


hooks/post-receive
-- 
armadeus