branch master updated: gnu: xmoto: Unbundle ODE and libccd.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 0272856  gnu: xmoto: Unbundle ODE and libccd.
0272856 is described below

commit 027285691ae2ac1806cbf19bbdcf9b6e2dd451ff
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sun Jun 21 01:47:05 2020 +0200

    gnu: xmoto: Unbundle ODE and libccd.
    
    * gnu/packages/games.scm (xmoto): Unbundle ODE and libccd.
    [inputs]: Add ode.
---
 gnu/packages/games.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d01d3fc..76ddbab 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10438,14 +10438,11 @@ This package is part of the KDE games module.")
          (modules '((guix build utils)
                     (ice-9 ftw)
                     (srfi srfi-1)))
-         ;; XXX: Remove some bundled libraries.  Guix provides
-         ;; Chipmunk, but it appears to be incompatible with the
-         ;; (older) one bundled. Likewise, Guix provides ODE, but
-         ;; using it induces rendering issues.  Eventually, libccd is
-         ;; required to compile built-in ODE.
+         ;; XXX: Remove some bundled libraries.  Guix provides Chipmunk, but
+         ;; it appears to be incompatible with the (older) one bundled.
          (snippet
           `(begin
-             (let ((keep '("chipmunk" "glad" "libccd" "md5sum" "ode")))
+             (let ((keep '("chipmunk" "glad" "md5sum")))
                (with-directory-excursion "vendor"
                  (for-each delete-file-recursively
                            (lset-difference string=?
@@ -10510,6 +10507,7 @@ This package is part of the KDE games module.")
          ("libxdg-basedir" ,libxdg-basedir)
          ("libxml2" ,libxml2)
          ("lua" ,lua-5.1)
+         ("ode" ,ode)
          ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf)))
          ("sqlite" ,sqlite)
          ("zlib" ,zlib)))