[bug#39381] [PATCH 0/3] Update Godot to 3.2.

[bug#39381] [PATCH 0/3] Update Godot to 3.2.

[Timotej Lazar]

Hi,

these patches update Godot to the just-released version 3.2, unbundle
wslay (tested with websocket chat example project) and add zenity (used
by the OS.alert() function).

Thanks!

Timotej Lazar (3):
  gnu: Add wslay.
  gnu: godot: Update to 3.2.
  gnu: godot: Add zenity for showing alerts.

 gnu/packages/game-development.scm | 17 ++++++++++++-----
 gnu/packages/web.scm              | 31 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)

-- 
2.25.0

[bug#39381] [PATCH 1/3] gnu: Add wslay.

[Timotej Lazar]

* gnu/packages/web.scm (wslay): New variable.
---
 gnu/packages/web.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d3ab28bcfc..f6ae958ae3 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
 ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1095,6 +1096,36 @@ implementation that is simple, portable, flexible, lightweight, low level, and
 high performance.")
     (license license:bsd-3)))
 
+(define-public wslay
+  (package
+    (name "wslay")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tatsuhiro-t/wslay.git")
+             (commit (string-append "release-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ak9a6hsanhys40yhv7c2gqkfghpm6jx36j1pnml8ajvgaky5q98"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("cunit" ,cunit) ; For tests.
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
+       ("python-sphinx" ,python-sphinx)))
+    (home-page "https://tatsuhiro-t.github.io/wslay/")
+    (synopsis "C WebSocket library")
+    (description "@code{Wslay} is an event-based C library for the WebSocket
+protocol version 13, described in RFC 6455.  Besides a high-level API it
+provides callbacks for sending and receiving frames directly.  @code{Wslay}
+only supports the data transfer part of WebSocket protocol and does not
+perform the opening handshake in HTTP.")
+    (license license:expat)))
+
 (define-public libpsl
   (package
     (name "libpsl")
-- 
2.25.0

[bug#39381] [PATCH 2/3] gnu: godot: Update to 3.2.

[Timotej Lazar]

* gnu/packages/game-development.scm (godot): Update to 3.2.
[source](snippet): Remove obsolete and unbundled (wslay) thirdparty files, and
add new ones.
[arguments](scons-flags): Disable the builtin wslay.
[inputs]: Add wslay.
---
 gnu/packages/game-development.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index ceec993d04..c9a8b922b4 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -90,6 +90,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
@@ -1505,7 +1506,7 @@ games.")
 (define-public godot
   (package
     (name "godot")
-    (version "3.1.2")
+    (version "3.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1514,7 +1515,7 @@ games.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6"))
+                "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd"))
               (modules '((guix build utils)
                          (ice-9 ftw)
                          (srfi srfi-1)))
@@ -1526,7 +1527,7 @@ games.")
                   (with-directory-excursion "thirdparty"
                     (let* ((preserved-files
                             '("README.md"
-                              "b2d_convexdecomp"
+                              "assimp"
                               "certs"
                               "cvtt"
                               "enet"
@@ -1535,7 +1536,6 @@ games.")
                               "glad"
                               "jpeg-compressor"
                               "libsimplewebm"
-                              "libwebsockets"
                               "miniupnpc"
                               "minizip"
                               "misc"
@@ -1543,8 +1543,8 @@ games.")
                               "pvrtccompressor"
                               "recastnavigation"
                               "squish"
-                              "thekla_atlas"
                               "tinyexr"
+                              "vhacd"
                               "xatlas")))
                       (for-each delete-file-recursively
                                 (lset-difference string=?
@@ -1574,6 +1574,7 @@ games.")
                            "builtin_mbedtls=no"
                            "builtin_opus=no"
                            "builtin_pcre2=no"
+                           "builtin_wslay=no"
                            "builtin_zlib=no"
                            "builtin_zstd=no")
        #:tests? #f ; There are no tests
@@ -1640,6 +1641,7 @@ games.")
               ("opusfile" ,opusfile)
               ("pcre2" ,pcre2)
               ("pulseaudio" ,pulseaudio)
+              ("wslay" ,wslay)
               ("zstd" ,zstd "lib")))
     (home-page "https://godotengine.org/")
     (synopsis "Advanced 2D and 3D game engine")
-- 
2.25.0

[bug#39381] [PATCH 3/3] gnu: godot: Add zenity for showing alerts.

[Timotej Lazar]

* gnu/packages/game-development.scm (godot)[inputs]: Add zenity.
[arguments]: Wrap godot to look for it in the store.
---
 gnu/packages/game-development.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index c9a8b922b4..6fa4fed74f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1599,6 +1599,10 @@ games.")
                      (rename-file "godot.x11.tools.64" "godot")
                      (rename-file "godot.x11.tools.32" "godot"))
                  (install-file "godot" bin))
+               ;; Tell Godot where to find zenity for OS.alert().
+               (wrap-program (string-append bin "/godot")
+                 `("PATH" ":" prefix
+                   (,(string-append (assoc-ref %build-inputs "zenity") "/bin"))))
                #t)))
          (add-after 'install 'install-godot-desktop
            (lambda* (#:key outputs #:allow-other-keys)
@@ -1642,6 +1646,7 @@ games.")
               ("pcre2" ,pcre2)
               ("pulseaudio" ,pulseaudio)
               ("wslay" ,wslay)
+              ("zenity" ,zenity)
               ("zstd" ,zstd "lib")))
     (home-page "https://godotengine.org/")
     (synopsis "Advanced 2D and 3D game engine")
-- 
2.25.0

bug#39381: [PATCH 0/3] Update Godot to 3.2.

[Leo Famulari]

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

On Sat, Feb 01, 2020 at 01:55:28PM +0100, Timotej Lazar wrote:
> Hi,
> 
> these patches update Godot to the just-released version 3.2, unbundle
> wslay (tested with websocket chat example project) and add zenity (used
> by the OS.alert() function).

Thanks! Pushed as 7b2ba609c3663b77ede10199c9d49855ee1ab0b4

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]