all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#28380] [PATCH] gnu: Add godot.
@ 2017-09-07 11:59 Peter Mikkelsen
  2017-09-08 15:45 ` Ludovic Courtès
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Mikkelsen @ 2017-09-07 11:59 UTC (permalink / raw)
  To: 28380

* gnu/packages/game-development.scm (godot): New variable.
---
 gnu/packages/game-development.scm | 105 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index c8869a494..e04c11d7d 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2016, 2017 Julian Graham <joolean@gmail.com>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
+;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -73,7 +74,8 @@
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages mp3)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages tls))
 
 (define-public bullet
   (package
@@ -1019,3 +1021,104 @@ with its own editor, called OpenMW-CS which allows the user to edit or create
 their own original games.")
     (home-page "https://openmw.org")
     (license license:gpl3)))
+
+(define-public godot
+  (package
+    (name "godot")
+    (version "2.1.4")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "https://github.com/godotengine/godot/archive/"
+                              version "-stable.tar.gz"))
+              (file-name (string-append name "-" version))
+              (sha256
+               (base32 "1mz89nafc1m7srbqvy7iagxrxmqvf5hbqi7i0lwaapkx6q0kpkq7"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; There are no tests
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'unpack 'scons-use-env
+           (lambda _
+             ;; Scons does not use the environment variables by default,
+             ;; but this substitution makes it do so.
+             (substitute* "SConstruct"
+               (("env_base = Environment\\(tools=custom_tools\\)")
+                (string-append
+                 "env_base = Environment(tools=custom_tools)\n"
+                 "env_base = Environment(ENV=os.environ)")))
+             #t))
+         (replace 'build
+           (lambda _
+             (zero? (system*
+                     "scons"
+                     "platform=x11"
+                     ;; Avoid using many of the bundled libs.
+                     ;; Note: These options can be found in the SConstruct file.
+                     "builtin_freetype=no"
+                     "builtin_glew=no"
+                     "builtin_libmpdec=no"
+                     "builtin_libogg=no"
+                     "builtin_libpng=no"
+                     "builtin_libtheora=no"
+                     "builtin_libvorbis=no"
+                     "builtin_libwebp=no"
+                     "builtin_openssl=no"
+                     "builtin_opus=no"
+                     "builtin_zlib=no"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin")))
+               (with-directory-excursion "bin"
+                 (if (file-exists? "godot.x11.tools.64")
+                     (rename-file "godot.x11.tools.64" "godot")
+                     (rename-file "godot.x11.tools.32" "godot"))
+                 (install-file "godot" bin)))))
+         (add-after 'install 'install-godot-desktop
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (desktop (string-append out "/share/applications"))
+                    (icon-dir (string-append out "/share/pixmaps")))
+               (mkdir-p desktop)
+               (mkdir-p icon-dir)
+               (rename-file "icon.png" "godot.png")
+               (install-file "godot.png" icon-dir)
+               (with-output-to-file
+                   (string-append desktop "/godot.desktop")
+                 (lambda _
+                   (format #t
+                           "[Desktop Entry]~@
+                           Name=godot~@
+                           Comment=The godot game engine~@
+                           Exec=~a/bin/godot~@
+                           TryExec=~@*~a/bin/godot~@
+                           Icon=godot~@
+                           Type=Application~%"
+                           out)))
+               #t))))))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("scons" ,scons)))
+    (inputs `(("alsa-lib" ,alsa-lib)
+              ("freetype" ,freetype)
+              ("glew" ,glew)
+              ("glu" ,glu)
+              ("libtheora" ,libtheora)
+              ("libvorbis" ,libvorbis)
+              ("libwebp" ,libwebp)
+              ("libx11" ,libx11)
+              ("libxcursor" ,libxcursor)
+              ("libxinerama" ,libxinerama)
+              ("libxrandr" ,libxrandr)
+              ("mesa" ,mesa)
+              ("openssl" ,openssl)
+              ("opusfile" ,opusfile)
+              ("pulseaudio" ,pulseaudio)
+              ("python2" ,python-2)))
+    (home-page "https://godotengine.org/")
+    (synopsis "Advanced 2d and 3d game engine")
+    (description "Godot is an advanced, feature-packed, multi-platform
+2D and 3D open source game engine.")
+    (license license:expat)))
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#28380] [PATCH] gnu: Add godot.
  2017-09-07 11:59 [bug#28380] [PATCH] gnu: Add godot Peter Mikkelsen
@ 2017-09-08 15:45 ` Ludovic Courtès
       [not found]   ` <CADh9keV8QPbk3OwzR4shtMdUoaeS6xRTY5_EGuS9krd=MR0V+A@mail.gmail.com>
  0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2017-09-08 15:45 UTC (permalink / raw)
  To: Peter Mikkelsen; +Cc: 28380

Hi Peter,

Could you check how this compares to Chris’ submission at
<https://bugs.gnu.org/25908>?  Perhaps we simply need to merge things
from both.

Thanks in advance!

Ludo’.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#28380] [PATCH] gnu: Add godot.
       [not found]         ` <CADh9keWMwQ8JYQZAaKsL+UMYcG6qFDUVPxZ=Xx+BR4WEXs8K0g@mail.gmail.com>
@ 2017-09-08 16:13           ` Peter Mikkelsen
  2017-09-14 11:41             ` Ludovic Courtès
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Mikkelsen @ 2017-09-08 16:13 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 28380

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

I got some inspiration from that one, and afaik bug 25908 was never
completed. I guess you can see my patch as a completed version, co-authored
by Chris :) It builds and installs, and i have unbundled as much as
possible right now.

Hope that helps!

Peter

Den 8. sep. 2017 17.45 skrev "Ludovic Courtès" <ludo@gnu.org>:

Hi Peter,

Could you check how this compares to Chris’ submission at
<https://bugs.gnu.org/25908>?  Perhaps we simply need to merge things
from both.

Thanks in advance!

Ludo’.

[-- Attachment #2: Type: text/html, Size: 1023 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#28380] [PATCH] gnu: Add godot.
  2017-09-08 16:13           ` Peter Mikkelsen
@ 2017-09-14 11:41             ` Ludovic Courtès
  0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2017-09-14 11:41 UTC (permalink / raw)
  To: Peter Mikkelsen; +Cc: 25908-done, 28380-done

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

Hello,

Peter Mikkelsen <petermikkelsen10@gmail.com> skribis:

> I got some inspiration from that one, and afaik bug 25908 was never
> completed. I guess you can see my patch as a completed version, co-authored
> by Chris :) It builds and installs, and i have unbundled as much as
> possible right now.
>
> Hope that helps!

It does!

I’m committing it with the cosmetic changes below.

Note that it “calls home” to retrieve templates from godotengine.org and
github.com.  I suppose that’s expected but that wasn’t clear when I
clicked on the browsing thing.

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 897 bytes --]

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index e04c11d7d..5633456d4 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1118,7 +1118,10 @@ their own original games.")
               ("pulseaudio" ,pulseaudio)
               ("python2" ,python-2)))
     (home-page "https://godotengine.org/")
-    (synopsis "Advanced 2d and 3d game engine")
-    (description "Godot is an advanced, feature-packed, multi-platform
-2D and 3D open source game engine.")
+    (synopsis "Advanced 2D and 3D game engine")
+    (description
+     "Godot is an advanced multi-platform game engine written in C++.  If
+features design tools such as a visual editor, can import 3D models and
+provide high-quality 3D rendering, it contains an animation editor, and can be
+scripted in a Python-like language.")
     (license license:expat)))

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-09-14 11:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-07 11:59 [bug#28380] [PATCH] gnu: Add godot Peter Mikkelsen
2017-09-08 15:45 ` Ludovic Courtès
     [not found]   ` <CADh9keV8QPbk3OwzR4shtMdUoaeS6xRTY5_EGuS9krd=MR0V+A@mail.gmail.com>
     [not found]     ` <CADh9keUB-Ea11_-j3F+oZO_Zr+ekHO9rP+LodUGQ9sPkBussVg@mail.gmail.com>
     [not found]       ` <CADh9keXu3VSLdf3L9egQZaDcsUKKY6RGoC_4PDKnBp=dSF5M7Q@mail.gmail.com>
     [not found]         ` <CADh9keWMwQ8JYQZAaKsL+UMYcG6qFDUVPxZ=Xx+BR4WEXs8K0g@mail.gmail.com>
2017-09-08 16:13           ` Peter Mikkelsen
2017-09-14 11:41             ` Ludovic Courtès

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.