diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
| commit | d1a914082b7e53636f9801769ef96218b2125c4b (patch) | |
| tree | 998805fc59fe0b1bb105b24a6a79fff646257d96 /gnu/packages/sdl.scm | |
| parent | 657fb6c947d94cf946f29cd24e88bd080c01ff0a (diff) | |
| parent | ae548434337cddf9677a4cd52b9370810b2cc9b6 (diff) | |
| download | guix-d1a914082b7e53636f9801769ef96218b2125c4b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/sdl.scm')
| -rw-r--r-- | gnu/packages/sdl.scm | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index f73a26cff4..9e2d81f182 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,8 @@ (define-module (gnu packages sdl) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (gnu packages) #:use-module ((guix licenses) #:hide (freetype)) #:use-module (guix packages) @@ -140,7 +142,7 @@ system, such as sound redirection over the network.") (define-public sdl-gfx (package (name "sdl-gfx") - (version "2.0.24") + (version "2.0.26") (source (origin (method url-fetch) (uri @@ -148,18 +150,21 @@ system, such as sound redirection over the network.") version ".tar.gz")) (sha256 (base32 - "064islldm4r42lgj9fr4kbk66r7jmmakk9745hhyb1kmw71kib9h")))) + "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw")))) (build-system gnu-build-system) + (arguments + `(,@(if (any (cute string-prefix? <> (or (%current-system) + (%current-target-system))) + '("x86_64" "i686")) + ;; mmx is supported only on Intel processors. + '() + '(#:configure-flags '("--disable-mmx"))))) (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL graphics primitives library") (description "SDL_gfx provides graphics drawing primitives, rotozoom and other supporting functions for SDL.") (home-page "http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx") - (license zlib) - - ;; The code apparently includes Intel assembly, which fails to build on - ;; MIPS, at least. - (supported-systems '("i686-linux" "x86_64-linux")))) + (license zlib))) (define-public sdl-image (package |