From 5d4f4b200596e75ef3e59476d3f3f96f9cbbf72b Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Tue, 30 Nov 2021 21:18:09 -0800 Subject: [PATCH] gnu: bullet: Update to 3.17. To: guix-patches@gnu.org * gnu/packages/game-development.scm (bullet): Update to 3.17. --- gnu/packages/game-development.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 55bbad30e6..1b802d662f 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-module (gnu packages game-development) (define-public bullet (package (name "bullet") - (version "2.89") + (version "3.17") (source (origin (method git-fetch) (uri (git-reference @@ -121,7 +122,7 @@ (define-public bullet (file-name (git-file-name name version)) (sha256 (base32 - "10ncf2z474jnv7p5lv01ak2mk2hib3rj5rz1zr8v2v5pnciqbijl")) + "0x1ghxbkvqr910sp01sjf4hlfy4sdgn2jx2qf0dsi697bzq1f3mr")) (modules '((guix build utils))) (snippet '(begin @@ -131,9 +132,7 @@ (define-public bullet '("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,13 @@ (define-public bullet "-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 -- 2.34.0