Packaged some more SDL2 stuff as I frantically try to prepare Sly for
the Lisp Game Jam in January.

- Dave
From f0109ade56e024bf4ac0b6e1ac9ce3d0592964d1 Mon Sep 17 00:00:00 2001
From: David Thompson <dthomp...@vistahigherlearning.com>
Date: Tue, 15 Dec 2015 13:30:11 -0500
Subject: [PATCH 1/3] gnu: Add sdl2-image.

* gnu/packages/sdl.scm (propagated-inputs-with-sdl2): New procedure.
  (sdl2-image): New variable.
---
 gnu/packages/sdl.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 1b64be0..28213ef 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 David Thompson <dthomps...@worcester.edu>
+;;; Copyright © 2013, 2015 David Thompson <dthomps...@worcester.edu>
 ;;; Copyright © 2014 Mark H Weaver <m...@netris.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzs...@gmail.com>
 ;;; Copyright © 2015 Alex Kost <alez...@gmail.com>
@@ -20,6 +20,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages sdl)
+  #:use-module (ice-9 match)
   #:use-module (gnu packages)
   #:use-module ((guix licenses) #:hide (freetype))
   #:use-module (guix packages)
@@ -299,6 +300,28 @@ directory.")
     (home-page (package-home-page sdl))
     (license (package-license sdl))))
 
+(define (propagated-inputs-with-sdl2 package)
+  (map (match-lambda
+         (("sdl" _)
+          `("sdl2" ,sdl2))
+         (other other))
+       (package-propagated-inputs package)))
+
+(define-public sdl2-image
+  (package (inherit sdl-image)
+    (name "sdl2-image")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-";
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "0d3jlhkmr0j5a2dd5h6y29jfcsj7mkl16wghm6n3nqqp7g3ib65j"))))
+    (propagated-inputs
+     (propagated-inputs-with-sdl2 sdl-image))))
+
 (define-public guile-sdl
   (package
     (name "guile-sdl")
-- 
2.5.0

From 9c3d05c07c941e8031c583abb8acfe91fed11d12 Mon Sep 17 00:00:00 2001
From: David Thompson <dthomp...@vistahigherlearning.com>
Date: Tue, 15 Dec 2015 13:30:56 -0500
Subject: [PATCH 2/3] gnu: Add sdl2-mixer.

* gnu/packages/sdl.scm (sdl2-mixer): New variable.
---
 gnu/packages/sdl.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 28213ef..9857509 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -322,6 +322,22 @@ directory.")
     (propagated-inputs
      (propagated-inputs-with-sdl2 sdl-image))))
 
+(define-public sdl2-mixer
+  (package
+    (inherit sdl-mixer)
+    (name "sdl2-mixer")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-";
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "0nvjdxjchrajrn0jag877hdx9zb788hsd315zzg1lyck2wb0xkm8"))))
+    (propagated-inputs
+     (propagated-inputs-with-sdl2 sdl-mixer))))
+
 (define-public guile-sdl
   (package
     (name "guile-sdl")
-- 
2.5.0

From b0473e355c8661d77e575580e08852efa0060f36 Mon Sep 17 00:00:00 2001
From: David Thompson <dthomp...@vistahigherlearning.com>
Date: Tue, 15 Dec 2015 13:31:32 -0500
Subject: [PATCH 3/3] gnu: Add sdl2-ttf.

* gnu/packages/sdl.scm (sdl2-ttf): New variable.
---
 gnu/packages/sdl.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 9857509..d524abf 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -338,6 +338,22 @@ directory.")
     (propagated-inputs
      (propagated-inputs-with-sdl2 sdl-mixer))))
 
+(define-public sdl2-ttf
+  (package
+    (inherit sdl-ttf)
+    (name "sdl2-ttf")
+    (version "2.0.12")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-";
+                             version ".tar.gz"))
+             (sha256
+              (base32
+               "0vkg6lyj278mdpd52map3rfi65fbq16w67ahmmfcl77a8da60a47"))))
+    (propagated-inputs
+     (propagated-inputs-with-sdl2 sdl-ttf))))
+
 (define-public guile-sdl
   (package
     (name "guile-sdl")
-- 
2.5.0

Reply via email to