[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-648-g4d9b2d9

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  4d9b2d9bd1c133a81ebb2bfc80fca3628f6336f7 (commit)
       via  e8a79439d8a002ba118c79b1bcbb55271f7f9745 (commit)
      from  ed8e268d9d3f20bf4aa20c533e3f0629f101e16a (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 4d9b2d9bd1c133a81ebb2bfc80fca3628f6336f7
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Mar 12 10:46:18 2015 +0100

    [BUILDROOT] 2015.02: makes apf51test_defconfig build fine

commit e8a79439d8a002ba118c79b1bcbb55271f7f9745
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Mar 12 10:45:15 2015 +0100

    [BUILDROOT] 2015.02: makes slideshow package build again

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

Summary of changes:
 buildroot/configs/apf51test_defconfig              |   10 ++-
 .../034-armadeus-add-slideshow-package.patch       |   76 +++++++++-----------
 2 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 60778e0..8af3204 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -116,10 +116,14 @@ BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_INPUT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
 BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE=y
-BR2_PACKAGE_LIBV4L_V4L2_DBG=y
+BR2_PACKAGE_LIBV4L_UTILS=y
+# BR 2013.11:
+#BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE=y
+#BR2_PACKAGE_LIBV4L_V4L2_DBG=y
 BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
+BR2_PACKAGE_LUA_READLINE=y
+# BR 2013.11:
+#BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
 BR2_PACKAGE_PYTHON=y
 BR2_PACKAGE_PYTHON_READLINE=y
 BR2_PACKAGE_PYTHON_PYGAME=y
diff --git a/patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch
index 0e48ee8..af98643 100644
--- a/patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch
+++ b/patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch
@@ -4,20 +4,20 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -195,6 +195,7 @@ comment "Graphic applications"
-	source "package/jhead/Config.in"
-	source "package/mesa3d-demos/Config.in"
-	source "package/rrdtool/Config.in"
+--- buildroot.orig/package/Config.in	2015-03-12 09:50:41.996444715 +0100
++++ buildroot/package/Config.in	2015-03-12 10:23:35.000000000 +0100
+@@ -197,6 +197,7 @@
+ 	source "package/mesa3d-demos/Config.in"
+ 	source "package/qt5cinex/Config.in"
+ 	source "package/rrdtool/Config.in"
 +	source "package/slideshow/Config.in"
-
+ 
  comment "Graphic libraries"
-	source "package/cegui06/Config.in"
+ 	source "package/cegui06/Config.in"
 Index: buildroot/package/slideshow/Config.in
 ===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/Config.in
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/Config.in	2015-03-12 09:50:41.992444715 +0100
 @@ -0,0 +1,8 @@
 +config BR2_PACKAGE_SLIDESHOW
 +	bool "Slideshow"
@@ -29,52 +29,44 @@ Index: buildroot/package/slideshow/Config.in
 +	  http://www.xmission.com/~jstanley/slideshow.html
 Index: buildroot/package/slideshow/slideshow.mk
 ===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow.mk
-@@ -0,0 +1,39 @@
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow.mk	2015-03-12 10:22:50.624512814 +0100
+@@ -0,0 +1,31 @@
 +#############################################################
 +#
 +# slideshow
 +#
 +#############################################################
 +
-+SLIDESHOW_VERSION:=1.1
-+SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
-+SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++SLIDESHOW_VERSION = 1.1
++SLIDESHOW_SOURCE = slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE = http://www.xmission.com/~jstanley/
 +
 +SLIDESHOW_DEPENDENCIES += sdl sdl_image
 +
++# -a option is to remove win*$! carriage return (^W)
++define SLIDESHOW_EXTRACT_CMDS
++	$(UNZIP) -a -d $(BUILD_DIR) $(DL_DIR)/$(SLIDESHOW_SOURCE)
++	mv $(BUILD_DIR)/slideshow/* $(@D)
++	rm -rf $(BUILD_DIR)/slideshow/
++endef
++
 +define SLIDESHOW_BUILD_CMDS
-+	$(MAKE) CC="$(TARGET_CXX)" CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++	$(MAKE) CC="$(TARGET_CXX)" \
++		CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
 +		LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
-+		-C $(SLIDESHOW_DIR)
++		-C $(@D)
 +endef
 +
 +define SLIDESHOW_INSTALL_TARGET_CMDS
 +	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
-+
 +$(eval $(generic-package))
-+
-+# BR currently doesn't support .zip archive, so do extraction manually:
-+$(SLIDESHOW_TARGET_EXTRACT): $(SLIDESHOW_TARGET_SOURCE)
-+	$(call MESSAGE,"Extracting")
-+	unzip $(DL_DIR)/$($(PKG)_SOURCE) -d $(BUILD_DIR)
-+	mv $(BUILD_DIR)/slideshow/* $(BUILD_DIR)/slideshow-$(SLIDESHOW_VERSION)/
-+	rm -rf $(BUILD_DIR)/slideshow
-+	touch $@
 Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
 ===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch	2015-03-12 09:50:41.992444715 +0100
 @@ -0,0 +1,19 @@
 +Signed-off-by: Julien Boibessot <jul...@ar...>
 +
@@ -97,8 +89,8 @@ Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
 + 	return true;
 Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
 ===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch	2015-03-12 09:50:41.992444715 +0100
 @@ -0,0 +1,13 @@
 +--- slideshow.org/SDLFont.cpp	2007-11-17 19:25:02.000000000 +0100
 ++++ slideshow/SDLFont.cpp	2007-11-17 20:06:20.000000000 +0100
@@ -115,8 +107,8 @@ 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
-+++ 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	2015-03-12 09:50:41.992444715 +0100
 @@ -0,0 +1,28 @@
 +On recent gcc some includes are needed to have string stuff defined.
 +
@@ -148,8 +140,8 @@ Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_rece
 +
 Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
 ===================================================================
---- /dev/null
-+++ 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	2015-03-12 09:50:41.992444715 +0100
 @@ -0,0 +1,17 @@
 +Otherwise crashes on APF27.
 +


hooks/post-receive
-- 
armadeus


