commit: 4da31bd05ccf902cd7da0e367da45e29c5ff26cc Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Sun Jul 21 16:36:38 2024 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Thu Aug 1 06:59:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da31bd0
media-libs/libsdl2: Fix build with >=gui-libs/libdecor-0.2.0 This applies https://github.com/libsdl-org/SDL/commit/4ce935b9106a0311436e41c5f28f00db30a93de1 to libsdl2-2.28. Closes: https://bugs.gentoo.org/936443 Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37657 Closes: https://bugs.gentoo.org/936020 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> .../files/libsdl2-2.28.5-fix-libdecor-0.2.patch | 19 +++++++++++++++++++ media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild | 1 + 2 files changed, 20 insertions(+) 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() {
