;;; 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>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;; finding the libGL from mesa at runtime.
"LDFLAGS=-lGL")
+ #:make-flags '("V=1") ;build verbosely
+
#:tests? #f)) ; no check target
(propagated-inputs
;; SDL headers include X11 headers.
`(("libx11" ,libx11)
- ("libcap" ,libcap))) ; 'libSDL.la' contain `-lcap'.
+ ("libcap" ,libcap) ; 'libSDL.la' contain `-lcap'.
+ ;; TODO: Since building Mesa with Meson it is now necessary that Mesa is
+ ;; a propogated input. We still need to figure out why, possibly due to a
+ ;; change in pkg-config.
+ ("mesa" ,mesa)))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("libxrandr" ,libxrandr)
- ("mesa" ,mesa)
("glu" ,glu)
("alsa-lib" ,alsa-lib)
("pulseaudio" ,pulseaudio)))
(define-public sdl2
(package (inherit sdl)
(name "sdl2")
- (version "2.0.8")
+ (version "2.0.10")
(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
- "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"))))
+ "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"))))
(arguments
(substitute-keyword-arguments (package-arguments sdl)
((#:configure-flags flags)
- `(append '("--disable-wayland-shared")
+ `(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
+ "--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))))
(inputs
;; SDL2 needs to be built with ibus support otherwise some systems
(define-public libmikmod
(package
(name "libmikmod")
- (version "3.3.10")
+ (version "3.3.11.1")
(source (origin
(method url-fetch)
(uri (list
version "/libmikmod-" version ".tar.gz")))
(sha256
(base32
- "0j7g4jpa2zgzw7x6s3rldypa7zlwjvn97rwx0sylx1iihhlzbcq0"))))
+ "06bdnhb0l81srdzg6gn2v2ydhhaazza7rshrcj3q8dpqr3gn97dd"))))
(build-system gnu-build-system)
(arguments
;; By default, libmikmod tries to dlopen libasound etc., which won't work
(other other))
(package-propagated-inputs package)))
-(define-public sdl2-image
- (package (inherit sdl-image)
- (name "sdl2-image")
- (version "2.0.2")
+(define-public sdl2-gfx
+ (package (inherit sdl-gfx)
+ (name "sdl2-gfx")
+ (version "1.0.4")
(source (origin
(method url-fetch)
(uri
- (string-append "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-"
+ (string-append "https://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-"
version ".tar.gz"))
(sha256
(base32
- "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj"))))
+ "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"))))
+ (propagated-inputs
+ (propagated-inputs-with-sdl2 sdl-gfx))))
+
+(define-public sdl2-image
+ (package (inherit sdl-image)
+ (name "sdl2-image")
+ (version "2.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://www.libsdl.org/projects/SDL_image/release/"
+ "SDL2_image-" version ".tar.gz"))
+ (sha256
+ (base32 "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7"))))
(propagated-inputs
(propagated-inputs-with-sdl2 sdl-image))))
(define-public sdl2-mixer
(package (inherit sdl-mixer)
(name "sdl2-mixer")
- (version "2.0.2")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-"
- version ".tar.gz"))
- (modules '((guix build utils)))
- (snippet '(begin
- ;; Remove bundled libraries.
- (delete-file-recursively "external")
- #t))
- (sha256
- (base32
- "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"))))
+ (version "2.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "http://www.libsdl.org/projects/SDL_mixer/release/"
+ "SDL2_mixer-" version ".tar.gz"))
+ (modules '((guix build utils)))
+ (snippet '(begin
+ ;; Remove bundled libraries.
+ (delete-file-recursively "external")
+ #t))
+ (sha256
+ (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"))))
(propagated-inputs
(propagated-inputs-with-sdl2 sdl-mixer))))
+(define-public sdl2-net
+ (package (inherit sdl-net)
+ (name "sdl2-net")
+ (version "2.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "http://www.libsdl.org/projects/SDL_net/release/"
+ "SDL2_net-" version ".tar.gz"))
+ (sha256
+ (base32
+ "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"))))
+ (propagated-inputs
+ (propagated-inputs-with-sdl2 sdl-net))))
+
(define-public sdl2-ttf
(package (inherit sdl-ttf)
(name "sdl2-ttf")
- (version "2.0.14")
+ (version "2.0.15")
(source (origin
(method url-fetch)
(uri
#t))
(sha256
(base32
- "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"))))
+ "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"))))
(propagated-inputs
(propagated-inputs-with-sdl2 sdl-ttf))))
(define-public guile-sdl2
(package
(name "guile-sdl2")
- (version "0.2.0")
+ (version "0.4.0")
(source (origin
(method url-fetch)
- (uri (string-append
- "https://files.dthompson.us/guile-sdl2/guile-sdl2-"
- version ".tar.gz"))
+ (uri (string-append "https://files.dthompson.us/guile-sdl2/"
+ "guile-sdl2-" version ".tar.gz"))
(sha256
(base32
- "0yq9lsl17cdvj77padvpk3jcw2g6g0pck9jrchc7n2767rrc012b"))))
+ "0zcxwgyadwpbhq6h5mv2569c3kalgra26zc186y9fqiyyzmh1v9s"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
(string-append "--with-libsdl2-ttf-prefix="
(assoc-ref %build-inputs "sdl2-ttf"))
(string-append "--with-libsdl2-mixer-prefix="
- (assoc-ref %build-inputs "sdl2-mixer")))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'patch-makefile
- (lambda _
- ;; Install compiled Guile files in the expected place.
- (substitute* '("Makefile")
- (("^godir = .*$")
- "godir = $(moddir)\n"))
- #t)))))
+ (assoc-ref %build-inputs "sdl2-mixer")))))
(native-inputs
`(("guile" ,guile-2.2)
("pkg-config" ,pkg-config)))
HCoop / jackhill / guix / guix.git / blobdiff