From patchwork Mon Dec 31 10:17:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutger Helling X-Patchwork-Id: 617 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D878D169D5; Mon, 31 Dec 2018 10:18:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 4C0F6169B0 for ; Mon, 31 Dec 2018 10:18:15 +0000 (GMT) Received: from localhost ([127.0.0.1]:49296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdueE-0004aI-Cf for patchwork@mira.cbaines.net; Mon, 31 Dec 2018 05:18:14 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33935] PATCH] gnu: sdl2: Fix Wayland support. Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Dec 2018 10:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33935@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154625145922333 (code B ref -1); Mon, 31 Dec 2018 10:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2018 10:17:39 +0000 Received: from localhost ([127.0.0.1]:42816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdude-0005o8-Pe for submit@debbugs.gnu.org; Mon, 31 Dec 2018 05:17:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdudc-0005o1-Tt for submit@debbugs.gnu.org; Mon, 31 Dec 2018 05:17:37 -0500 Received: from lists.gnu.org ([208.118.235.17]:59664) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gdudc-00039n-Lt for submit@debbugs.gnu.org; Mon, 31 Dec 2018 05:17:36 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1546251440; x=1548065841; bh=MNq6QfyMJSs3M/26nY1 F4bBN2opcs+75SbkcVsa6TTo=; b=2lbB/wkolgm+LVSverJz9x5/6I7SUjUVeDU pyL1fWFQOPgit/9+cBryMTEBRre2x6oZ0cpT5mDO4NvEmA4aEXts371ryiPGNDcx Z2FwjFcZWyLvuurjx0/rr7NQahnPi4S/QsYFL/Fhpx09kudG38DGGAm8lamamRMh 2XJCjjgpTe/bM6zOkbhc2j/7jkzxhawGxb90PIGViYZ/8DZFbCyPOJ+kX1xbPG1S Uwb7K+YHepMgcJRur6gH13zmABt6hj8WhmhSHArB+NvcxFROei6cOHSufIsQ7dQy aDAKfqdJW29/wbXngGXnijL1oplhEGHkfOV6tbWvnUGBQr79ys/rjLFEDFGOAvOt Il+VD11l4fGG+n2kv+kTm8fa7TJ66rxRbvqhgqchc6z+RkLKNev9/sBQLrqWDjKW gglbk99bZUqlUoCNpHvVV38hzzMB7+6JVWI87Z4pKb3i2zXddfAHu+cub8o4x/aL YsGI1/9Rq6M5ExT58X0oTRLkCyT5vsHghcAdwli0t6y7dj+EW5IWr7stJS2ZA5/C +jKgo/YVdVaJM8ToSncGnNdBrw77cDQZdhTwrZGz5bX6rPGUz9HykHDvOQdbJ06L FP7C8pAo1/j/CzH9DV9aH199Ez0RaGXuYnU308UelfIgd1gVRdmPuD14nCMprzCN kTdwZxEk= X-Virus-Scanned: amavisd-new at mykolab.com 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. From 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))) -- 2.20.1