From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdueB-0004Zv-FD for guix-patches@gnu.org; Mon, 31 Dec 2018 05:18:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdue7-0004b8-6g for guix-patches@gnu.org; Mon, 31 Dec 2018 05:18:11 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdue2-0004K4-Bo for guix-patches@gnu.org; Mon, 31 Dec 2018 05:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdue2-0005op-46 for guix-patches@gnu.org; Mon, 31 Dec 2018 05:18:02 -0500 Subject: [bug#33935] PATCH] gnu: sdl2: Fix Wayland support. Resent-Message-ID: Received: from eggs.gnu.org ([208.118.235.92]:40558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdudb-0004Wu-P5 for guix-patches@gnu.org; Mon, 31 Dec 2018 05:17:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdudX-0002vy-9w for guix-patches@gnu.org; Mon, 31 Dec 2018 05:17:35 -0500 Received: from mx.kolabnow.com ([95.128.36.42]:58362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdudV-0002ZU-1a for guix-patches@gnu.org; Mon, 31 Dec 2018 05:17:29 -0500 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 8D662A46 for ; Mon, 31 Dec 2018 11:17:21 +0100 (CET) Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TFMl1gUCCkIa for ; Mon, 31 Dec 2018 11:17:20 +0100 (CET) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id 804D685E for ; Mon, 31 Dec 2018 11:17:20 +0100 (CET) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 539E624C for ; Mon, 31 Dec 2018 11:17:20 +0100 (CET) Date: Mon, 31 Dec 2018 11:17:00 +0100 From: Rutger Helling Message-ID: <20181231101700.38c9867e@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/s/lLyazLQsLeyc=oNXf3PHf"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33935@debbugs.gnu.org --Sig_/s/lLyazLQsLeyc=oNXf3PHf Content-Type: multipart/mixed; boundary="MP_/EVki68igl6.6ZsS_fPmKvn=" --MP_/EVki68igl6.6ZsS_fPmKvn= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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=3Dwayland 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=3D"" SDL_VIDEODRIVER=3Dwayland xonotic' and it'll run. The window cannot be killed by xkill, which means it's running Wayland natively. --MP_/EVki68igl6.6ZsS_fPmKvn= Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-sdl2-Fix-Wayland-support.patch =46rom 8861047922636a8a7cb10ca4a753c16c896b1ff9 Mon Sep 17 00:00:00 2001 From: Rutger Helling 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))) =20 --=20 2.20.1 --MP_/EVki68igl6.6ZsS_fPmKvn=-- --Sig_/s/lLyazLQsLeyc=oNXf3PHf Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlwp7JwACgkQ86cn20T8 yjY45AgArkyz9cOC4eCGgKsT86lDAnN7MBj87qPeo32JzjYNwVV6wKZllm4mS5az ygqTV3LxeXHyB20H+E9MtPsriILCn2ycyN1w9uMM9zniza59cHDq3km+8PN+Yd34 z43Z1K41zv9yaW7K5tDq3PlGnT5x73SPlC5VNctdnnZakb5UctW8tHHUuqC3/4xS aUA6Yty4BQs1NlngvNyHBJ3myaXAFd8CeWBmOg+EtnKVlBgpFBmGmF90dvAVOMCG 6c2FIv1IJS5wkXp2scQSxMd9XOJXzChjP+ScY32TEMiReaMCLoCY5wi8kdLUwsUn QBQ+DlxyfpCr1h98pnjikcjWnCeYGw== =Mzq0 -----END PGP SIGNATURE----- --Sig_/s/lLyazLQsLeyc=oNXf3PHf--