aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-01-03 15:44:11 +0200
committerEfraim Flashner <efraim@flashner.co.il>2019-01-03 16:21:42 +0200
commitfbb456dda17b952c7f03ae79c8150822a2b892d1 (patch)
tree82ef0d808d282a6dfe17c5fcf08a76a12ac589f9
parent95bf2fb637ba4abb27efe94e0b671c1e93204e4f (diff)
downloadguix-fbb456dda17b952c7f03ae79c8150822a2b892d1.tar
guix-fbb456dda17b952c7f03ae79c8150822a2b892d1.tar.gz
gnu: bullet: Update to 2.88.
* gnu/packages/game-development.scm (bullet): Update to 2.88. [source]: Use 'git-fetch'. Add snippet to remove bundled binaries and libraries. [arguments]: Add configure-flags to prevent building demos. Add custom 'remove-failing-tests phase to skip tests which fail after removing bundled code.
-rw-r--r--gnu/packages/game-development.scm55
1 files changed, 44 insertions, 11 deletions
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 8a29297805..9167cee73f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org>
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
@@ -86,21 +86,54 @@
(define-public bullet
(package
(name "bullet")
- (version "2.87")
+ (version "2.88")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/bulletphysics/bullet3/"
- "archive/" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bulletphysics/bullet3/")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "15azjc1jj8ak9ad7c5sbp9nv5gpqjsa0s9pc0bwy63w490f1b323"))))
+ "00qkif245yj7n2f262bgjaxv1bz3wmmcsfnjgy3qpzvlpzpns5z8"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (for-each delete-file (find-files "build3" "premake*"))
+ (with-directory-excursion "examples/ThirdPartyLibs"
+ (for-each delete-file-recursively
+ '("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") "")
+ (("obj2sdf") ""))
+ ;; Tests fail on linking, cannot find -lBussIK
+ (substitute* "test/CMakeLists.txt"
+ ((" InverseDynamics")
+ "../examples/ThirdPartyLibs/BussIK InverseDynamics"))
+ ; (("SharedMemory") ""))
+ #t))))
(build-system cmake-build-system)
(arguments
- '(#:configure-flags (list (string-append
- "-DBUILD_SHARED_LIBS=ON "
- "-DCMAKE_CXX_FLAGS=-fPIC "
- (or (getenv "CXXFLAGS") "")))))
+ '(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
+ "-DBUILD_CPU_DEMOS=OFF"
+ "-DBUILD_OPENGL3_DEMOS=OFF"
+ "-DBUILD_BULLET2_DEMOS=OFF"
+ (string-append "-DCMAKE_CXX_FLAGS=-fPIC "
+ (or (getenv "CXXFLAGS") "")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-tests
+ ;; These tests fail specifically after removing 3rd party code
+ (lambda _
+ (substitute* "test/SharedMemory/CMakeLists.txt"
+ (("ADD_TEST") "# ADD_TEST"))
+ (substitute* "test/InverseDynamics/CMakeLists.txt"
+ (("ADD_TEST\\(Test_BulletInverseForward")
+ "# ADD_TEST(Test_BulletInverseForward"))
+ #t)))))
(inputs
`(("glu" ,glu)
("libx11" ,libx11)