[PATCH 0/2] Enable udev support in SDL2 and bump version

DoneSubmitted by Timotej Lazar.
Details
2 participants
  • Marius Bakke
  • Timotej Lazar
Owner
unassigned
Severity
normal
T
T
Timotej Lazar wrote on 24 Mar 15:05 +0100
(address . guix-patches@gnu.org)
87tv2dc0gw.fsf@araneo.si
Hi,
these patches update sdl2 to the latest release and enable udev support.Without udev I experienced freezes every few seconds in certain games(for instance hedgewars and supertux) as SDL searched through /dev/inputfor joysticks.
Since libudev is dlopened, I add it to rpath in make-flags. During buildthis overrides LDFLAGS from the base package’s configure-flags, whichadd mesa to rpath. AFAICT this is OK as sdl2 already includes mesa bylinking libgbm.
(Perhaps we could move LDFLAGS to make-flags in the base package, andmake the override explicit in the derived package? Or have sdl2 find andmodify the LDFLAGS entry from the base configure-flags, but that seemsmore trouble than it’s worth.)
I was able to rebuild all dependent packages with no (new) failures. Iran several games and everything appears OK, but I don’t have a joystickor gamepad to try.
There have been some issues in the past with SDL not finding (correct)libraries¹, so it would be good to test this on a foreign Guix install.As for the version bump, the changelog² doesn’t mention any significantchanges except for hidapi support, which is disabled by default.
Thanks!Timotej
¹ https://lists.gnu.org/archive/html/guix-devel/2015-03/msg00585.html² https://hg.libsdl.org/SDL/file/355a4f94a782/WhatsNew.txt
Timotej Lazar (2): gnu: sdl2: Use udev to discover input devices. gnu: sdl2: Update to 2.0.12.
gnu/local.mk | 1 - gnu/packages/patches/sdl2-mesa-compat.patch | 21 ---------------- gnu/packages/sdl.scm | 27 ++++++++++++--------- 3 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/sdl2-mesa-compat.patch
-- 2.25.1
T
T
Timotej Lazar wrote on 24 Mar 15:10 +0100
[PATCH 1/2] gnu: sdl2: Use udev to discover input devices.
(address . 40211@debbugs.gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
20200324141037.28250-1-timotej.lazar@araneo.si
Without udev SDL falls back on custom detection code, which blocks every threeseconds while checking for new devices.
* gnu/packages/sdl.scm (sdl2)[inputs]: Add eudev.[arguments]<#:make-flags>: Add LDFLAGS to include eudev in rpath so thatdlopen can find it.--- gnu/packages/sdl.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
Toggle diff (41 lines)diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scmindex 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)-- 2.25.1
T
T
Timotej Lazar wrote on 24 Mar 15:10 +0100
[PATCH 2/2] gnu: sdl2: Update to 2.0.12.
(address . 40211@debbugs.gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
20200324141037.28250-2-timotej.lazar@araneo.si
* gnu/packages/patches/sdl2-mesa-compat.patch: Delete file.* gnu/packages/sdl.scm (sdl2): Update to 2.0.12.[source]: Drop patch that was included in this release.--- gnu/local.mk | 1 - gnu/packages/patches/sdl2-mesa-compat.patch | 21 --------------------- gnu/packages/sdl.scm | 5 ++--- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 gnu/packages/patches/sdl2-mesa-compat.patch
Toggle diff (64 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex 7cce60b7c0..ef11ac4a04 100644--- a/gnu/local.mk+++ b/gnu/local.mk@@ -1411,7 +1411,6 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \- %D%/packages/patches/sdl2-mesa-compat.patch \ %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \diff --git a/gnu/packages/patches/sdl2-mesa-compat.patch b/gnu/packages/patches/sdl2-mesa-compat.patchdeleted file mode 100644index 8182e582e7..0000000000--- a/gnu/packages/patches/sdl2-mesa-compat.patch+++ /dev/null@@ -1,21 +0,0 @@-Do not include GLES header when OpenGL headers are already included.--Taken from upstream:-https://hg.libsdl.org/SDL/rev/369b01006eb2--diff -r 4cbaffd0083b -r 369b01006eb2 src/video/SDL_video.c---- a/src/video/SDL_video.c Fri Oct 11 06:18:24 2019 +0200-+++ b/src/video/SDL_video.c Sat Oct 12 18:47:56 2019 +0200-@@ -37,9 +37,9 @@- #include "SDL_opengl.h"- #endif /* SDL_VIDEO_OPENGL */- --#if SDL_VIDEO_OPENGL_ES-+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL- #include "SDL_opengles.h"--#endif /* SDL_VIDEO_OPENGL_ES */-+#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */- - /* GL and GLES2 headers conflict on Linux 32 bits */- #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL-diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scmindex 8b21f813c9..7b36d5509c 100644--- a/gnu/packages/sdl.scm+++ b/gnu/packages/sdl.scm@@ -115,16 +115,15 @@ joystick, and graphics hardware.") (define-public sdl2 (package (inherit sdl) (name "sdl2")- (version "2.0.10")+ (version "2.0.12") (source (origin (method url-fetch) (uri (string-append "https://libsdl.org/release/SDL2-" version ".tar.gz"))- (patches (search-patches "sdl2-mesa-compat.patch")) (sha256 (base32- "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"))))+ "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags)-- 2.25.1
M
M
Marius Bakke wrote on 2 Apr 18:27 +0200
Re: [bug#40211] [PATCH 0/2] Enable udev support in SDL2 and bump version
878sjdsvil.fsf@devup.no
Timotej,
Timotej Lazar <timotej.lazar@araneo.si> writes:
Toggle quote (26 lines)> Hi,>> these patches update sdl2 to the latest release and enable udev support.> Without udev I experienced freezes every few seconds in certain games> (for instance hedgewars and supertux) as SDL searched through /dev/input> for joysticks.>> Since libudev is dlopened, I add it to rpath in make-flags. During build> this overrides LDFLAGS from the base package’s configure-flags, which> add mesa to rpath. AFAICT this is OK as sdl2 already includes mesa by> linking libgbm.>> (Perhaps we could move LDFLAGS to make-flags in the base package, and> make the override explicit in the derived package? Or have sdl2 find and> modify the LDFLAGS entry from the base configure-flags, but that seems> more trouble than it’s worth.)>> I was able to rebuild all dependent packages with no (new) failures. I> ran several games and everything appears OK, but I don’t have a joystick> or gamepad to try.>> There have been some issues in the past with SDL not finding (correct)> libraries¹, so it would be good to test this on a foreign Guix install.> As for the version bump, the changelog² doesn’t mention any significant> changes except for hidapi support, which is disabled by default.
Thank you for the excellent research, bugfix, and patches.
I have applied both and hope that it will fix a longstanding problemwith SuperTuxKart and multiple gamepads that I will try out hopefullythis weekend.
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6GEnIACgkQoqBt8qM6VPpRIAgAwY6EM2qc0BYXTftuMViG0e0RTQ4oQCODnNdyjuaxDRuMte68s8i+oXm4Pu9hAQftK8g9bPFvqGVxxRQj/X6Em+lDSdY29MDoZ4AP8vaO1VPJS3FkQuRGrjbFPiEktTHpZH+iQNHq53X8BPj0XbazShjwxc4e904l5QE0nUYOg3Q4i++ZH6/Zif8CYvFHXtYb3fvyQ21hq0Nb0kiNzBNu/fUACO2c4eDn5nh89k17rrnZDBPIPtM9tqlY7pjtOHcrOnILzj0H3irvOlAq/8Up4Q2sUXWFa7IvQdkVoNY3GG3VcyiTcRPZzngDVfZHQhOtwFeoQh+D2aSM1a5k0uzndQ===PEqQ-----END PGP SIGNATURE-----
Closed
?