From 4d91af60a795d261d626d596a6f506f196ec516c Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 10 Oct 2022 09:11:42 -0400
Subject: Update guile-sdl2 and chickadee to latest commits.

---
 guix.scm | 59 +++++++++++++++++++----------------------------------------
 1 file changed, 19 insertions(+), 40 deletions(-)

diff --git a/guix.scm b/guix.scm
index 909f2ad..591f40a 100644
--- a/guix.scm
+++ b/guix.scm
@@ -88,7 +88,7 @@
                (invoke "autoreconf" "-vfi")))))))))
 
 (define guile-sdl2
-  (let ((commit "4811db26a9142ac587649cfa325e0bfc5b9f761e"))
+  (let ((commit "e9a7f5e748719ce5b6ccd08ff91861b578034ea6"))
     (package
       (name "guile-sdl2")
       (version (string-append "0.7.0-1." (string-take commit 7)))
@@ -99,7 +99,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "1qd12r0a70g9372bk3hcqz3rhwjlfqsg7vh5qbhb57a9nq5xf3jx"))))
+                  "0ay7mcar8zs0j5rihwlzi0l46vgg9i93piip4v8a3dzwjx3myr7v"))))
       (build-system gnu-build-system)
       (arguments
        '(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -108,15 +108,8 @@
            (add-after 'unpack 'bootstrap
                       (lambda _
                         (invoke "sh" "bootstrap"))))))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)
-         ("texinfo" ,texinfo)))
-      (inputs
-       `(("guile" ,target-guile)
-         ("sdl2" ,sdl2)
-         ("sdl2-image" ,sdl2-image)))
+      (native-inputs (list autoconf automake pkg-config texinfo))
+      (inputs (list target-guile sdl2))
       (synopsis "Guile bindings for SDL2")
       (description "Guile-sdl2 provides pure Guile Scheme bindings to the
 SDL2 C shared library via the foreign function interface.")
@@ -124,7 +117,7 @@ SDL2 C shared library via the foreign function interface.")
       (license license:lgpl3+))))
 
 (define chickadee
-  (let ((commit "4a3f324602a057f98d23336f59031c3d10e8bb3b"))
+  (let ((commit "5ed490cac58d9f548bc141cc334c25dea9bfcaf2"))
     (package
      (name "chickadee")
      (version (string-append "0.8.0-1." (string-take commit 7)))
@@ -135,7 +128,7 @@ SDL2 C shared library via the foreign function interface.")
                     (commit commit)))
               (sha256
                (base32
-                "1i31lhzzdigbxy8dv594qrcpx2hbkbcrfkbmdh0605n4mn6lfwqr"))))
+                "1wq1v19qp2q31ybjqzw0xccyw5v03hh9y79z8rjd6l83vbp1nvkx"))))
      (build-system gnu-build-system)
      (arguments
       '(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -144,23 +137,16 @@ SDL2 C shared library via the foreign function interface.")
                        (add-after 'unpack 'bootstrap
                                   (lambda _
                                     (invoke "sh" "bootstrap"))))))
-     (native-inputs
-      `(("autoconf" ,autoconf)
-        ("automake" ,automake)
-        ("pkg-config" ,pkg-config)
-        ("texinfo" ,texinfo)))
-     (inputs
-      `(("freetype" ,freetype)
-        ("guile" ,target-guile)
-        ("libjpeg-turbo" ,libjpeg-turbo)
-        ("libpng" ,libpng)
-        ("libvorbis" ,libvorbis)
-        ("mpg123" ,mpg123)
-        ("openal" ,openal)
-        ("readline" ,readline)))
-     (propagated-inputs
-      `(("guile-opengl" ,guile3.0-opengl)
-        ("guile-sdl2" ,guile-sdl2)))
+     (native-inputs (list autoconf automake pkg-config texinfo))
+     (inputs (list freetype
+                   libjpeg-turbo
+                   libpng
+                   libvorbis
+                   mpg123
+                   openal
+                   readline
+                   target-guile))
+     (propagated-inputs (list guile3.0-opengl guile-sdl2))
      (synopsis "Game development toolkit for Guile Scheme")
      (description "Chickadee is a game development toolkit for Guile
 Scheme.  It contains all of the basic components needed to develop
@@ -184,16 +170,9 @@ Scheme.  It contains all of the basic components needed to develop
        (add-after 'unpack 'bootstrap
          (lambda _
            (invoke "sh" "bootstrap"))))))
-  (native-inputs
-   `(("autoconf" ,autoconf)
-     ("automake" ,automake)
-     ("pkg-config" ,pkg-config)
-     ("texinfo" ,texinfo)))
-  (inputs
-   `(("guile" ,target-guile)))
-  (propagated-inputs
-   `(("guile-sdl2" ,guile-sdl2)
-     ("chickadee" ,chickadee)))
+  (native-inputs (list autoconf automake pkg-config texinfo))
+  (inputs (list target-guile))
+  (propagated-inputs (list chickadee guile-sdl2))
   (synopsis "Game engine for Scheme programmers")
   (description "Starling is a game engine written in Guile Scheme.")
   (home-page "https://dthompson.us/projects/chickadee.html")
-- 
cgit v1.2.3