From eaac39f26386e3bce38a9cf6599241f3b98c9379 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 29 Jun 2023 22:54:14 +0200 Subject: [PATCH] SDL2: update to 2.28.0 --- .../SDL2/patches/fix-libdecor-api-usage.patch | 36 +++++++++++++++++++ srcpkgs/SDL2/template | 4 +-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch diff --git a/srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch b/srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch new file mode 100644 index 000000000000..b59ad6907512 --- /dev/null +++ b/srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch @@ -0,0 +1,36 @@ +From 5d9013beb9a9d443441de12935720f41c231d061 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten +Date: Fri, 26 May 2023 23:00:56 +0200 +Subject: [PATCH] wayland: don't use libdecor_frame_get_* functions when header + doesn't have it + +and we're statically linking to the library. +This fixes building SDL with -DSDL_WAYLAND_SHARED=OFF + +(cherry picked from commit 5b5b67df203e9f8391e7e53aa5de54abf14c482e) +(cherry picked from commit e6f635ca172027f57542b715787ac5b50f3f6d33) +--- + src/video/wayland/SDL_waylandsym.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h +index 4d6cdc95474a..c59bb30c9c81 100644 +--- a/src/video/wayland/SDL_waylandsym.h ++++ b/src/video/wayland/SDL_waylandsym.h +@@ -217,6 +217,7 @@ SDL_WAYLAND_SYM(bool, libdecor_configuration_get_window_state, (struct libdecor_ + enum libdecor_window_state *)) + SDL_WAYLAND_SYM(int, libdecor_dispatch, (struct libdecor *, int)) + ++#if defined(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR) || defined(SDL_HAVE_LIBDECOR_GET_MIN_MAX) + /* 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 *,\ + int *,\ +@@ -226,6 +227,8 @@ SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_max_content_size, (struct libdecor_ + int *)) + #endif + ++#endif ++ + #undef SDL_WAYLAND_MODULE + #undef SDL_WAYLAND_SYM + #undef SDL_WAYLAND_SYM_OPT diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index d8fb73d1dd1a..007bee85ca23 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,6 +1,6 @@ # Template file for 'SDL2' pkgname=SDL2 -version=2.26.5 +version=2.28.0 revision=1 build_style=cmake configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF @@ -15,7 +15,7 @@ license="Zlib" homepage="https://www.libsdl.org/" changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt" distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz" -checksum=ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7 +checksum=d215ae4541e69d628953711496cd7b0e8b8d5c8d811d5b0f98fdc7fd1422998a # Package build options build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"