From 769f4ba86b74cd19934b29acb6a164d9353633d8168f0ae67f2e10aefdb53e3c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 19 Aug 2024 23:05:52 +0200 Subject: [PATCH 1/3] Add gcc14.patch --- SDL3.changes | 5 +++++ SDL3.spec | 1 + gcc14.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 gcc14.patch diff --git a/SDL3.changes b/SDL3.changes index 9ded2e0..5f03a9f 100644 --- a/SDL3.changes +++ b/SDL3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 19 21:05:37 UTC 2024 - Jan Engelhardt + +- Add gcc14.patch + ------------------------------------------------------------------- Wed May 1 19:06:37 UTC 2024 - Jan Engelhardt diff --git a/SDL3.spec b/SDL3.spec index a7d37ca..bf71131 100644 --- a/SDL3.spec +++ b/SDL3.spec @@ -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 diff --git a/gcc14.patch b/gcc14.patch new file mode 100644 index 0000000..3c6e03a --- /dev/null +++ b/gcc14.patch @@ -0,0 +1,46 @@ +From fb02d9949459e7660195e7d98c06b29297be5ee8 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +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 + -- 2.45.2 From 5f48e13a52a2b7f91adac14d9cf78519efa7e28b7483df1789d66a82ffe291b8 Mon Sep 17 00:00:00 2001 From: bubbleguuum Date: Sat, 5 Oct 2024 22:33:33 +0200 Subject: [PATCH 2/3] update to v3.1.3 preview --- SDL3-3.1.2.tar.xz | 3 --- SDL3-3.1.3.tar.xz | 3 +++ SDL3.spec | 10 ++++----- gcc14.patch | 57 +++++++++-------------------------------------- 4 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 SDL3-3.1.2.tar.xz create mode 100644 SDL3-3.1.3.tar.xz diff --git a/SDL3-3.1.2.tar.xz b/SDL3-3.1.2.tar.xz deleted file mode 100644 index 177d29f..0000000 --- a/SDL3-3.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99a9e84b4d5afd68d423d364fdd03592efa7658208cddf3f846dbeb707569ecc -size 4751864 diff --git a/SDL3-3.1.3.tar.xz b/SDL3-3.1.3.tar.xz new file mode 100644 index 0000000..2d1d2f3 --- /dev/null +++ b/SDL3-3.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54041ffc30aa1ad6b8c32a41bdaa3059fc9997becbe23e412a4c718524c3f584 +size 5068828 diff --git a/SDL3.spec b/SDL3.spec index bf71131..883faa8 100644 --- a/SDL3.spec +++ b/SDL3.spec @@ -19,7 +19,7 @@ %define sle_version 0 Name: SDL3 %define lname libSDL3-0 -Version: 3.1.2 +Version: 3.1.3 Release: 0 Summary: Simple DirectMedia Layer Library License: Zlib @@ -28,7 +28,7 @@ URL: https://libsdl.org/ #Git-Clone: https://github.com/libsdl-org/SDL #Source: https://libsdl.org/release/%name-%version.tar.gz #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 +Source: https://github.com/libsdl-org/SDL/releases/download/preview-%version/%name-%version.tar.xz Source3: %name.keyring Patch1: gcc14.patch BuildRequires: cmake @@ -129,7 +129,7 @@ SDL3 C API. -DSDL_X11_SHARED:BOOL=OFF -DSDL_WAYLAND_SHARED:BOOL=OFF \ -DSDL_KMSDRM_SHARED:BOOL=OFF \ -DSDL_STATIC:BOOL=OFF -DSDL_STATIC_PIC:BOOL=ON -DSDL_RPATH:BOOL=OFF \ - -DSDL_TEST_LIBRARY:BOOL=OFF + -DSDL_TEST_LIBRARY:BOOL=OFF -DSDL_DISABLE_INSTALL_DOCS:BOOL=OFF %cmake_build @@ -149,7 +149,7 @@ rm -Rf "%buildroot/%_datadir/licenses" # we use %%license %_libdir/pkgconfig/sdl3.pc %_libdir/cmake/SDL3/ +%changelog + %files devel-doc %_mandir/man3/*.3* - -%changelog diff --git a/gcc14.patch b/gcc14.patch index 3c6e03a..cd38db0 100644 --- a/gcc14.patch +++ b/gcc14.patch @@ -1,46 +1,11 @@ -From fb02d9949459e7660195e7d98c06b29297be5ee8 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -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 - +--- SDL3-3.1.3.orig/src/camera/pipewire/SDL_camera_pipewire.c 2024-10-05 20:41:45.901850659 +0200 ++++ SDL3-3.1.3/src/camera/pipewire/SDL_camera_pipewire.c 2024-10-05 20:46:44.515609068 +0200 +@@ -79,7 +79,7 @@ + static void (*PIPEWIRE_pw_context_destroy)(struct pw_context *); + static struct pw_core *(*PIPEWIRE_pw_context_connect)(struct pw_context *, struct pw_properties *, size_t); + static void (*PIPEWIRE_pw_proxy_add_object_listener)(struct pw_proxy *, struct spa_hook *, const void *, void *); +-static void (*PIPEWIRE_pw_proxy_add_listener)(struct pw_proxy *, struct spa_hook *, const void *, void *); ++static void (*PIPEWIRE_pw_proxy_add_listener)(struct pw_proxy *, struct spa_hook *, const struct pw_proxy_events *, void *); + static void *(*PIPEWIRE_pw_proxy_get_user_data)(struct pw_proxy *); + static void (*PIPEWIRE_pw_proxy_destroy)(struct pw_proxy *); + static int (*PIPEWIRE_pw_core_disconnect)(struct pw_core *); -- 2.45.2 From db2db031312d256bdaac5e6420f377b0621ad822df55bcfdcc962e8871d070f7 Mon Sep 17 00:00:00 2001 From: bubbleguuum Date: Sat, 5 Oct 2024 23:05:56 +0200 Subject: [PATCH 3/3] updated changes file --- SDL3.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SDL3.changes b/SDL3.changes index 5f03a9f..71e226c 100644 --- a/SDL3.changes +++ b/SDL3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 5 21:04:22 UTC 2024 - Michael Pujos + +- Update to preview release 3.1.3 + ------------------------------------------------------------------- Mon Aug 19 21:05:37 UTC 2024 - Jan Engelhardt -- 2.45.2