gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 22 insertions, 1 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 20951c6abfa9..f223df2b8a6f 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,9 +1,10 @@
 AUX libsdl2-2.0.16-static-libs.patch 2118 BLAKE2B 836fabd17be1520ad76baaf92a0ad357093bc08a5c1767edb1c81c9099fd27aadbf0525ab0666a560a3c728983f425864f1f513693801a8fa50edde5d32a3703 SHA512 f578e5ab1852705cfad4bf8b4a8aa36fb34637f3b26b83a9821716d08fc1152d7ea18daea623f540c860cd7a7566c4b8902b2cac2ae6d541e36e7bd15363d58a
+AUX libsdl2-2.28.5-fix-libdecor-0.2.patch 1195 BLAKE2B cd07f864e8091796d20ade4f4fd9c62bd61d684da62e1639260b4737bf083f0828bcba116dc45f2db81dc3117853660e8fcaf143ffb192b6b30f41099d3aa256 SHA512 4291d5f8ca2370698ddb795c77673b110f802ab9c8c19213064b5e1268b5a92262b4cd065cf96c277a28ff319e8562ba6b7e74f5c53f0a60e22502d1b1b8fb03
 DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
 DIST SDL2-2.30.2.tar.gz 7426565 BLAKE2B 258084c6965281951b78619d7ebcd80b0f6873f54ded93d35b6b898f0533fef9a29bef4a8babe53df50bc589b0565b3a3b1378a930b43fdce575c4a5baa70864 SHA512 19316bb4c483a8c4be2140b70d906b7767beabada481873217a9207bd41e79c1854a837e1394325f59795da010f5344f791a7973a846b8189e3f9b662f408aca
 DIST SDL2-2.30.3.tar.gz 7425677 BLAKE2B 9918723bc3a0bc3abfc6d47b4fc7eeabcafdc9925ee93e4f31b3637e843a5b060ae61aef9b93743340a9df914248cff510e5d38e758e032b5ed4df9eed587746 SHA512 75ddea9ac3c2130e9f6036b4718dbe3d9d1b40dab3cd48d3d488d5a397dd0c226c0573bf18d82eb41498800accf045e259d2ae305f069fad7b34e47a017f2372
 EBUILD libsdl2-2.28.5-r1.ebuild 7385 BLAKE2B 74314d489f7d6b6d87223779f4a559492ad50b2efe9731b7696149756ddce40d3a193eb72a405d38cff3a88bf26faf2d65339a874f7e68c0316e0d91d5c0aaf4 SHA512 82e8160883795b7dd0a996bd86fad3dcc0c56847e531ecaea28f4edf0a7e449931589697b9e0eeb10328ca768b8be2081b3b9065d49167286d99b77ecb20bd7e
-EBUILD libsdl2-2.28.5-r2.ebuild 7465 BLAKE2B 25732ecd5c4e7998727ce7eb3fc64afe5c3c7337ca9bd554cd90a7639102a2026d06af795d392b5161976e7b5a446c0ed3e60b8fa361442c2a86b373fcf55f2c SHA512 a0a804ac31060141d8add1b6f5a1a0c6a2af01ba0b45db1f579d222580bc94b34675efa5942ce76a71987f8090c2a6c72d43bf96864187991427a9b03741597d
+EBUILD libsdl2-2.28.5-r2.ebuild 7516 BLAKE2B da5807c940561d2e8174c9e2d2a2d46d59c73114a33f257f3818d8e489830a9ed5762810a5961161eb1763ae38411f6a70645198328430135a39e9b5759eba56 SHA512 e6719488f5bcbfff93338421a49cfb0e0c1c1a7546fd42d02e8d18e22a89b880ce73e743b587f06301a6303f95f46f9d2b42af01aa42c79530b1d74770c01242
 EBUILD libsdl2-2.30.2-r1.ebuild 5733 BLAKE2B 1273e09d22913088d85bea63a86e028c519fc9d2b3daa7fd692ac791dba38652675a0bd526f3cb15c58313e65b9ade40fe67df910bef714df94f607cc666f04d SHA512 14830fad12f2af6ee408e94d2f5f7baece0c6028df4e48dae97594b9833ee3da02b80e1c0da148c574d169f42a414cd30e29f21101a132b7b33cdc122a80c127
 EBUILD libsdl2-2.30.3.ebuild 5869 BLAKE2B 0d0d966f51d216b50c7123bb8a888dd059ff4dbd36e78a1b53a52fa0ed39c38d518ddc9da27ea26f12ee655a4d3335a0fc2eb9612c7efca62767fb1b20f73c60 SHA512 b288f5412d8b50816132f98777f4a34d0859270214dff6f68fd734c99316ec2a7a83de8d9c0e90d8362163583c587a35683caf8ebabb71cd626d839b0c992b47
 MISC metadata.xml 1945 BLAKE2B 0f4c4a1526296bfbef001169c45626f0393cfcb6f5003d3d644c1ff1ef0197fdd38ddc2f16f1c1590ef895448bd6aa85ea3619a31487609d9ea2569077decd64 SHA512 d25c6e3b2cf3055f2faf71d926d5ad01c5b528f1349284dc3097607015ed93c70116223db0078d8ae764b598bc13a99f1b82cebe1e65206ea737508bdede12df
diff --git a/media-libs/libsdl2/files/libsdl2-2.28.5-fix-libdecor-0.2.patch b/media-libs/libsdl2/files/libsdl2-2.28.5-fix-libdecor-0.2.patch
new file mode 100644
index 000000000000..9ba92e98253b
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.28.5-fix-libdecor-0.2.patch
@@ -0,0 +1,19 @@
+Fix static build with libdecor 0.2.0
+
+Backports https://github.com/libsdl-org/SDL/commit/4ce935b9106a0311436e41c5f28f00db30a93de1 to libsdl2-2.28
+Bug: https://bugs.gentoo.org/936443
+--- a/src/video/wayland/SDL_waylandsym.h
++++ b/src/video/wayland/SDL_waylandsym.h
+@@ -221,10 +221,10 @@ SDL_WAYLAND_SYM(int, libdecor_dispatch, (struct libdecor *, int))
+ 
+ #if defined(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR) || defined(SDL_HAVE_LIBDECOR_VER_0_2_0)
+ /* Only found in libdecor 0.1.1 or higher, so failure to load them is not fatal. */
+-SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_min_content_size, (struct libdecor_frame *,\
++SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_min_content_size, (const struct libdecor_frame *,\
+                                                             int *,\
+                                                             int *))
+-SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_max_content_size, (struct libdecor_frame *,\
++SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_max_content_size, (const struct libdecor_frame *,\
+                                                             int *,\
+                                                             int *))
+ #endif
diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
index fef18b072fbe..d8fd3b351009 100644
--- a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
@@ -105,6 +105,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.16-static-libs.patch
+	"${FILESDIR}"/${PN}-2.28.5-fix-libdecor-0.2.patch
 )
 
 src_prepare() {