jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

SDL2: update to 2.0.16.

Browse source
This commit is contained in:
Arda Demir 2021-08-10 20:53:28 +03:00 committed by Michal Vasilek
parent 7545adcce1
commit 0d95455cd7
2 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch Normal file
View file

@ -0,0 +1,32 @@
From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
From: Ethan Lee <flibitijibibo@gmail.com>
Date: Wed, 11 Aug 2021 09:59:43 -0400
Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
fullscreen mode
---
src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index 025dd30ee..451d33b76 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
/* Foolishly do what the compositor says here. If it's wrong, don't
* blame us, we were explicitly instructed to do this.
+ *
+ * UPDATE: Nope, we can't actually do that, the compositor may give
+ * us a completely stateless, sizeless configure, with which we have
+ * to enforce our own state anyway.
*/
- window->w = width;
- window->h = height;
+ if (width != 0 && height != 0) {
+ window->w = width;
+ window->h = height;
+ }
/* This part is good though. */
if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {

24
srcpkgs/SDL2/template
View file

@ -1,6 +1,6 @@
# Template file for 'SDL2'
pkgname=SDL2
version=2.0.14
version=2.0.16
revision=1
build_style=gnu-configure
configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
short_desc="Simple DirectMedia Layer (version 2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Zlib"
homepage="http://www.libsdl.org/"
distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
homepage="https://www.libsdl.org/"
changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
# Package build options
build_options="gles opengl pulseaudio sndio vulkan wayland x11"
build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
case "$XBPS_TARGET_MACHINE" in
arm*)
@ -71,6 +72,13 @@ else
configure_args+=" --disable-pulseaudio"
fi
if [ "$build_option_pipewire" ]; then
configure_args+=" --enable-pipewire"
makedepends+=" pipewire-devel"
else
configure_args+=" --disable-pipewire"
fi
if [ "$build_option_sndio" ]; then
configure_args+=" --enable-sndio"
makedepends+=" sndio-devel"
@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
if [ -z "$build_option_gles" ]; then
msg_error "$pkgname: wayland option requires gles.\n"
fi
configure_args+=" --enable-video-wayland --disable-wayland-shared"
makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wayland-devel"
fi