From patchwork Tue Mar 24 14:10:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 20873 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 85A6F27BBEA; Tue, 24 Mar 2020 14:12:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2A2EB27BBE4 for ; Tue, 24 Mar 2020 14:12:14 +0000 (GMT) Received: from localhost ([::1]:49538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGkHt-0004hn-O6 for patchwork@mira.cbaines.net; Tue, 24 Mar 2020 10:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55601) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGkHk-0004hR-2w for guix-patches@gnu.org; Tue, 24 Mar 2020 10:12:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGkHi-0003C7-Q0 for guix-patches@gnu.org; Tue, 24 Mar 2020 10:12:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49431) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGkHi-0003Bi-Ll for guix-patches@gnu.org; Tue, 24 Mar 2020 10:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jGkHi-00053f-Gl for guix-patches@gnu.org; Tue, 24 Mar 2020 10:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40211] [PATCH 1/2] gnu: sdl2: Use udev to discover input devices. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Mar 2020 14:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40211 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40211@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 40211-submit@debbugs.gnu.org id=B40211.158505909019393 (code B ref 40211); Tue, 24 Mar 2020 14:12:02 +0000 Received: (at 40211) by debbugs.gnu.org; 24 Mar 2020 14:11:30 +0000 Received: from localhost ([127.0.0.1]:55400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jGkHC-00052j-9E for submit@debbugs.gnu.org; Tue, 24 Mar 2020 10:11:30 -0400 Received: from araneo.si ([90.157.193.204]:34728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jGkHA-00052a-NN for 40211@debbugs.gnu.org; Tue, 24 Mar 2020 10:11:29 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 0e742cca for <40211@debbugs.gnu.org>; Tue, 24 Mar 2020 14:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=Bv5A1Z/c DLZgX+cbfskXvhM5+Hc=; b=nEW3leW0scvJlS0nbzm6qffbSZfpPE1NaClQ33ed oMRh3hK5x2fPndahwjrl1le/wLFdT1BY/lSsk4WQkx0n4/3HRWL5LZUES2W7PZFm RYEwO5jbdqieHfhnxnAQW/q6vHnppBIqvC6DYs0x3QsOCncxPmqs7ziS8cpmAD4D eyZahe/Ex/iLAj7pIpvQ7PIec7L4X2v25yO4Wi833Cwhy8ZuvhSyAtwz3NKnFxy0 fM6bTWfhD3KJE0TqpMoT6Zo4jSwEgUIx8FPbpMX8nt+uOjzQ07rmhDJNW63VXw1k wci0BwOoT3oBA8j+Gd14tcDl6ccCXdTxjBwvAPNKp7MvOg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id b78c5aa1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 24 Mar 2020 14:11:26 +0000 (UTC) From: Timotej Lazar Date: Tue, 24 Mar 2020 15:10:36 +0100 Message-Id: <20200324141037.28250-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.25.1 In-Reply-To: <87tv2dc0gw.fsf@araneo.si> References: <87tv2dc0gw.fsf@araneo.si> MIME-Version: 1.0 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: 209.51.188.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 Without udev SDL falls back on custom detection code, which blocks every three seconds while checking for new devices. * gnu/packages/sdl.scm (sdl2)[inputs]: Add eudev. [arguments]<#:make-flags>: Add LDFLAGS to include eudev in rpath so that dlopen can find it. --- gnu/packages/sdl.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 25b0bdba2b..8b21f813c9 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -132,20 +132,26 @@ joystick, and graphics hardware.") "--disable-kmsdrm-shared") ,flags)) ((#:make-flags flags ''()) - ;; Add the Fcitx header files to GCCs "system header" search path - ;; in order to suppress compiler warnings induced by those: - ;; .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids - ;; mixed declarations and code [-Werror=declaration-after-statement] - `(append (list (string-append "C_INCLUDE_PATH=" - (assoc-ref %build-inputs "fcitx") - "/include")) - ,flags)))) + `(cons* + ;; Add the Fcitx header files to GCCs "system header" search path + ;; in order to suppress compiler warnings induced by those: + ;; .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids + ;; mixed declarations and code [-Werror=declaration-after-statement] + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "fcitx") "/include") + ;; SDL dlopens libudev, so make sure it is in rpath. This overrides + ;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary + ;; as sdl2 includes Mesa by default. + (string-append "LDFLAGS=-Wl,-rpath," + (assoc-ref %build-inputs "eudev") "/lib") + ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems ;; experience a bug where input events are doubled. ;; ;; For more information, see: https://dev.solus-project.com/T1721 (append `(("dbus" ,dbus) + ("eudev" ,eudev) ; for discovering input devices ("fcitx" ,fcitx) ; helps with CJK input ("glib" ,glib) ("ibus" ,ibus)