From 08b3a8cefe9d1b5c112b256d5ddb94a9f9e1ac0e Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 11 Apr 2024 11:53:31 -0700 Subject: alsa-lib: Drop upstream patch The patch 0001-pcm-Fix-segfault-with-32bit-libs.patch is already upstream on master and scarthgap. Fixes: f2575b7e61 Signed-off-by: Tom Hochstein --- .../0001-pcm-Fix-segfault-with-32bit-libs.patch | 115 --------------------- recipes-multimedia/alsa/alsa-lib_%.bbappend | 1 - 2 files changed, 116 deletions(-) delete mode 100644 recipes-multimedia/alsa/alsa-lib/0001-pcm-Fix-segfault-with-32bit-libs.patch (limited to 'recipes-multimedia/alsa') diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-Fix-segfault-with-32bit-libs.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-Fix-segfault-with-32bit-libs.patch deleted file mode 100644 index 6891c600..00000000 --- a/recipes-multimedia/alsa/alsa-lib/0001-pcm-Fix-segfault-with-32bit-libs.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Sat, 9 Sep 2023 17:42:03 +0200 -Subject: [PATCH] pcm: Fix segfault with 32bit libs - -Upstream-Status: Backport [https://github.com/alsa-project/alsa-lib/commit/0e3dfb9f705ca78be34cd70fd59d67c431e29cc7] - -The recent rearrangement of header inclusion order caused a regression -showing segfaults on 32bit Arm. The primary reason is the -inconsistent compile condition depending on the inclusion of config.h; -while most of other code include pcm_local.h (that implicitly includes -config.h) at first, pcm_direct.c doesn't do it, hence the access with -direct plugins crashes. - -For fixing it, we need to include config.h at the beginning. But, -it's better to include pcm_local.h for all relevant code for -consistency. The patch does it, and also it adds the guard in -pcm_local.h for double inclusions. - -Fixes: ad3a8b8b314e ("reshuffle included files to include config.h as first") -Link: https://github.com/alsa-project/alsa-lib/issues/352 -Signed-off-by: Takashi Iwai ---- - src/pcm/pcm_direct.c | 1 + - src/pcm/pcm_dmix.c | 2 +- - src/pcm/pcm_dshare.c | 1 + - src/pcm/pcm_dsnoop.c | 1 + - src/pcm/pcm_local.h | 5 +++++ - src/pcm/pcm_shm.c | 1 + - 6 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c -index 040fc160..e53e5923 100644 ---- a/src/pcm/pcm_direct.c -+++ b/src/pcm/pcm_direct.c -@@ -19,6 +19,7 @@ - * - */ - -+#include "pcm_local.h" - #include - #include - #include -diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c -index 7cd3c508..55cae3e7 100644 ---- a/src/pcm/pcm_dmix.c -+++ b/src/pcm/pcm_dmix.c -@@ -26,7 +26,7 @@ - * - */ - --#include "config.h" -+#include "pcm_local.h" - #include - #include - #include -diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c -index 454b39a9..c0329098 100644 ---- a/src/pcm/pcm_dshare.c -+++ b/src/pcm/pcm_dshare.c -@@ -26,6 +26,7 @@ - * - */ - -+#include "pcm_local.h" - #include - #include - #include -diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c -index d3ce300c..bf67c68a 100644 ---- a/src/pcm/pcm_dsnoop.c -+++ b/src/pcm/pcm_dsnoop.c -@@ -26,6 +26,7 @@ - * - */ - -+#include "pcm_local.h" - #include - #include - #include -diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h -index 6a0e71e7..152c92c3 100644 ---- a/src/pcm/pcm_local.h -+++ b/src/pcm/pcm_local.h -@@ -20,6 +20,9 @@ - * - */ - -+#ifndef __PCM_LOCAL_H -+#define __PCM_LOCAL_H -+ - #include "config.h" - - #include -@@ -1223,3 +1226,5 @@ static inline void snd_pcm_unlock(snd_pcm_t *pcm) - #define snd_pcm_lock(pcm) do {} while (0) - #define snd_pcm_unlock(pcm) do {} while (0) - #endif /* THREAD_SAFE_API */ -+ -+#endif /* __PCM_LOCAL_H */ -diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c -index f0bfd934..d9596547 100644 ---- a/src/pcm/pcm_shm.c -+++ b/src/pcm/pcm_shm.c -@@ -26,6 +26,7 @@ - * - */ - -+#include "pcm_local.h" - #include - #include - #include --- -2.25.1 - diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index 4be0d7e1..65498aed 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -6,7 +6,6 @@ IMX_PATCH = " \ file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ file://0007-add-conf-for-imx-cs42448-sound-card.patch \ file://0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch \ - file://0001-pcm-Fix-segfault-with-32bit-libs.patch \ " SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}" -- cgit v1.2.3-54-g00ecf