From c5736e58a1cf6fde730a2da7c1e5932ad4a8f446 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 6 Jun 2022 11:27:22 +0200 Subject: alsa-lib: drop not applying patch With the update from v1.2.6.1 to v1.2.7 the patch no longer applies. The patched code sections have been refactored to be provided from a common helper functions [1] and the code has been reworked to better cope with suspend e.g. [2]. As it is unclear how to reproduce what the patch tries to fix just drop the patch for now to keep the recipe building. At least aplay and arecord still work, if aplay is interrupted with a suspend/resume cycle playing restarts on resume. (This on a Apalis iMX6, SGTL5000 codec). [1] https://github.com/alsa-project/alsa-lib/commit/3577a7a26beb74285af776fbd499b519723a955a [2] https://github.com/alsa-project/alsa-lib/commit/b3ce9cb8391654b6924868b0393cc33ef653268b Signed-off-by: Max Krummenacher (cherry picked from commit 2a6149309783401d271e13d6e6cf76135df2fed1) --- ...tore-the-state-for-SND_PCM_STATE_SUSPENDE.patch | 67 ---------------------- recipes-multimedia/alsa/alsa-lib_%.bbappend | 1 - 2 files changed, 68 deletions(-) delete mode 100644 recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch 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 deleted file mode 100644 index 896d9426..00000000 --- a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 09c1a959e7d007e00741606f69444c1f865a4beb Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang -Date: Tue, 10 May 2016 15:09:26 +0800 -Subject: [PATCH] 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 - ---- - 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 608593f..3d068c7 100644 ---- a/src/pcm/pcm_dmix.c -+++ b/src/pcm/pcm_dmix.c -@@ -460,9 +460,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) - snd_pcm_state_t state; - state = snd_pcm_state(dmix->spcm); - switch (state) { -- case SND_PCM_STATE_SUSPENDED: - case SND_PCM_STATE_DISCONNECTED: - dmix->state = state; -+ case SND_PCM_STATE_SUSPENDED: - return state; - case SND_PCM_STATE_XRUN: - if ((err = snd_pcm_direct_slave_recover(dmix)) < 0) -diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c -index a918512..18071fb 100644 ---- a/src/pcm/pcm_dshare.c -+++ b/src/pcm/pcm_dshare.c -@@ -258,9 +258,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) - snd_pcm_state_t state; - state = snd_pcm_state(dshare->spcm); - switch (state) { -- case SND_PCM_STATE_SUSPENDED: - case SND_PCM_STATE_DISCONNECTED: - dshare->state = state; -+ case SND_PCM_STATE_SUSPENDED: - return state; - case SND_PCM_STATE_XRUN: - if ((err = snd_pcm_direct_slave_recover(dshare)) < 0) -diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c -index 2c3b9f4..3b711ab 100644 ---- a/src/pcm/pcm_dsnoop.c -+++ b/src/pcm/pcm_dsnoop.c -@@ -209,9 +209,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) - snd_pcm_state_t state; - state = snd_pcm_state(dsnoop->spcm); - switch (state) { -- case SND_PCM_STATE_SUSPENDED: - case SND_PCM_STATE_DISCONNECTED: - dsnoop->state = state; -+ case SND_PCM_STATE_SUSPENDED: - return state; - case SND_PCM_STATE_XRUN: - if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0) diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index 8a13d4c1..0b4ddc9b 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -2,7 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" 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 \ file://0005-add-ak4458-conf-for-multichannel-support.patch \ file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ " -- cgit v1.2.3-54-g00ecf