Merge branch 'master' into chromium

config/platforms/arm/imx6/machines/cuboxi/packages/linux/meta

@@ -1,7 +1,6 @@
 PKG_URL_PROTO=git
-PKG_URL_REV=06c3dc6
-PKG_URL_BRANCH=linux-linaro-lsk-v3.14-mx6
+PKG_URL_REV=4354226
 PKG_VERSION=imx_3.14.14_linaro-stable+${PKG_URL_REV}
 PKG_URL="https://github.com/linux4kix/linux-linaro-stable-mx6.git"
-PKG_REV=2
+PKG_REV=1
 

config/platforms/arm/imx6/machines/cuboxi/packages/linux/patches/1100-ARM-Avoid-crash-on-power-off-and-reduce-power-consum.patch

@@ -0,0 +1,65 @@
+From 7a4bc357a0d2477c0dcdf2a1c471e57050dec041 Mon Sep 17 00:00:00 2001
+From: Rudi <r.ihle@s-t.de>
+Date: Sat, 20 Sep 2014 14:05:50 +0200
+Subject: [PATCH] ARM: Avoid crash on power off and reduce power consumption
+ in 'halt' state.
+
+Signed-off-by: Rudi <r.ihle@s-t.de>
+---
+ arch/arm/kernel/process.c |   19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
+index 1bdd78b..70655b9 100644
+--- a/arch/arm/kernel/process.c
++++ b/arch/arm/kernel/process.c
+@@ -119,6 +119,17 @@ static void null_restart(enum reboot_mode reboot_mode, const char *cmd)
+ }
+
+ /*
++ *  Enter non-interruptable CPU halt state
++ */
++static void cpu_halt(void)
++{
++	local_irq_disable();
++	
++	while (1)
++		cpu_do_idle();
++}
++
++/*
+  * Function pointers to optional machine specific functions
+  */
+ void (*pm_power_off)(void);
+@@ -202,8 +213,7 @@ void machine_halt(void)
+ 	local_irq_disable();
+ 	smp_send_stop();
+
+-	local_irq_disable();
+-	while (1);
++	cpu_halt();
+ }
+
+ /*
+@@ -219,6 +229,8 @@ void machine_power_off(void)
+
+ 	if (pm_power_off)
+ 		pm_power_off();
++	
++	cpu_halt();
+ }
+
+ /*
+@@ -244,8 +256,7 @@ void machine_restart(char *cmd)
+
+ 	/* Whoops - the platform was unable to reboot. Tell the user! */
+ 	printk("Reboot failed -- System halted\n");
+-	local_irq_disable();
+-	while (1);
++	cpu_halt();
+ }
+
+ void __show_regs(struct pt_regs *regs)
+-- 
+1.7.9.5
+

config/platforms/arm/imx6/machines/cuboxi/packages/linux/patches/1101-ARM-Disable-timer-events-before-entering-halt-state.patch

@@ -0,0 +1,59 @@
+From ae0f301a11bb9d5e484d48238cf15082928a7241 Mon Sep 17 00:00:00 2001
+From: Rudi <r.ihle@s-t.de>
+Date: Sun, 21 Sep 2014 13:53:21 +0200
+Subject: [PATCH 1101/1101] ARM: Disable timer events before entering `halt'
+ state.
+
+Signed-off-by: Rudi <r.ihle@s-t.de>
+---
+ arch/arm/kernel/process.c |    3 ++-
+ arch/arm/mach-imx/time.c  |   11 +++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
+index 70655b9..d1e4763 100644
+--- a/arch/arm/kernel/process.c
++++ b/arch/arm/kernel/process.c
+@@ -123,8 +123,9 @@ static void null_restart(enum reboot_mode reboot_mode, const char *cmd)
+  */
+ static void cpu_halt(void)
+ {
++	clockevents_suspend();
++
+ 	local_irq_disable();
+-	
+ 	while (1)
+ 		cpu_do_idle();
+ }
+diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
+index ae61dfd..75afcf9 100644
+--- a/arch/arm/mach-imx/time.c
++++ b/arch/arm/mach-imx/time.c
+@@ -232,6 +232,16 @@ static void mxc_set_mode(enum clock_event_mode mode,
+ 	}
+ }
+
++
++/*
++ * Shutdown timer
++ */
++static void mxc_suspend(struct clock_event_device *evt)
++{
++	mxc_set_mode(CLOCK_EVT_MODE_SHUTDOWN, evt);
++}
++
++
+ /*
+  * IRQ handler for the timer
+  */
+@@ -262,6 +272,7 @@ static struct clock_event_device clockevent_mxc = {
+ 	.name		= "mxc_timer1",
+ 	.features	= CLOCK_EVT_FEAT_ONESHOT,
+ 	.set_mode	= mxc_set_mode,
++	.suspend	= mxc_suspend,
+ 	.set_next_event	= mx1_2_set_next_event,
+ 	.rating		= 200,
+ };
+-- 
+1.7.9.5
+

packages/misc/boblight/unit/boblightd.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Boblightd service
+After=graphical.target
+
+[Service]
+ExecStart=/usr/bin/boblightd
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=xbmc.target

packages/multimedia/ffmpeg/patches/01_sdl-config.diff

@@ -1,11 +1,11 @@
---- ffmpeg-0.11/configure.orig	2012-05-25 21:02:15.000000000 +0300
-+++ ffmpeg-0.11/configure	2012-06-03 23:55:31.870186439 +0300
-@@ -3261,7 +3261,7 @@
+--- a/configure	2014-01-15 18:53:59.000000000 +0100
++++ b/configure	2014-09-14 19:34:23.668418987 +0200
+@@ -4366,7 +4366,7 @@
      die "ERROR: No version of libdc1394 found "
  fi
 
 -SDL_CONFIG="${cross_prefix}sdl-config"
 +SDL_CONFIG="sdl-config"
  if check_pkg_config sdl SDL_events.h SDL_PollEvent; then
      check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
-     enable sdl &&
+     check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&

packages/multimedia/ffmpeg/patches/02_arm-target-flags.diff

@@ -0,0 +1,24 @@
+--- a/configure	2014-09-14 19:22:19.480440387 +0200
++++ b/configure	2014-09-14 19:31:25.716424247 +0200
+@@ -3294,16 +3294,17 @@
+             subarch=$(echo $cpu | sed 's/[^a-z0-9]//g')
+         ;;
+         *)
+-            cpuflags="-mcpu=$cpu"
+             case $cpu in
+-                cortex-a*)                               subarch=armv7a  ;;
+-                cortex-r*)                               subarch=armv7r  ;;
+-                cortex-m*)                 enable thumb; subarch=armv7m  ;;
++                cortex-a*)                               subarch=armv7-a ;;
++                cortex-r*)                               subarch=armv7-r ;;
++                cortex-m*)                 enable thumb; subarch=armv7-m ;;
+                 arm11*)                                  subarch=armv6   ;;
+                 arm[79]*e*|arm9[24]6*|arm96*|arm102[26]) subarch=armv5te ;;
+                 armv4*|arm7*|arm9[24]*)                  subarch=armv4   ;;
+                 *)                             subarch=$(probe_arm_arch) ;;
+             esac
++            cpuflags="-march=$subarch -mtune=$cpu"
++            subarch=$(echo $subarch | sed 's/-//g')
+         ;;
+     esac
+

scripts/get

@@ -74,7 +74,7 @@ if [ "$DL" = yes ]; then
 
   set_title "GET      $1"
 
-  WGET_OPT="--no-check-certificate --passive-ftp --dns-timeout=5 --connect-timeout=5 --read-timeout=5 --tries=1 -c"
+  WGET_OPT="--no-check-certificate --passive-ftp --dns-timeout=50 --connect-timeout=50 --read-timeout=50 --tries=1 -c"
   [ "$VERBOSE" != yes ] && WGET_OPT="$WGET_OPT -q"
 
   mkdir -p $SOURCES/$1