* [bug#33935] PATCH] gnu: sdl2: Fix Wayland support.
@ 2018-12-31 10:17 Rutger Helling
2018-12-31 10:26 ` bug#33935: " Rutger Helling
0 siblings, 1 reply; 2+ messages in thread
From: Rutger Helling @ 2018-12-31 10:17 UTC (permalink / raw)
To: 33935
[-- Attachment #1.1: Type: text/plain, Size: 543 bytes --]
Hi Guix,
I've discovered that our SDL2 unfortunately does not correctly support
Wayland at the moment. I found while running Xonotic I could still kill
the window with xkill, even with the SDL_VIDEODRIVER=wayland variable
set. I unset the DISPLAY variable and tried running it that way and
found that it gave an error and refused to start.
This patch should fix the support. I can now run 'DISPLAY=""
SDL_VIDEODRIVER=wayland xonotic' and it'll run. The window cannot be
killed by xkill, which means it's running Wayland natively.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-sdl2-Fix-Wayland-support.patch --]
[-- Type: text/x-patch, Size: 1398 bytes --]
From 8861047922636a8a7cb10ca4a753c16c896b1ff9 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Mon, 31 Dec 2018 11:07:05 +0100
Subject: [PATCH] gnu: sdl2: Fix Wayland support.
* gnu/packages/sdl.scm (sdl2)[propagated-inputs]: Add "wayland-protocols".
[inputs]: Remove "wayland-protocols".
---
gnu/packages/sdl.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 619892572..e272c0f8d 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -116,6 +116,9 @@ joystick, and graphics hardware.")
((#:configure-flags flags)
`(append '("--disable-wayland-shared")
,flags))))
+ (propagated-inputs
+ (append `(("wayland-protocols" ,wayland-protocols))
+ (package-propagated-inputs sdl)))
(inputs
;; SDL2 needs to be built with ibus support otherwise some systems
;; experience a bug where input events are doubled.
@@ -126,8 +129,7 @@ joystick, and graphics hardware.")
("glib" ,glib)
("ibus" ,ibus)
("libxkbcommon" ,libxkbcommon)
- ("wayland" ,wayland)
- ("wayland-protocols" ,wayland-protocols))
+ ("wayland" ,wayland))
(package-inputs sdl)))
(license bsd-3)))
--
2.20.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#33935: PATCH] gnu: sdl2: Fix Wayland support.
2018-12-31 10:17 [bug#33935] PATCH] gnu: sdl2: Fix Wayland support Rutger Helling
@ 2018-12-31 10:26 ` Rutger Helling
0 siblings, 0 replies; 2+ messages in thread
From: Rutger Helling @ 2018-12-31 10:26 UTC (permalink / raw)
To: 33935-done
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
Ignore this, the problem was due to a wrong alias in my .bashrc. Sorry
for the noise!
On Mon, 31 Dec 2018 11:17:00 +0100
Rutger Helling <rhelling@mykolab.com> wrote:
> Hi Guix,
>
> I've discovered that our SDL2 unfortunately does not correctly support
> Wayland at the moment. I found while running Xonotic I could still
> kill the window with xkill, even with the SDL_VIDEODRIVER=wayland
> variable set. I unset the DISPLAY variable and tried running it that
> way and found that it gave an error and refused to start.
>
> This patch should fix the support. I can now run 'DISPLAY=""
> SDL_VIDEODRIVER=wayland xonotic' and it'll run. The window cannot be
> killed by xkill, which means it's running Wayland natively.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-31 10:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-31 10:17 [bug#33935] PATCH] gnu: sdl2: Fix Wayland support Rutger Helling
2018-12-31 10:26 ` bug#33935: " Rutger Helling
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).