[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-475-g7b266ec

[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  7b266ecbdf985d6a794cb2399dc896d32bc62883 (commit)
       via  a9c8dcb8839c6543211052bf94276ee2e7e0fc9a (commit)
      from  744a772d24d0a7fa2ed97acd1014d4e86910ed02 (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 7b266ecbdf985d6a794cb2399dc896d32bc62883
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 8 10:15:43 2012 +0200

    [TOOLS] makes load_fpga return an error when loading fails at final stage

commit a9c8dcb8839c6543211052bf94276ee2e7e0fc9a
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 8 10:11:46 2012 +0200

    [BUILDROOT] Fixes madplay build problem on apf9328test

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

Summary of changes:
 buildroot/configs/apf9328test_defconfig            |    1 +
 .../2012.02/191-madplay-requires_libintl.patch     |   29 ++++++++++++++++++++
 .../linux/modules/fpga/dev_tools/loader/load_fpga  |    3 +-
 3 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 patches/buildroot/2012.02/191-madplay-requires_libintl.patch

diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index f520956..f9807e1 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -63,6 +63,7 @@ BR2_PACKAGE_MADPLAY=y
 BR2_PACKAGE_MPLAYER=y
 BR2_PACKAGE_LTRACE=y
 BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_LIBINTL=y
 BR2_PACKAGE_FBGRAB=y
 BR2_PACKAGE_FBTEST=y
 BR2_PACKAGE_FBV=y
diff --git a/patches/buildroot/2012.02/191-madplay-requires_libintl.patch b/patches/buildroot/2012.02/191-madplay-requires_libintl.patch
new file mode 100644
index 0000000..d98ec79
--- /dev/null
+++ b/patches/buildroot/2012.02/191-madplay-requires_libintl.patch
@@ -0,0 +1,29 @@
+Otherwise compilation fails (in intl/relocatable.c)
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/madplay/Config.in
+===================================================================
+--- buildroot.orig/package/multimedia/madplay/Config.in	2012-08-08 09:56:30.000000000 +0200
++++ buildroot/package/multimedia/madplay/Config.in	2012-08-08 09:57:12.000000000 +0200
+@@ -2,6 +2,7 @@
+ 	bool "madplay"
+ 	select BR2_PACKAGE_LIBMAD
+ 	select BR2_PACKAGE_LIBID3TAG
++	select BR2_PACKAGE_LIBINTL
+ 	help
+ 	  Command-line front-end to libmad, a high-quality MPEG audio decoder.
+ 	  It currently supports MPEG-1 and the MPEG-2 extension to lower
+Index: buildroot/package/multimedia/madplay/madplay.mk
+===================================================================
+--- buildroot.orig/package/multimedia/madplay/madplay.mk	2012-08-08 10:04:31.000000000 +0200
++++ buildroot/package/multimedia/madplay/madplay.mk	2012-08-08 10:04:51.000000000 +0200
+@@ -7,7 +7,7 @@
+ MADPLAY_SOURCE:=madplay-$(MADPLAY_VERSION).tar.gz
+ MADPLAY_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad
+ MADPLAY_LIBTOOL_PATCH=NO
+-MADPLAY_DEPENDENCIES=libmad libid3tag
++MADPLAY_DEPENDENCIES=libmad libid3tag libintl
+ 
+ # Check if ALSA is built, then we should configure after alsa-lib so
+ # ./configure can find alsa-lib.
diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index dc06a7d..379ca63 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -57,10 +57,11 @@ else
 fi
 
 dd if=$BITFILE of=/dev/fpgaloader
+RES=$?
 
 if [ "$PLATFORM" == "APF51" ]; then
 	rm $BITFILE	# delete copy in RAM
 fi
 
-exit 0
+exit $RES
 


hooks/post-receive
-- 
armadeus