From 78a3da3d18968cf730ae384e8fc0b4ceabb76b77 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 3 Nov 2019 01:05:37 -0400 Subject: gnu: freedoom: Update to 0.12.1. * gnu/packages/games.scm (freedoom): Update to 0.12.1. [arguments]: Update 'configure' phase accordingly. [native-inputs]: Replace python-2 with python; add python-pillow; remove font-dejavu and imagemagick. [inputs]: Remove prboom-plus. --- gnu/packages/games.scm | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4983ca63bc..b6bf2fee5c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -500,7 +500,7 @@ (define-public cowsay (define-public freedoom (package (name "freedoom") - (version "0.11.3") + (version "0.12.1") (source (origin (method git-fetch) @@ -509,38 +509,19 @@ (define-public freedoom (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0k4dlgr82qk6i7dchp3nybq6awlfag2ivy3zzl1v6vhcrnbvssgl")))) + (base32 "1mq60lfwaaxmch7hsz8403pwafnlsmsd5z2df2j77ppwndwcrypb")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) - #:parallel-build? #f #:tests? #f ; no check target #:phases (modify-phases %standard-phases (delete 'bootstrap) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((dejavu (assoc-ref inputs "font-dejavu")) - (freedoom (assoc-ref outputs "out")) + (let* ((freedoom (assoc-ref outputs "out")) (wad-dir (string-append freedoom "/share/games/doom"))) - ;; Replace the font-searching function in a shell - ;; script with a direct path to the required font. - ;; This is necessary because ImageMagick can only find the - ;; most basic fonts while in the build environment. - (substitute* "graphics/titlepic/create_caption" - (("font=\\$\\(find_font.*$") - (string-append - "font=" dejavu - "/share/fonts/truetype/DejaVuSansCondensed-Bold.ttf\n"))) - ;; Make icon creation reproducible. - (substitute* "dist/Makefile" - (("freedm.png") - "-define png:exclude-chunks=date freedm.png") - (("freedoom1.png") - "-define png:exclude-chunks=date freedoom1.png") - (("freedoom2.png") - "-define png:exclude-chunks=date freedoom2.png")) ;; Make sure that the install scripts know where to find ;; the appropriate WAD files. (substitute* "dist/freedoom" @@ -554,11 +535,8 @@ (define-public freedoom (native-inputs `(("asciidoc" ,asciidoc) ("deutex" ,deutex) - ("font-dejavu" ,font-dejavu) - ("imagemagick" ,imagemagick) - ("python" ,python-2))) - (inputs - `(("prboom-plus" ,prboom-plus))) + ("python" ,python) + ("python-pillow" ,python-pillow))) (home-page "https://freedoom.github.io/") (synopsis "Free content game based on the Doom engine") (native-search-paths -- cgit v1.2.3