From 09482dcb06d0484f033edf5fcf2377b5a48f2deb Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Tue, 28 Sep 2021 22:26:19 +0800 Subject: gnu: sdl-ttf: Update to 2.0.11.1. * gnu/packages/sdl.scm (sdl-ttf): Update to 2.0.11.1. --- gnu/packages/sdl.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu/packages/sdl.scm') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 128bd95af8..f73a0258cb 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: + ;; (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) -- cgit v1.2.3 From 73bb0b64855e07e17e73acbea4616ffa44630250 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 9 Oct 2021 11:11:44 +0200 Subject: gnu: guile-sdl2: Update to 0.7.0. * gnu/packages/sdl.scm (guile-sdl2): Update to 0.7.0. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/sdl.scm') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index f73a0258cb..d8f8c0e731 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -626,14 +626,14 @@ 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"))) -- cgit v1.2.3 From fed33f701367cae49cfa1a4c619dade3d735b575 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 9 Oct 2021 11:12:00 +0200 Subject: gnu: guile-sdl2: Build with guile-3.0. * gnu/packages/sdl.scm (guile-sdl2)[native-inputs]: Use guile-3.0 as guile. (guile-2.2): New variable. (guile-3.0): Deprecate in favor of guile-sdl2. --- gnu/packages/sdl.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages/sdl.scm') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index d8f8c0e731..3e5b928012 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -638,7 +638,7 @@ sound and device input (keyboards, joysticks, mice, etc.).") (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) (native-inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("pkg-config" ,pkg-config))) (inputs `(("sdl2" ,sdl2) @@ -653,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 -- cgit v1.2.3