[bug#29155] [PATCH] gnu: sdl2: Update to 2.0.7 and enable Wayland backend.

[bug#29155] [PATCH] gnu: sdl2: Update to 2.0.7 and enable Wayland backend.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 77 bytes --]

Hey Guix, 

this patch updates SDL2 to 2.0.7 and enables the Wayland backend.

[-- Attachment #1.2: Type: text/html, Size: 270 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-sdl2-Update-to-2.0.7-and-enable-Wayland-backend.patch --]
[-- Type: text/x-diff; name=0001-gnu-sdl2-Update-to-2.0.7-and-enable-Wayland-backend.patch, Size: 3328 bytes --]

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.
---
 gnu/packages/sdl.scm | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index d3edac14f..eeb5bf5d6 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015, 2017 Sou Bunnbu <iyzsong@member.fsf.org>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,7 @@
   #:use-module (gnu packages audio)
   #:use-module (gnu packages fcitx)
   #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages ibus)
@@ -42,6 +44,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xorg)
   #:export (sdl-union))
@@ -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"
+                           ;; Explicitly link with mesa.
+                           ;; This add mesa to libsdl's RUNPATH, to make dlopen
+                           ;; finding the libGL from mesa at runtime.
+                           "LDFLAGS=-lGL")
+
+       #:tests? #f)) ; no check target
     (inputs
      ;; SDL2 needs to be built with ibus support otherwise some systems
      ;; experience a bug where input events are doubled.
@@ -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))
              (package-inputs sdl)))
     (license bsd-3)))
 
-- 
2.15.0

bug#29155: [PATCH] gnu: sdl2: Update to 2.0.7 and enable Wayland backend.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2278 bytes --]

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!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]