[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-13-g768ab79

[Sébastien S. <ss...@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  768ab796b6f3e506ecf6188982dab9074605a677 (commit)
       via  0e93295657c0dc3083b413d74ff8ea03567f329c (commit)
       via  68cf9efa5bbcdfeb4bb5670af7185dba81c181ca (commit)
       via  ec5766414fca68c86d7304e3b88e6f817501507d (commit)
      from  c97f7e0081ecc356f3cdd338dfdaac16b7f193cc (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 768ab796b6f3e506ecf6188982dab9074605a677
Author: Sébastien Szymanski <ss...@us...>
Date:   Tue Nov 26 17:43:43 2013 +0100

    [BUILDROOT] APF51: fix touchscreen detection in test_touchscreen.sh

commit 0e93295657c0dc3083b413d74ff8ea03567f329c
Author: Sébastien Szymanski <ss...@us...>
Date:   Tue Nov 26 14:09:45 2013 +0100

    [BUILDROOT] test_usb_device: fix backing_file url.

commit 68cf9efa5bbcdfeb4bb5670af7185dba81c181ca
Author: Sébastien Szymanski <ss...@us...>
Date:   Tue Nov 26 11:35:23 2013 +0100

    [BUILDROOT] APF51: add madplay and mplayer packages to apf51test_defconfig

commit ec5766414fca68c86d7304e3b88e6f817501507d
Author: Sébastien Szymanski <ss...@us...>
Date:   Tue Nov 26 09:59:36 2013 +0100

    [BUILDROOT] apf51: fix mplayer compilation

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

Summary of changes:
 buildroot/configs/apf51test_defconfig              |    2 +-
 .../2013.05/214-mplayer-fix-compilation.patch      |   13 +++++++++++++
 target/test/test_touchscreen.sh                    |    2 +-
 target/test/test_usb_device.sh                     |    2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 patches/buildroot/2013.05/214-mplayer-fix-compilation.patch

diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index c5a310f..57e935d 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -65,8 +65,8 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
 BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 BR2_PACKAGE_FFMPEG=y
 BR2_PACKAGE_FFMPEG_FFPLAY=y
+BR2_PACKAGE_MADPLAY=y
 BR2_PACKAGE_MPLAYER=y
-# BR2_PACKAGE_MPLAYER_MPLAYER is not set
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_LMBENCH=y
 BR2_PACKAGE_LTRACE=y
diff --git a/patches/buildroot/2013.05/214-mplayer-fix-compilation.patch b/patches/buildroot/2013.05/214-mplayer-fix-compilation.patch
new file mode 100644
index 0000000..65cb59e
--- /dev/null
+++ b/patches/buildroot/2013.05/214-mplayer-fix-compilation.patch
@@ -0,0 +1,13 @@
+Index: buildroot/package/multimedia/mplayer/mplayer.mk
+===================================================================
+--- buildroot.orig/package/multimedia/mplayer/mplayer.mk
++++ buildroot/package/multimedia/mplayer/mplayer.mk
+@@ -113,7 +113,7 @@ MPLAYER_CONF_OPTS += --enable-armv6
+ endif
+ 
+ ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+-MPLAYER_CONF_OPTS += --enable-neon
++MPLAYER_CONF_OPTS += --enable-armv6
+ endif
+ 
+ ifeq ($(BR2_i386),y)
diff --git a/target/test/test_touchscreen.sh b/target/test/test_touchscreen.sh
index 394a85e..aed1cf8 100755
--- a/target/test/test_touchscreen.sh
+++ b/target/test/test_touchscreen.sh
@@ -23,7 +23,7 @@ load_driver()
 		RES="$?"
 	elif [ "$1" == "APF51" ]; then
 		# driver is in-kernel/static
-		dmesg | grep WM831x
+		grep WM831x $(echo /sys/class/input/event*/device/name)
 		RES="$?"
 	elif [ "$1" == "APF28" ]; then
 		# driver is in-kernel/static
diff --git a/target/test/test_usb_device.sh b/target/test/test_usb_device.sh
index 9ae468f..5b47dd9 100755
--- a/target/test/test_usb_device.sh
+++ b/target/test/test_usb_device.sh
@@ -40,7 +40,7 @@ test_usb_gadget()
 	if [ "$?" == 0 ]; then
 		udhcpc -i eth0
 		echo "Downloading test file from Internet"
-		wget http://dl.free.fr/q9IKqqweK -O $BACKING_FILE
+		wget ftp://ftp2.armadeus.com/armadeusw/download/backing_file.gz -O $BACKING_FILE
 		if [ "$?" != 0 ]; then
 			exit_failed
 		fi


hooks/post-receive
-- 
armadeus