1
0
forked from jengelh/SDL3

Add gcc14.patch

This commit is contained in:
Jan Engelhardt 2024-08-19 23:05:52 +02:00
parent 7ff1c7ddfc
commit 769f4ba86b
3 changed files with 52 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 19 21:05:37 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Add gcc14.patch
-------------------------------------------------------------------
Wed May 1 19:06:37 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@ -30,6 +30,7 @@ URL: https://libsdl.org/
#Source2: https://libsdl.org/release/%name-%version.tar.gz.sig
Source: https://github.com/libsdl-org/SDL/releases/download/prerelease-%version/%name-%version.tar.xz
Source3: %name.keyring
Patch1: gcc14.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libdecor-devel

46
gcc14.patch Normal file
View File

@ -0,0 +1,46 @@
From fb02d9949459e7660195e7d98c06b29297be5ee8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 19 Aug 2024 22:47:45 +0200
Subject: [PATCH] Resolve build failures in pipewire code
References: https://github.com/libsdl-org/SDL/pull/10568
g++-13 complains:
```
SDL_pipewire.c:129:42: warning: assignment to "struct pw_main_loop *
(*)(struct pw_main_loop *)" from incompatible pointer type "struct
pw_main_loop * (*)(const struct spa_dict *)"
[-Wincompatible-pointer-types]
129 | #define SDL_PIPEWIRE_SYM(x) PIPEWIRE_##x = x
SDL_pipewire.c:148:5: note: in expansion of macro "SDL_PIPEWIRE_SYM"
148 | SDL_PIPEWIRE_SYM(pw_main_loop_new);
```
g++-14 complains:
```
SDL_pipewire.c:129:42: error: assignment to "struct pw_main_loop *
(*)(const struct pw_main_loop *)" from incompatible pointer type
"struct pw_main_loop * (*)(const struct spa_dict *)"
[-Wincompatible-pointer-types]
```
---
src/audio/pipewire/SDL_pipewire.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/audio/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c
index 251b324a3..ad8d1ef52 100644
--- a/src/audio/pipewire/SDL_pipewire.c
+++ b/src/audio/pipewire/SDL_pipewire.c
@@ -56,7 +56,7 @@ static SDL_bool pipewire_initialized = SDL_FALSE;
static const char *(*PIPEWIRE_pw_get_library_version)(void);
static void (*PIPEWIRE_pw_init)(int *, char ***);
static void (*PIPEWIRE_pw_deinit)(void);
-static struct pw_main_loop *(*PIPEWIRE_pw_main_loop_new)(struct pw_main_loop *loop);
+static struct pw_main_loop *(*PIPEWIRE_pw_main_loop_new)(const struct spa_dict *loop);
static struct pw_loop *(*PIPEWIRE_pw_main_loop_get_loop)(struct pw_main_loop *loop);
static int (*PIPEWIRE_pw_main_loop_run)(struct pw_main_loop *loop);
static int (*PIPEWIRE_pw_main_loop_quit)(struct pw_main_loop *loop);
--
2.46.0