From 2b08cc968bb0b74a3a05fac7355a491d8015343e Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Tue, 30 Nov 2021 21:18:09 -0800 Subject: gnu: bullet: Update to 3.17. * gnu/packages/game-development.scm (bullet): Update to 3.17. [arguments]<#:configure-flags>: Disable access to third-party libs. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 55bbad30e6..a060dc94dc 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Dmitry Polyakov ;;; Copyright © 2020-2021 James Smith ;;; Copyright © 2021 Ekaitz Zarraga +;;; Copyright © 2021 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -112,7 +113,7 @@ (define-public bullet (package (name "bullet") - (version "2.89") + (version "3.17") (source (origin (method git-fetch) (uri (git-reference @@ -121,7 +122,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "10ncf2z474jnv7p5lv01ak2mk2hib3rj5rz1zr8v2v5pnciqbijl")) + "0x1ghxbkvqr910sp01sjf4hlfy4sdgn2jx2qf0dsi697bzq1f3mr")) (modules '((guix build utils))) (snippet '(begin @@ -131,9 +132,7 @@ '("Gwen" "clsocket" "enet" "glad" "imgui" "lua-5.2.3" "midi" "minizip" "openvr" "optionalX11" "serial" "zlib"))) - ;; These need files from ThirdPartyLibs. - (substitute* "Extras/CMakeLists.txt" - (("BulletRobotics") "")) + ;; Tests fail on linking, cannot find -lBussIK. (substitute* "test/CMakeLists.txt" ((" InverseDynamics") @@ -146,6 +145,12 @@ "-DBUILD_CPU_DEMOS=OFF" "-DBUILD_OPENGL3_DEMOS=OFF" "-DBUILD_BULLET2_DEMOS=OFF" + ;; Extras/BulletRoboticsGUI needs files from + ;; ThirdPartyLibs + "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF" + ;; Extras/BulletRobotics needs files from + ;; ThirdPartyLibs + "-DBUILD_BULLET_ROBOTICS_EXTRA=OFF" (string-append "-DCMAKE_CXX_FLAGS=-fPIC " (or (getenv "CXXFLAGS") ""))) #:phases -- cgit v1.2.3 From dd4365efa1c6fb609de9bd7cd10f9c82e064aed4 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Wed, 1 Dec 2021 15:49:39 -0800 Subject: gnu: godot: Update to 3.4. * gnu/packages/game-development.scm (godot): Update to 3.4. [source]: Add new bundled dependencies to the origin snippet. Signed-off-by: Leo Famulari --- gnu/packages/game-development.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a060dc94dc..380b5705d0 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1846,7 +1846,7 @@ games.") (define-public godot (package (name "godot") - (version "3.2.3") + (version "3.4") (source (origin (method git-fetch) (uri (git-reference @@ -1855,7 +1855,7 @@ games.") (file-name (git-file-name name version)) (sha256 (base32 - "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v")) + "0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1870,19 +1870,23 @@ games.") "assimp" "certs" "cvtt" + "embree" "enet" "etc2comp" "fonts" "glad" "jpeg-compressor" "libsimplewebm" + "minimp3" "miniupnpc" "minizip" "misc" "nanosvg" + "oidn" "pvrtccompressor" "recastnavigation" "squish" + "stb_rect_pack" "tinyexr" "vhacd" "xatlas"))) @@ -1969,6 +1973,7 @@ games.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("bullet" ,bullet) + ("eudev" ,eudev) ("freetype" ,freetype) ("glew" ,glew) ("glu" ,glu) -- cgit v1.2.3 From bef86fed3e34ac62fba178c46cd9732526c2b9bf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 2 Dec 2021 01:25:00 -0500 Subject: Revert "gnu: godot: Update to 3.4." This reverts commit dd4365efa1c6fb609de9bd7cd10f9c82e064aed4. We reverted this commit because it broke the operation of the only package in Guix that depends on Godot, SuperStarfighter: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=52233#20 --- gnu/packages/game-development.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 380b5705d0..a060dc94dc 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1846,7 +1846,7 @@ games.") (define-public godot (package (name "godot") - (version "3.4") + (version "3.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -1855,7 +1855,7 @@ games.") (file-name (git-file-name name version)) (sha256 (base32 - "0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx")) + "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1870,23 +1870,19 @@ games.") "assimp" "certs" "cvtt" - "embree" "enet" "etc2comp" "fonts" "glad" "jpeg-compressor" "libsimplewebm" - "minimp3" "miniupnpc" "minizip" "misc" "nanosvg" - "oidn" "pvrtccompressor" "recastnavigation" "squish" - "stb_rect_pack" "tinyexr" "vhacd" "xatlas"))) @@ -1973,7 +1969,6 @@ games.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("bullet" ,bullet) - ("eudev" ,eudev) ("freetype" ,freetype) ("glew" ,glew) ("glu" ,glu) -- cgit v1.2.3