From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBObb-0008Lp-0c for guix-patches@gnu.org; Sun, 05 Nov 2017 12:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBObX-0000RP-S3 for guix-patches@gnu.org; Sun, 05 Nov 2017 12:21:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:43831) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eBObX-0000RB-OY for guix-patches@gnu.org; Sun, 05 Nov 2017 12:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eBObX-0006Kj-Hb for guix-patches@gnu.org; Sun, 05 Nov 2017 12:21:03 -0500 Subject: bug#29155: [PATCH] gnu: sdl2: Update to 2.0.7 and enable Wayland backend. Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Marius Bakke In-Reply-To: <55e11bbb331138bb5d92f6c862bba95b@mykolab.com> References: <55e11bbb331138bb5d92f6c862bba95b@mykolab.com> Date: Sun, 05 Nov 2017 18:20:14 +0100 Message-ID: <87h8u8fxrl.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Rutger Helling , 29155-done@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Rutger Helling writes: > Hey Guix,=20 > > 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 > 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, li= bxkbcommon. 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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAln/SE4ACgkQoqBt8qM6 VPo34gf7BcKJjoQD5rPNEhsTf0l35C+Jn1Ot1OlB2Hx2lt/oyd4VuroNA8+ClndF KpR/sk5DpnUhM1d44EIuUsLHz4xlAN9QnEK3fNyolhBsW60wyE34DicA83EOrD08 S1nIKZSn6rVnUJ2BHy2nujpFPbXAi6QtfjDTshbNqRM7OIPfYRc/zkGGxCt7RayN CcXDYiffPgCGVlw37OXp+EeUJOu48FjAPspjvb/2cOZxronGh/muJhd6xByiNLnU uanOuXqXQnltsnd+xER6X+IqNmaoRT8JpVUPuJT3oqwyOEp39lYMx4M7TG0Fpzxs qZoLYTIqet07nhX97N64nKhS1b6mHg== =ZL8H -----END PGP SIGNATURE----- --=-=-=--