GNU bug report logs - #30443
[PATCH] Add colobot

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#30443: closed ([PATCH] Add colobot)
Date: Fri, 16 Feb 2018 20:01:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Fri, 16 Feb 2018 21:00:39 +0100
with message-id <87r2pkhfh4.fsf <at> nicolasgoaziou.fr>
and subject line Re: [bug#30443] [PATCH] Add colobot
has caused the debbugs.gnu.org bug report #30443,
regarding [PATCH] Add colobot
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
30443: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=30443
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: guix-patches <at> gnu.org
Subject: [PATCH] Add colobot
Date: Tue, 13 Feb 2018 02:08:54 +0100

[Message part 3 (text/plain, inline)]

Hello,

The following patch adds the educational game: Colobot (Gold Edition).

Feedback welcome.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738

[0001-gnu-Add-colobot.patch (text/x-diff, inline)]

From c924704e440118a1aeede1f237b56744967cab66 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Date: Tue, 13 Feb 2018 01:26:27 +0100
Subject: [PATCH] gnu: Add colobot.

* gnu/packages/games.scm (colobot): New variable.
---
 gnu/packages/games.scm | 86 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 286d0feef..9c3b7cfa8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -32,7 +32,7 @@
 ;;; Copyright © 2017 Marius Bakke <mbakke <at> fastmail.com>
 ;;; Copyright © 2017 Rutger Helling <rhelling <at> mykolab.com>
 ;;; Copyright © 2017 Roel Janssen <roel <at> gnu.org>
-;;; Copyright © 2017 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
+;;; Copyright © 2017, 2018 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5549,3 +5549,87 @@ hacking the gamification of contribution graphs on platforms such as
 Github or Gitlab.")
     (home-page "https://github.com/umayr/badass")
     (license license:expat))))
+
+(define-public colobot
+  (package
+    (name "colobot")
+    (version "0.1.11-alpha")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/colobot/colobot/archive/"
+                           "colobot-gold-" version ".tar.gz"))
+       (sha256
+        (base32
+         "160rq9fp5vd0qaqr3jvzvzrcxk9cac532y8vx4cvq0a8hgylrbad"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ;no test
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'unpack-data
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((data (assoc-ref inputs "colobot-data")))
+               (invoke "tar" "-xvf" data "-Cdata" "--strip-components=1")
+               #t)))
+         (add-after 'unpack-data 'install-music
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Installation process tries to download music files using
+             ;; "wget" if not already present.  Since we are going to install
+             ;; them, skip "wget" command check.
+             (substitute* "data/music/CMakeLists.txt"
+               (("find_program\\(WGET wget\\)") ""))
+             ;; Effectively install music.
+             (let ((data (assoc-ref inputs "colobot-music")))
+               (invoke "tar" "-xvf" data "-Cdata/music")
+               #t)))
+         (add-after 'install 'fix-install-directory
+           ;; Move binary from "games/" to "bin/".
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (rename-file (string-append out "/games")
+                            (string-append out "/bin"))
+               #t))))))
+    (native-inputs
+     `(("colobot-data"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append
+                 "https://github.com/colobot/colobot-data/archive/"
+                 "colobot-gold-" version ".tar.gz"))
+           (sha256
+            (base32
+             "1pdpsyr41g7xmk03k2g76l214f53ahk04qnkzmsv1fdbbaq7p109"))))
+       ("colobot-music"
+        ,(origin
+           (method url-fetch)
+           ;; Music also exists in FLAC, with a cost of 230Mo.  It can later
+           ;; be converted using "oggenc" for a better sound quality.
+           (uri (string-append "https://colobot.info/files/music/"
+                               "colobot-music_ogg_" version ".tar.gz"))
+           (sha256
+            (base32
+             "1s86cd36rwkff329mb1ay1wi5qqyi35564ppgr3f4qqz9wj9vs2m"))))
+       ("gettext" ,gettext-minimal)
+       ("librsvg" ,librsvg)
+       ("po4a" ,po4a)
+       ("python" ,python-wrapper)))
+    (inputs
+     `(("boost" ,boost)
+       ("glew" ,glew)
+       ("libogg" ,libogg)
+       ("libpng" ,libpng)
+       ("libsndfile" ,libsndfile)
+       ("libvorbis" ,libvorbis)
+       ("openal" ,openal)
+       ("physfs" ,physfs)
+       ("sdl2" ,sdl2)
+       ("sdl2-image", sdl2-image)
+       ("sdl2-ttf" ,sdl2-ttf)))
+    (synopsis "Educational programming strategy game")
+    (description "Colobot: Gold Edition is a real-time strategy game, where
+you can program your units (bots) in a language called CBOT, which is similar
+to C++ and Java.  Your mission is to find a new planet to live and survive.
+You can save the humanity and get programming skills!")
+    (home-page "https://colobot.info")
+    (license license:gpl3+)))
-- 
2.16.1

[Message part 5 (message/rfc822, inline)]

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Leo Famulari <leo <at> famulari.name>
Cc: 30443-done <at> debbugs.gnu.org
Subject: Re: [bug#30443] [PATCH] Add colobot
Date: Fri, 16 Feb 2018 21:00:39 +0100

Hello,

Leo Famulari <leo <at> famulari.name> writes:

> The comment is confusing, but your reply to my question is not :)
>
> So, I recommend either rewriting the comment or leaving it out.

I eventually left it out. I also used `sdl-union', just to be on the
safe side.

Thank you for the review.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.