From c8b6715c78cb6bee39f907f11be7e90979227c3d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 1 Apr 2025 11:06:23 +0000
Subject: [PATCH] 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>
---
 ...9fe9c7931738ed63d257b1d7fb8a07b66824.patch | 35 -------------------
 .../{libsdl2_2.32.2.bb => libsdl2_2.32.4.bb}  |  3 +-
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch
 rename meta/recipes-graphics/libsdl2/{libsdl2_2.32.2.bb => libsdl2_2.32.4.bb} (96%)

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 @@
-From 9e079fe9c7931738ed63d257b1d7fb8a07b66824 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-Date: Mon, 10 Feb 2025 05:00:56 -0500
-Subject: [PATCH] pipewire: Ensure that the correct struct is used for
- enumeration APIs
-
-PipeWire now requires the correct struct type is used, otherwise
-it will fail to compile.
-
-Reference: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/188d920733f0791413d3386e5536ee7377f71b2f
-
-Fixes: https://github.com/libsdl-org/SDL/issues/12224
-(cherry picked from commit d35bef64e913dd7d5dd3153a4b61f10ef837dad6)
-(cherry picked from commit 6be87ceb33a9aad3bf5204bb13b3a5e8b498fd26)
-
-Upstream-Status: Backport [https://github.com/libsdl-org/SDL/commit/9e079fe9c7931738ed63d257b1d7fb8a07b66824]
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- src/audio/pipewire/SDL_pipewire.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/audio/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c
-index 889e05decb293..5d1bfc28dedb7 100644
---- a/src/audio/pipewire/SDL_pipewire.c
-+++ b/src/audio/pipewire/SDL_pipewire.c
-@@ -590,7 +590,7 @@ static void node_event_info(void *object, const struct pw_node_info *info)
- 
-         /* Need to parse the parameters to get the sample rate */
-         for (i = 0; i < info->n_params; ++i) {
--            pw_node_enum_params(node->proxy, 0, info->params[i].id, 0, 0, NULL);
-+            pw_node_enum_params((struct pw_node*)node->proxy, 0, info->params[i].id, 0, 0, NULL);
-         }
- 
-         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
similarity index 96%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.32.2.bb
rename to 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
 PROVIDES = "virtual/libsdl2"
 
 SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz"
-SRC_URI += "file://9e079fe9c7931738ed63d257b1d7fb8a07b66824.patch"
 
 S = "${WORKDIR}/SDL2-${PV}"
 
-SRC_URI[sha256sum] = "c5f30c427fd8107ee4a400c84d4447dd211352512eaf0b6e89cc6a50a2821922"
+SRC_URI[sha256sum] = "f15b478253e1ff6dac62257ded225ff4e7d0c5230204ac3450f1144ee806f934"
 
 inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even
 UPSTREAM_CHECK_REGEX = "SDL2-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar"