Rutger Helling <rhelling@mykolab.com> writes:

> Hey Guix, 
>
> this patch updates SDL2 to 2.0.7 and enables the Wayland backend.

Excellent!

> From 8121e1100d56cbafa23a255fa6bd4f8c5b4fc7d3 Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Sun, 5 Nov 2017 12:01:04 +0100
> Subject: [PATCH] gnu: sdl2: Update to 2.0.7 and enable Wayland backend.
>
> * gnu/packages/sdl.scm (sdl2): Update to 2.0.7.
> * gnu/packages/sdl.scm (sdl2)[inputs]: Add wayland, wayland-protocols, libxkbcommon.

This forgot to mention the change to [arguments].

> @@ -94,7 +97,7 @@ joystick, and graphics hardware.")
>  (define-public sdl2
>    (package (inherit sdl)
>      (name "sdl2")
> -    (version "2.0.5")
> +    (version "2.0.7")
>      (source (origin
>               (method url-fetch)
>               (uri
> @@ -102,7 +105,21 @@ joystick, and graphics hardware.")
>                               version ".tar.gz"))
>               (sha256
>                (base32
> -               "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824"))))
> +               "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf"))))
> +    (arguments
> +     '(;; Explicitly link against shared libraries instead of dlopening them.
> +       ;; For X11, ALSA, PulseAudio and Wayland.
> +       ;; OpenGL library is still dlopened at runtime.
> +       #:configure-flags '("--disable-alsa-shared"
> +                           "--disable-pulseaudio-shared"
> +                           "--disable-x11-shared"
> +                           "--disable-wayland-shared"

I changed this section to inherit from 'sdl' and just add the wayland
flag, and updated the commit message accordingly.

> @@ -111,7 +128,10 @@ joystick, and graphics hardware.")
>       (append `(("dbus" ,dbus)
>                 ("fcitx" ,fcitx) ; helps with CJK input
>                 ("glib" ,glib)
> -               ("ibus" ,ibus))
> +               ("ibus" ,ibus)
> +               ("wayland", wayland)
> +               ("wayland-protocols", wayland-protocols)
> +               ("libxkbcommon", libxkbcommon))

And also restored the alphabetical ordering here to please the OCD.

Pushed as 39f2433c39b3cb6d1e4c0f04e8b735c181d6feac, thank you!