[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/181: gnu: sdl2: Update to 2.24.0, use gexps and remove input labels.
From: |
guix-commits |
Subject: |
29/181: gnu: sdl2: Update to 2.24.0, use gexps and remove input labels. |
Date: |
Tue, 13 Sep 2022 02:25:13 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit f24bf279d41fab25ceb3fcc88bcd5da6fb1404ae
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Aug 22 17:16:51 2022 -0400
gnu: sdl2: Update to 2.24.0, use gexps and remove input labels.
* gnu/packages/sdl.scm (sdl2): Update to 2.24.0.
[arguments]: Use gexps.
[inputs]: Use modify-inputs and remove labels.
---
gnu/packages/sdl.scm | 61 +++++++++++++++++++++++++++-------------------------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 1805de09f2..2523889a8d 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,6 +35,7 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (gnu packages)
+ #:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
@@ -110,46 +112,47 @@ joystick, and graphics hardware.")
(license license:lgpl2.1)))
(define-public sdl2
- (package (inherit sdl)
+ (package
+ (inherit sdl)
(name "sdl2")
- (version "2.0.14")
+ (version "2.24.0")
(source (origin
- (method url-fetch)
- (uri
- (string-append "https://libsdl.org/release/SDL2-"
- version ".tar.gz"))
- (sha256
- (base32
- "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"))))
+ (method url-fetch)
+ (uri
+ (string-append "https://libsdl.org/release/SDL2-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "15vd9najhjh6s9z9hhx7zp51iby690a1g3h7kcwjvyb82x5w7r4i"))))
(arguments
(substitute-keyword-arguments (package-arguments sdl)
((#:configure-flags flags)
- `(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
- "--disable-kmsdrm-shared")
- ,flags))
+ #~(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
+ "--disable-kmsdrm-shared")
+ #$flags))
((#:make-flags flags ''())
- `(cons*
- ;; 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))))
+ #~(cons*
+ ;; 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,"
+ #$(this-package-input "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)
- ("libxkbcommon" ,libxkbcommon)
- ("libxcursor" ,libxcursor) ; enables X11 cursor support
- ("wayland" ,wayland)
- ("wayland-protocols" ,wayland-protocols))
- (package-inputs sdl)))
+ (modify-inputs (package-inputs sdl)
+ (append dbus
+ eudev ;for discovering input devices
+ fcitx ;helps with CJK input
+ glib
+ ibus
+ libxkbcommon
+ libxcursor ;enables X11 cursor support
+ wayland
+ wayland-protocols)))
(license license:bsd-3)))
(define-public libmikmod
- 33/181: gnu: evolution-data-server: Update to 3.44.4 and remove input labels., (continued)
- 33/181: gnu: evolution-data-server: Update to 3.44.4 and remove input labels., guix-commits, 2022/09/13
- 40/181: gnu: gdm: Use gexps and new style inputs., guix-commits, 2022/09/13
- 46/181: gnu: gjs: Update to 1.72.2., guix-commits, 2022/09/13
- 17/181: gnu: baobab: Update to 42.0 and delete input labels., guix-commits, 2022/09/13
- 36/181: gnu: Add wayland-protocols-next., guix-commits, 2022/09/13
- 35/181: gnu: pipewire-0.3: Update to 0.3.56 and use gexps., guix-commits, 2022/09/13
- 42/181: gnu: lxsession: Use polkit-duktape., guix-commits, 2022/09/13
- 15/181: gnu: libwacom: Update to 2.4.0., guix-commits, 2022/09/13
- 22/181: gnu: zenity: Update to 3.43.0., guix-commits, 2022/09/13
- 27/181: gnu: upower: Update to 1.90.0., guix-commits, 2022/09/13
- 29/181: gnu: sdl2: Update to 2.24.0, use gexps and remove input labels.,
guix-commits <=
- 34/181: gnu: gnome-online-accounts: Update to 3.44.0 and delete input labels., guix-commits, 2022/09/13
- 41/181: gnu: gdm: Patch dbus-run-session path., guix-commits, 2022/09/13
- 45/181: gnu: gjs: Remove input labels., guix-commits, 2022/09/13
- 47/181: gnu: mozjs: Update home-page., guix-commits, 2022/09/13
- 50/181: gnu: gtk: Replace librsvg with librsvg-bootstrap., guix-commits, 2022/09/13
- 53/181: gnu: Add rest-next., guix-commits, 2022/09/13
- 51/181: gnu: Add gobject-introspection-next., guix-commits, 2022/09/13
- 56/181: gnu: gnome-shell: Update to 42.4., guix-commits, 2022/09/13
- 57/181: gnu: colord-gtk: Update to 0.3.0., guix-commits, 2022/09/13
- 59/181: gnu: gnome-control-center: Update to 42.3., guix-commits, 2022/09/13