3 files changed, 76 insertions, 3 deletions

diff --git a/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
index bd22b9b5d..b3fdd6801 100644
--- a/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
+++ b/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
@@ -3,4 +3,5 @@ RDEPENDS_${PN} += " \
     nativesdk-mxsldr \
     nativesdk-u-boot-mkimage \
     nativesdk-imx-usb-loader \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
 "
diff --git a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
new file mode 100755
index 000000000..3cbd55a20
--- /dev/null
+++ b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
@@ -0,0 +1,69 @@
+From af227bfcf02c5dd446e670f8367761a63c1b531f Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@freescale.com>
+Date: Tue, 10 May 2016 15:09:26 +0800
+Subject: [PATCH 2/2] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED
+
+The resume function don't update the dmix->state, if store SUSPENDED
+state in snd_pcm_dmix_state, the write function after resume will
+return error -ESTRPIPE, because the snd_pcm_write_areas() will check
+the state of the pcm device.
+This patch remove the store SND_PCM_STATE_SUSPENDED state operation
+for dmix,dshare,dsnoop.
+
+Upstream-Status: Pending
+
+Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
+---
+ src/pcm/pcm_dmix.c   | 2 +-
+ src/pcm/pcm_dshare.c | 2 +-
+ src/pcm/pcm_dsnoop.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
+index b26a5c7..bd35d73 100644
+--- a/src/pcm/pcm_dmix.c
++++ b/src/pcm/pcm_dmix.c
+@@ -451,9 +451,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm)
+        state = snd_pcm_state(dmix->spcm);
+        switch (state) {
+        case SND_PCM_STATE_XRUN:
+-       case SND_PCM_STATE_SUSPENDED:
+        case SND_PCM_STATE_DISCONNECTED:
+                dmix->state = state;
++       case SND_PCM_STATE_SUSPENDED:
+                return state;
+        default:
+                break;
+diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
+index 58e47bb..433b100 100644
+--- a/src/pcm/pcm_dshare.c
++++ b/src/pcm/pcm_dshare.c
+@@ -241,9 +241,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm)
+        state = snd_pcm_state(dshare->spcm);
+        switch (state) {
+        case SND_PCM_STATE_XRUN:
+-       case SND_PCM_STATE_SUSPENDED:
+        case SND_PCM_STATE_DISCONNECTED:
+                dshare->state = state;
++       case SND_PCM_STATE_SUSPENDED:
+                return state;
+        default:
+                break;
+diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
+index 576c35b..a3b221f 100644
+--- a/src/pcm/pcm_dsnoop.c
++++ b/src/pcm/pcm_dsnoop.c
+@@ -205,9 +205,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
+        state = snd_pcm_state(dsnoop->spcm);
+        switch (state) {
+        case SND_PCM_STATE_XRUN:
+-       case SND_PCM_STATE_SUSPENDED:
+        case SND_PCM_STATE_DISCONNECTED:
+                dsnoop->state = state;
++       case SND_PCM_STATE_SUSPENDED:
+                return state;
+        default:
+                break;
+-- 
+1.9.1
+
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 92b613c7e..0bb2c1cdb 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -1,8 +1,11 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_mx6 = " file://0001-add-conf-for-multichannel-support-in-imx.patch"
-SRC_URI_append_mx6ul = " file://0001-add-conf-for-multichannel-support-in-imx.patch"
-SRC_URI_append_mx7 = " file://0001-add-conf-for-multichannel-support-in-imx.patch"
+IMX_PATCH = " file://0001-add-conf-for-multichannel-support-in-imx.patch \
+              file://0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch"
+
+SRC_URI_append_mx6 = "${IMX_PATCH}"
+SRC_URI_append_mx6ul = "${IMX_PATCH}"
+SRC_URI_append_mx7 = "${IMX_PATCH}"
 
 PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
 PACKAGE_ARCH_mx6ul = "${MACHINE_SOCARCH}"