[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/30: gnu: sdl2: Use udev to discover input devices.
From: |
guix-commits |
Subject: |
02/30: gnu: sdl2: Use udev to discover input devices. |
Date: |
Thu, 2 Apr 2020 14:55:43 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 9d4ed3570395a6e898ade698186a5f9cd23097cc
Author: Timotej Lazar <address@hidden>
AuthorDate: Tue Mar 24 15:10:36 2020 +0100
gnu: sdl2: Use udev to discover input devices.
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.
Signed-off-by: Marius Bakke <address@hidden>
---
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 25b0bdb..8b21f81 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)
- branch master updated (8549e47 -> 70c128d), guix-commits, 2020/04/02
- 01/30: gnu: python-pyasn1: Update to 0.4.8., guix-commits, 2020/04/02
- 02/30: gnu: sdl2: Use udev to discover input devices.,
guix-commits <=
- 04/30: gnu: Add emacs-ac-geiser., guix-commits, 2020/04/02
- 05/30: gnu: Add r-oenb., guix-commits, 2020/04/02
- 06/30: gnu: cedille: Fix emacs outputs., guix-commits, 2020/04/02
- 03/30: gnu: sdl2: Update to 2.0.12., guix-commits, 2020/04/02
- 07/30: gnu: cedille: Install the info pages., guix-commits, 2020/04/02
- 10/30: gnu: proof-general: Update to 4.4., guix-commits, 2020/04/02
- 11/30: gnu: proof-general: Update home-page., guix-commits, 2020/04/02
- 08/30: gnu: Add xwallpaper., guix-commits, 2020/04/02
- 12/30: gnu: Add font-iosevka-term-slab., guix-commits, 2020/04/02
- 09/30: gnu: gnome-default-applications: Change defaults.list to gnome-mimeapps.list., guix-commits, 2020/04/02