[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-86-g9cbe656

[jorasse <jo...@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  9cbe656904eeda7ab650686da746b934fe7cde6e (commit)
      from  b0b1722b1c04700f2ccc133f3776f79844cadba3 (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 9cbe656904eeda7ab650686da746b934fe7cde6e
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Dec 25 17:01:44 2012 +0100

    [BUILDROOT] 2012.11: clean-up URG package for BR upstream integration. Thx Smartin

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

Summary of changes:
 .../buildroot/2012.11/122-urg-add_package.patch    |   72 ++++++++++++-------
 1 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/patches/buildroot/2012.11/122-urg-add_package.patch b/patches/buildroot/2012.11/122-urg-add_package.patch
index b7fcf25..7012fc7 100644
--- a/patches/buildroot/2012.11/122-urg-add_package.patch
+++ b/patches/buildroot/2012.11/122-urg-add_package.patch
@@ -1,23 +1,33 @@
 Add URG sensors control library to BR.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/Config.in     |  1 +
+ package/urg/Config.in |  9 +++++++++
+ package/urg/urg.mk    | 26 ++++++++++++++++++++++++++
+ 3 files changed, 36 insertions(+)
+ create mode 100644 package/urg/Config.in
+ create mode 100644 package/urg/urg.mk
 
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:45:30.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:45:33.000000000 +0100
-@@ -235,6 +235,7 @@
- source "package/squashfs3/Config.in"
- source "package/sshfs/Config.in"
- source "package/unionfs/Config.in"
+diff --git a/package/Config.in b/package/Config.in
+index c530305..45ccbcf 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -426,6 +426,7 @@ source "package/libv4l/Config.in"
+ source "package/mtdev/Config.in"
+ source "package/neardal/Config.in"
+ source "package/pcsc-lite/Config.in"
 +source "package/urg/Config.in"
- source "package/xfsprogs/Config.in"
  endmenu
  
-Index: buildroot/package/urg/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/urg/Config.in	2012-02-21 16:45:33.000000000 +0100
+ menu "Javascript"
+diff --git a/package/urg/Config.in b/package/urg/Config.in
+new file mode 100644
+index 0000000..9dd13bf
+--- /dev/null
++++ b/package/urg/Config.in
 @@ -0,0 +1,9 @@
 +config BR2_PACKAGE_URG
 +	bool "urg library"
@@ -28,29 +38,37 @@ Index: buildroot/package/urg/Config.in
 +	  Requires SDL & SDL_net.
 +
 +	  http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
-Index: buildroot/package/urg/urg.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/urg/urg.mk	2012-02-21 16:45:33.000000000 +0100
-@@ -0,0 +1,21 @@
+diff --git a/package/urg/urg.mk b/package/urg/urg.mk
+new file mode 100644
+index 0000000..d5b752a
+--- /dev/null
++++ b/package/urg/urg.mk
+@@ -0,0 +1,26 @@
 +#############################################################
 +#
 +# urg library
 +#
 +#############################################################
-+URG_VERSION = 0.8.11
++URG_VERSION = 0.8.18
 +URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
-+URG_SOURCE = urg-$(URG_VERSION).tar.gz
-+URG_LIBTOOL_PATCH = NO
++URG_SOURCE = urg-$(URG_VERSION).zip
++URG_LICENSE = LGPLv3
++URG_LICENSE_FILES = COPYING
++
 +URG_INSTALL_STAGING = YES
-+URG_INSTALL_TARGET = YES
++
++URG_DEPENDENCIES = sdl sdl_net
 +
 +URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 +		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
 +
-+$(eval $(autotools-package))
-+
-+$(URG_HOOK_POST_EXTRACT):
-+	@$(call MESSAGE,"Post extracting")
-+	chmod a+x $(URG_DIR)/configure
++define URG_EXTRACT_CMDS
++	$(RM) -rf $(URG_DIR)
++	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
++	test -d $(URG_DIR) || \
++		mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
++endef
 +
++$(eval $(autotools-package))
+-- 
+1.8.0.1


hooks/post-receive
-- 
armadeus