(address . guix-patches@gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)
20220104222314.24931-1-felgru@posteo.net
* gnu/packages/games.scm (freedroidrpg): Update to 1.0rc1.
[source]: Handle rc suffix in version number.
[arguments]: Add -fcommon to CFLAGS.
[inputs]: Use new simplified format. Add glew.
---
gnu/packages/games.scm | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
Toggle diff (68 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5896fa4333..123136f65c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1349,20 +1349,23 @@ effects and music to make a completely free game.")
(define-public freedroidrpg
(package
(name "freedroidrpg")
- (version "0.16.1")
+ (version "1.0rc1")
(source
(origin
(method url-fetch)
- (uri (string-append "http://ftp.osuosl.org/pub/freedroid/"
- "freedroidRPG-" (version-major+minor version) "/"
- "freedroidRPG-" version ".tar.gz"))
+ (uri (let ((major+minor
+ (version-major+minor
+ (string-replace-substring version "rc" "."))))
+ (string-append "http://ftp.osuosl.org/pub/freedroid/"
+ "freedroidRPG-" major+minor "/"
+ "freedroidRPG-" version ".tar.gz")))
(sha256
- (base32 "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"))))
+ (base32 "1rywdngsfhkxv5gsya3dvv8kjxs5zjv57a3h364q9llsc82kdcxa"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list
- (string-append "CFLAGS="
+ (string-append "CFLAGS=-fcommon "
"-I" (assoc-ref %build-inputs "sdl-gfx") "/include/SDL "
"-I" (assoc-ref %build-inputs "sdl-image") "/include/SDL "
"-I" (assoc-ref %build-inputs "sdl-mixer") "/include/SDL")
@@ -1374,18 +1377,19 @@ effects and music to make a completely free game.")
(native-inputs
(list pkg-config))
(inputs
- `(("glu" ,glu)
- ("libjpeg" ,libjpeg-turbo)
- ("libogg" ,libogg)
- ("libpng" ,libpng)
- ("libvorbis" ,libvorbis)
- ("mesa" ,mesa)
- ("python" ,python-wrapper)
- ("sdl" ,sdl)
- ("sdl-gfx" ,sdl-gfx)
- ("sdl-image" ,sdl-image)
- ("sdl-mixer" ,sdl-mixer)
- ("zlib" ,zlib)))
+ (list glew
+ glu
+ libjpeg-turbo
+ libogg
+ libpng
+ libvorbis
+ mesa
+ python-wrapper
+ sdl
+ sdl-gfx
+ sdl-image
+ sdl-mixer
+ zlib))
(home-page "https://www.freedroid.org/")
(synopsis "Isometric role-playing game against killer robots")
(description
--
2.30.2