summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorRicardo Salveti <rsalveti@rsalveti.net>2017-06-14 11:20:19 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2017-06-17 10:17:32 -0300
commitd64f4d6935df0d77c22244b84af37f5361c9949b (patch)
tree287bbaa01714440fd3cab6677c2cca6f49a4823c /recipes-multimedia
parent046a6c9877bf4b7aea01f0bfffb81c86a6c59501 (diff)
downloadmeta-freescale-d64f4d6935df0d77c22244b84af37f5361c9949b.tar.gz
alsa-lib: refresh patches against alsa-lib 1.1.4.1
Signed-off-by: Ricardo Salveti <rsalveti@rsalveti.net> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch16
-rwxr-xr-xrecipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch34
2 files changed, 25 insertions, 25 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
index 32b31953..747b62c5 100644
--- a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
@@ -1,4 +1,4 @@
1From e99c36dfdce3e0f393eeaca6c2790b566f72d6a8 Mon Sep 17 00:00:00 2001 1From cc06048dcd722049f92ab17958760bd798fb4781 Mon Sep 17 00:00:00 2001
2From: Shengjiu Wang <b02247@freescale.com> 2From: Shengjiu Wang <b02247@freescale.com>
3Date: Thu, 5 Jun 2014 17:37:47 +0800 3Date: Thu, 5 Jun 2014 17:37:47 +0800
4Subject: [PATCH] add conf for multichannel support in imx 4Subject: [PATCH] add conf for multichannel support in imx
@@ -189,10 +189,10 @@ index 0000000..a51509e
189+ 189+
190+# vim: ft=alsaconf 190+# vim: ft=alsaconf
191diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am 191diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
192index ee7991b..b08acae 100644 192index 00999f0..fbf0697 100644
193--- a/src/conf/cards/Makefile.am 193--- a/src/conf/cards/Makefile.am
194+++ b/src/conf/cards/Makefile.am 194+++ b/src/conf/cards/Makefile.am
195@@ -54,7 +54,9 @@ cfg_files = aliases.conf \ 195@@ -58,7 +58,9 @@ cfg_files = aliases.conf \
196 VIA8237.conf \ 196 VIA8237.conf \
197 VX222.conf \ 197 VX222.conf \
198 VXPocket.conf \ 198 VXPocket.conf \
@@ -204,18 +204,18 @@ index ee7991b..b08acae 100644
204 if BUILD_ALISP 204 if BUILD_ALISP
205 cfg_files += aliases.alisp 205 cfg_files += aliases.alisp
206diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf 206diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
207index 4a92fb2..46430c2 100644 207index 18a920f..2c422ee 100644
208--- a/src/conf/cards/aliases.conf 208--- a/src/conf/cards/aliases.conf
209+++ b/src/conf/cards/aliases.conf 209+++ b/src/conf/cards/aliases.conf
210@@ -55,6 +55,8 @@ AV100 cards.CMI8788 210@@ -57,6 +57,8 @@ CMI8786 cards.CMI8788
211 AV200 cards.CMI8788
212 CMI8786 cards.CMI8788
213 CMI8787 cards.CMI8788 211 CMI8787 cards.CMI8788
212 pistachio cards.pistachio-card
213 VC4-HDMI cards.vc4-hdmi
214+cs42888-audio cards.CS42888 214+cs42888-audio cards.CS42888
215+imx-hdmi-soc cards.IMX-HDMI 215+imx-hdmi-soc cards.IMX-HDMI
216 216
217 <confdir:pcm/default.conf> 217 <confdir:pcm/default.conf>
218 <confdir:pcm/dmix.conf> 218 <confdir:pcm/dmix.conf>
219-- 219--
2201.8.0 2202.7.4
221 221
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
index 3cbd55a2..4d28a77f 100755
--- 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
@@ -1,4 +1,4 @@
1From af227bfcf02c5dd446e670f8367761a63c1b531f Mon Sep 17 00:00:00 2001 1From 93607819d90ddf9bbdad8bbbe4af5d917ca572dc Mon Sep 17 00:00:00 2001
2From: Shengjiu Wang <shengjiu.wang@freescale.com> 2From: Shengjiu Wang <shengjiu.wang@freescale.com>
3Date: Tue, 10 May 2016 15:09:26 +0800 3Date: Tue, 10 May 2016 15:09:26 +0800
4Subject: [PATCH 2/2] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED 4Subject: [PATCH 2/2] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED
@@ -20,50 +20,50 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
20 3 files changed, 3 insertions(+), 3 deletions(-) 20 3 files changed, 3 insertions(+), 3 deletions(-)
21 21
22diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c 22diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
23index b26a5c7..bd35d73 100644 23index a6a8f3a..89c07d1 100644
24--- a/src/pcm/pcm_dmix.c 24--- a/src/pcm/pcm_dmix.c
25+++ b/src/pcm/pcm_dmix.c 25+++ b/src/pcm/pcm_dmix.c
26@@ -451,9 +451,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) 26@@ -466,9 +466,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm)
27 snd_pcm_state_t state;
27 state = snd_pcm_state(dmix->spcm); 28 state = snd_pcm_state(dmix->spcm);
28 switch (state) { 29 switch (state) {
29 case SND_PCM_STATE_XRUN:
30- case SND_PCM_STATE_SUSPENDED: 30- case SND_PCM_STATE_SUSPENDED:
31 case SND_PCM_STATE_DISCONNECTED: 31 case SND_PCM_STATE_DISCONNECTED:
32 dmix->state = state; 32 dmix->state = state;
33+ case SND_PCM_STATE_SUSPENDED: 33+ case SND_PCM_STATE_SUSPENDED:
34 return state; 34 return state;
35 default: 35 case SND_PCM_STATE_XRUN:
36 break; 36 if ((err = snd_pcm_direct_slave_recover(dmix)) < 0)
37diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c 37diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
38index 58e47bb..433b100 100644 38index 7cdfea2..e0b4ea7 100644
39--- a/src/pcm/pcm_dshare.c 39--- a/src/pcm/pcm_dshare.c
40+++ b/src/pcm/pcm_dshare.c 40+++ b/src/pcm/pcm_dshare.c
41@@ -241,9 +241,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) 41@@ -261,9 +261,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm)
42 snd_pcm_state_t state;
42 state = snd_pcm_state(dshare->spcm); 43 state = snd_pcm_state(dshare->spcm);
43 switch (state) { 44 switch (state) {
44 case SND_PCM_STATE_XRUN:
45- case SND_PCM_STATE_SUSPENDED: 45- case SND_PCM_STATE_SUSPENDED:
46 case SND_PCM_STATE_DISCONNECTED: 46 case SND_PCM_STATE_DISCONNECTED:
47 dshare->state = state; 47 dshare->state = state;
48+ case SND_PCM_STATE_SUSPENDED: 48+ case SND_PCM_STATE_SUSPENDED:
49 return state; 49 return state;
50 default: 50 case SND_PCM_STATE_XRUN:
51 break; 51 if ((err = snd_pcm_direct_slave_recover(dshare)) < 0)
52diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c 52diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
53index 576c35b..a3b221f 100644 53index 539b671..03df6ff 100644
54--- a/src/pcm/pcm_dsnoop.c 54--- a/src/pcm/pcm_dsnoop.c
55+++ b/src/pcm/pcm_dsnoop.c 55+++ b/src/pcm/pcm_dsnoop.c
56@@ -205,9 +205,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) 56@@ -212,9 +212,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
57 snd_pcm_state_t state;
57 state = snd_pcm_state(dsnoop->spcm); 58 state = snd_pcm_state(dsnoop->spcm);
58 switch (state) { 59 switch (state) {
59 case SND_PCM_STATE_XRUN:
60- case SND_PCM_STATE_SUSPENDED: 60- case SND_PCM_STATE_SUSPENDED:
61 case SND_PCM_STATE_DISCONNECTED: 61 case SND_PCM_STATE_DISCONNECTED:
62 dsnoop->state = state; 62 dsnoop->state = state;
63+ case SND_PCM_STATE_SUSPENDED: 63+ case SND_PCM_STATE_SUSPENDED:
64 return state; 64 return state;
65 default: 65 case SND_PCM_STATE_XRUN:
66 break; 66 if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0)
67-- 67--
681.9.1 682.7.4
69 69