diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-01 11:06:23 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-03 11:06:19 +0100 |
| commit | c8b6715c78cb6bee39f907f11be7e90979227c3d (patch) | |
| tree | 369b58ac7d0f8dec7a2eaed272179cfee5774802 | |
| parent | 1bfaec49bd218529df2e9c5f057516e59c1fc1d4 (diff) | |
| download | poky-c8b6715c78cb6bee39f907f11be7e90979227c3d.tar.gz | |
libsdl2: upgrade 2.32.2 -> 2.32.4
Drop backported patch.
(From OE-Core rev: 59f7cf56abe91dfdcbdaa094d1ffc194f4f63e1c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2_2.32.4.bb (renamed from meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb) | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch b/meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch deleted file mode 100644 index f8c0598130..0000000000 --- a/meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 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.4.bb index 8226774a9e..28338b0936 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.32.4.bb | |||
| @@ -22,11 +22,10 @@ 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" | ||
| 26 | 25 | ||
| 27 | S = "${WORKDIR}/SDL2-${PV}" | 26 | S = "${WORKDIR}/SDL2-${PV}" |
| 28 | 27 | ||
| 29 | SRC_URI[sha256sum] = "c5f30c427fd8107ee4a400c84d4447dd211352512eaf0b6e89cc6a50a2821922" | 28 | SRC_URI[sha256sum] = "f15b478253e1ff6dac62257ded225ff4e7d0c5230204ac3450f1144ee806f934" |
| 30 | 29 | ||
| 31 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even | 30 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even |
| 32 | UPSTREAM_CHECK_REGEX = "SDL2-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" | 31 | UPSTREAM_CHECK_REGEX = "SDL2-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" |
