summaryrefslogtreecommitdiff
path: root/gnu/packages/sdl.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-10-12 16:50:47 +0000
committerMathieu Othacehe <othacehe@gnu.org>2021-10-12 17:46:23 +0000
commita1eca979fb8da842e73c42f4f53be29b169810f2 (patch)
tree681c7283e412bb8a29c2531c4408b49c3e184764 /gnu/packages/sdl.scm
parent48d86a9ec6d8d2e97da2299ea41a03ef4cdaab83 (diff)
parent371aa5777a3805a3886f3feea5f1960fe3fe4219 (diff)
Merge remote-tracking branch 'origin/master' into core-updates-frozen.
Diffstat (limited to 'gnu/packages/sdl.scm')
-rw-r--r--gnu/packages/sdl.scm37
1 files changed, 23 insertions, 14 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index f2afe763c5..bdc9a5b39f 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -376,15 +376,21 @@ tagged text in SDL applications.")
(define-public sdl-ttf
(package
(name "sdl-ttf")
- (version "2.0.11")
+ (version "2.0.11.1")
+ ;; No release tarball for 2.0.11.1, changes:
+ ;; <https://github.com/libsdl-org/SDL_ttf/commit/e31d11a692>
(source (origin
- (method url-fetch)
- (uri
- (string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-"
- version ".tar.gz"))
- (sha256
- (base32
- "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"))))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libsdl-org/SDL_ttf")
+ (commit "e31d11a692e5b55e8e624ad766e4e44d655422c8")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1id1cdign615wd5rq0g4ppzwclvhkwd61yb5rwvvvakkpplp3lvd"))
+ ;; Remove bundled libraries.
+ (modules '((guix build utils)))
+ (snippet '(delete-file-recursively "external"))))
(build-system gnu-build-system)
(propagated-inputs `(("sdl" ,sdl)))
(inputs `(("freetype" ,freetype)
@@ -620,19 +626,19 @@ sound and device input (keyboards, joysticks, mice, etc.).")
(define-public guile-sdl2
(package
(name "guile-sdl2")
- (version "0.6.0")
+ (version "0.7.0")
(source (origin
(method url-fetch)
(uri (string-append "https://files.dthompson.us/guile-sdl2/"
"guile-sdl2-" version ".tar.gz"))
(sha256
(base32
- "06vrknn4iz0ag932rb4almyhi9cvdkn081shvsi0h4skd6ry8bdl"))))
+ "197dzkxw8nv92da56iv2r8ih5r3pr4pd5c5j2q83aqb78h4jqjl7"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")))
(native-inputs
- `(("guile" ,guile-2.2)
+ `(("guile" ,guile-3.0)
("pkg-config" ,pkg-config)))
(inputs
`(("sdl2" ,sdl2)
@@ -647,13 +653,16 @@ The bindings are written in pure Scheme using Guile's foreign function
interface.")
(license lgpl3+)))
-(define-public guile3.0-sdl2
+(define-public guile2.2-sdl2
(package/inherit guile-sdl2
- (name "guile3.0-sdl2")
+ (name "guile2.2-sdl2")
(native-inputs
- `(("guile" ,guile-3.0)
+ `(("guile" ,guile-2.2)
("pkg-config" ,pkg-config)))))
+(define-public guile3.0-sdl2
+ (deprecated-package "guile3.0-sdl2" guile-sdl2))
+
(define-public sdl2-cs
(let ((commit "1a3556441e1394eb0b5d46aeb514b8d1090b93f8"))
(package