diff options
author | Markus Volk <f_l_k@t-online.de> | 2025-03-09 07:56:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-13 11:00:35 +0000 |
commit | 9eb112d18538a216ef17d80bfed0723080f23e16 (patch) | |
tree | f8dda0ff2e197f6debb70f73001af5badf3d57ff /meta | |
parent | 99e1e8c0b90612f27294a9130dd3f47f22a58c60 (diff) | |
download | poky-9eb112d18538a216ef17d80bfed0723080f23e16.tar.gz |
libsdl2: fix build with pipewire 1.4.0
This commit adds a backport patch to address a build issue with pipewire 1.4.0
| /home/flk/poky/build/tmp/work/corei7-64-poky-linux/libsdl2/2.32.2/SDL2-2.32.2/src/audio/pipewire/SDL_pipewire.c:593:37: error: passing argument 1 of 'pw_node_enum_params' from incompatible pointer type [-Wincompatible-pointer-types]
(From OE-Core rev: bacb0c9231176b605d22ad6eb168d041a2c64bd9)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch b/meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch new file mode 100644 index 0000000000..f8c0598130 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 9e079fe9c7931738ed63d257b1d7fb8a07b66824 Mon Sep 17 00:00:00 2001 | ||
2 | From: Neal Gompa <neal@gompa.dev> | ||
3 | Date: Mon, 10 Feb 2025 05:00:56 -0500 | ||
4 | Subject: [PATCH] pipewire: Ensure that the correct struct is used for | ||
5 | enumeration APIs | ||
6 | |||
7 | PipeWire now requires the correct struct type is used, otherwise | ||
8 | it will fail to compile. | ||
9 | |||
10 | Reference: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/188d920733f0791413d3386e5536ee7377f71b2f | ||
11 | |||
12 | Fixes: https://github.com/libsdl-org/SDL/issues/12224 | ||
13 | (cherry picked from commit d35bef64e913dd7d5dd3153a4b61f10ef837dad6) | ||
14 | (cherry picked from commit 6be87ceb33a9aad3bf5204bb13b3a5e8b498fd26) | ||
15 | |||
16 | Upstream-Status: Backport [https://github.com/libsdl-org/SDL/commit/9e079fe9c7931738ed63d257b1d7fb8a07b66824] | ||
17 | |||
18 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
19 | --- | ||
20 | src/audio/pipewire/SDL_pipewire.c | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/src/audio/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c | ||
24 | index 889e05decb293..5d1bfc28dedb7 100644 | ||
25 | --- a/src/audio/pipewire/SDL_pipewire.c | ||
26 | +++ b/src/audio/pipewire/SDL_pipewire.c | ||
27 | @@ -590,7 +590,7 @@ static void node_event_info(void *object, const struct pw_node_info *info) | ||
28 | |||
29 | /* Need to parse the parameters to get the sample rate */ | ||
30 | for (i = 0; i < info->n_params; ++i) { | ||
31 | - pw_node_enum_params(node->proxy, 0, info->params[i].id, 0, 0, NULL); | ||
32 | + pw_node_enum_params((struct pw_node*)node->proxy, 0, info->params[i].id, 0, 0, NULL); | ||
33 | } | ||
34 | |||
35 | hotplug_core_sync(node); | ||
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb index 2b28b3dfa9..d075b335f5 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb | |||
@@ -22,6 +22,7 @@ LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'f | |||
22 | PROVIDES = "virtual/libsdl2" | 22 | PROVIDES = "virtual/libsdl2" |
23 | 23 | ||
24 | SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz" | 24 | SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz" |
25 | SRC_URI += "file://9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch" | ||
25 | 26 | ||
26 | S = "${WORKDIR}/SDL2-${PV}" | 27 | S = "${WORKDIR}/SDL2-${PV}" |
27 | 28 | ||