From 32226986810abe27571778658c2742cce59235d0 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 30 Apr 2025 10:21:31 +0200 Subject: alsa-lib: refresh patches OE-core updated alsa-lib. commit 8518e57a117a ("alsa-lib: upgrade 1.2.13 -> 1.2.14") The patches now only apply with fuzz resulting in a build error. Update them to apply cleanly. Signed-off-by: Max Krummenacher --- ...0001-add-conf-for-multichannel-support-in-imx.patch | 18 ++++++++++-------- ...e-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch | 8 ++++---- ...0005-add-ak4458-conf-for-multichannel-support.patch | 16 +++++++++------- .../0006-add-conf-for-iMX-XCVR-sound-card.patch | 16 +++++++++------- .../0007-add-conf-for-imx-cs42448-sound-card.patch | 18 +++++++++++------- 5 files changed, 43 insertions(+), 33 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 7d20c6782..f5ce84ead 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 @@ -From 49a7eac8e02c33cae8a168e6d22d9ff8aaf86d44 Mon Sep 17 00:00:00 2001 +From 365213e10b073c45d7bacf9c94e30e879bfa8255 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Thu, 5 Jun 2014 17:37:47 +0800 Subject: [PATCH] add conf for multichannel support in imx @@ -6,7 +6,6 @@ Subject: [PATCH] add conf for multichannel support in imx Upstream-Status: Inappropriate [platform specific] Signed-off-by: Shengjiu Wang - --- src/conf/cards/CS42888.conf | 94 ++++++++++++++++++++++++++++++++++++ src/conf/cards/IMX-HDMI.conf | 67 +++++++++++++++++++++++++ @@ -18,7 +17,7 @@ Signed-off-by: Shengjiu Wang diff --git a/src/conf/cards/CS42888.conf b/src/conf/cards/CS42888.conf new file mode 100644 -index 0000000..671a284 +index 000000000000..671a2845894b --- /dev/null +++ b/src/conf/cards/CS42888.conf @@ -0,0 +1,94 @@ @@ -118,7 +117,7 @@ index 0000000..671a284 +# vim: ft=alsaconf diff --git a/src/conf/cards/IMX-HDMI.conf b/src/conf/cards/IMX-HDMI.conf new file mode 100644 -index 0000000..a51509e +index 000000000000..a51509e8ad5a --- /dev/null +++ b/src/conf/cards/IMX-HDMI.conf @@ -0,0 +1,67 @@ @@ -190,7 +189,7 @@ index 0000000..a51509e + +# vim: ft=alsaconf diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am -index 00999f0..fbf0697 100644 +index f387cf4197da..fb7de95b194d 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -58,7 +58,9 @@ cfg_files = aliases.conf \ @@ -202,10 +201,10 @@ index 00999f0..fbf0697 100644 + CS42888.conf \ + IMX-HDMI.conf - if BUILD_ALISP - cfg_files += aliases.alisp + alsa_DATA = $(cfg_files) + diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf -index 7e352f7..a9e6d76 100644 +index a54824ae636b..0aa874d7434f 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788 @@ -217,3 +216,6 @@ index 7e352f7..a9e6d76 100644 +-- +2.42.0 + diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch index 5ec0d2e99..193d507eb 100644 --- a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch +++ b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch @@ -1,4 +1,4 @@ -From aa4f56c3c952269c36464cc0da9db5a1381648fa Mon Sep 17 00:00:00 2001 +From 3950e1ae36ca53a67b7248137e6033e7e99f79a3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 9 Nov 2022 08:11:42 +0100 Subject: [PATCH] pcm: rate - fix the crash in @@ -24,10 +24,10 @@ Signed-off-by: Jaroslav Kysela 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c -index 6bb90b8b..ec64604c 100644 +index 9d7e233e8437..d58789eca73b 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c -@@ -622,7 +622,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv( +@@ -626,7 +626,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv( * This code is also used by extplug, but extplug does not allow to alter the sampling rate. */ if (conv) @@ -37,5 +37,5 @@ index 6bb90b8b..ec64604c 100644 if (slave->avail_min != needed_slave_avail_min) { snd_pcm_sw_params_t *swparams; -- -2.34.1 +2.42.0 diff --git a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch index b25aa910e..82122b14e 100644 --- a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch +++ b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch @@ -1,4 +1,4 @@ -From d78b7e2b964c9713c2e9889f4ec85922528ba971 Mon Sep 17 00:00:00 2001 +From eba3f36b6619d0794028f0880fbdfc2bb98df45e Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 31 Jan 2018 15:06:53 +0800 Subject: [PATCH] add ak4458 conf for multichannel support @@ -12,7 +12,6 @@ maximum 8 channels, but ak4458 may support 16 channels Upstream-Status: Inappropriate [i.MX specific] Signed-off-by: Shengjiu Wang - --- src/conf/cards/AK4458.conf | 74 +++++++++++++++++++++++++++++++++++++ src/conf/cards/Makefile.am | 3 +- @@ -22,7 +21,7 @@ Signed-off-by: Shengjiu Wang diff --git a/src/conf/cards/AK4458.conf b/src/conf/cards/AK4458.conf new file mode 100644 -index 0000000..3b5b195 +index 000000000000..3b5b195f2ca0 --- /dev/null +++ b/src/conf/cards/AK4458.conf @@ -0,0 +1,74 @@ @@ -101,7 +100,7 @@ index 0000000..3b5b195 + slave.channels 8 +} diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am -index fbf0697..34fa5a3 100644 +index fb7de95b194d..bdb1c2523d62 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -60,7 +60,8 @@ cfg_files = aliases.conf \ @@ -112,10 +111,10 @@ index fbf0697..34fa5a3 100644 + IMX-HDMI.conf \ + AK4458.conf - if BUILD_ALISP - cfg_files += aliases.alisp + alsa_DATA = $(cfg_files) + diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf -index a9e6d76..2f0a22a 100644 +index 0aa874d7434f..dda71d99916e 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -59,6 +59,7 @@ pistachio cards.pistachio-card @@ -126,3 +125,6 @@ index a9e6d76..2f0a22a 100644 +-- +2.42.0 + diff --git a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch index 1f558185d..c2e8cece1 100644 --- a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch +++ b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch @@ -1,4 +1,4 @@ -From 36aae65dc913e1ebe72366d7ae361897d465e88d Mon Sep 17 00:00:00 2001 +From 812399f89e01239ca88b905451a55ba996a88e1a Mon Sep 17 00:00:00 2001 From: Viorel Suman Date: Mon, 9 Mar 2020 14:25:46 +0200 Subject: [PATCH] add conf for iMX XCVR sound card @@ -6,7 +6,6 @@ Subject: [PATCH] add conf for iMX XCVR sound card Upstream-Status: Pending Signed-off-by: Viorel Suman - --- src/conf/cards/IMX-XCVR.conf | 39 ++++++++++++++++++++++++++++++++++++ src/conf/cards/Makefile.am | 3 ++- @@ -16,7 +15,7 @@ Signed-off-by: Viorel Suman diff --git a/src/conf/cards/IMX-XCVR.conf b/src/conf/cards/IMX-XCVR.conf new file mode 100755 -index 0000000..009000c +index 000000000000..009000c63a19 --- /dev/null +++ b/src/conf/cards/IMX-XCVR.conf @@ -0,0 +1,39 @@ @@ -60,7 +59,7 @@ index 0000000..009000c + preamble.y 0x3 +} diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am -index 34fa5a3..70b9bab 100644 +index bdb1c2523d62..044d2581f8bd 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -61,7 +61,8 @@ cfg_files = aliases.conf \ @@ -71,10 +70,10 @@ index 34fa5a3..70b9bab 100644 + AK4458.conf \ + IMX-XCVR.conf - if BUILD_ALISP - cfg_files += aliases.alisp + alsa_DATA = $(cfg_files) + diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf -index 2f0a22a..e824145 100644 +index dda71d99916e..6dab14855f25 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi @@ -85,3 +84,6 @@ index 2f0a22a..e824145 100644 +-- +2.42.0 + diff --git a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch index 51d1ad877..217942d76 100644 --- a/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch +++ b/recipes-multimedia/alsa/alsa-lib/0007-add-conf-for-imx-cs42448-sound-card.patch @@ -1,7 +1,10 @@ -From 97d5e09a4166b45c567026e51b8a25ef5d7d587d Mon Sep 17 00:00:00 2001 +From 2f87ea5afa137dfa2f7a096e9c8518be43920ed9 Mon Sep 17 00:00:00 2001 From: Chancel Liu Date: Fri, 29 Jul 2022 16:12:37 +0800 Subject: [PATCH] add conf for imx-cs42448 sound card +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [i.MX specific] @@ -15,7 +18,7 @@ Signed-off-by: Chancel Liu diff --git a/src/conf/cards/CS42448.conf b/src/conf/cards/CS42448.conf new file mode 100644 -index 00000000..28ba5c48 +index 000000000000..28ba5c485837 --- /dev/null +++ b/src/conf/cards/CS42448.conf @@ -0,0 +1,58 @@ @@ -78,7 +81,7 @@ index 00000000..28ba5c48 + +# vim: ft=alsaconf diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am -index 70b9bab3..6aba20b4 100644 +index 044d2581f8bd..b08962cf3ba3 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -62,7 +62,8 @@ cfg_files = aliases.conf \ @@ -89,10 +92,10 @@ index 70b9bab3..6aba20b4 100644 + IMX-XCVR.conf \ + CS42448.conf - if BUILD_ALISP - cfg_files += aliases.alisp + alsa_DATA = $(cfg_files) + diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf -index e824145d..a40d3731 100644 +index 6dab14855f25..554db846f8e5 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -61,6 +61,7 @@ imx-cs42888 cards.CS42888 @@ -104,4 +107,5 @@ index e824145d..a40d3731 100644 -- -2.17.1 +2.42.0 + -- cgit v1.2.3-54-g00ecf