From patchwork Wed Dec 1 05:24:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 34899 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9189D27BBE9; Wed, 1 Dec 2021 05:26:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC38127BBEA for ; Wed, 1 Dec 2021 05:26:10 +0000 (GMT) Received: from localhost ([::1]:40226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msI89-0005Xs-RM for patchwork@mira.cbaines.net; Wed, 01 Dec 2021 00:26:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msI83-0005XN-1i for guix-patches@gnu.org; Wed, 01 Dec 2021 00:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msI82-00046K-ON for guix-patches@gnu.org; Wed, 01 Dec 2021 00:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msI82-0003Lz-EG for guix-patches@gnu.org; Wed, 01 Dec 2021 00:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52215] [PATCH] gnu: bullet: Update to 3.17 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 05:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52215 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52215@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163833634112864 (code B ref -1); Wed, 01 Dec 2021 05:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Dec 2021 05:25:41 +0000 Received: from localhost ([127.0.0.1]:43015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msI7h-0003LP-K6 for submit@debbugs.gnu.org; Wed, 01 Dec 2021 00:25:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:41860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msI7f-0003LH-Bi for submit@debbugs.gnu.org; Wed, 01 Dec 2021 00:25:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msI7f-0005Q6-69 for guix-patches@gnu.org; Wed, 01 Dec 2021 00:25:39 -0500 Received: from [2607:f8b0:4864:20::d2d] (port=43840 helo=mail-io1-xd2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msI7c-00040A-In for guix-patches@gnu.org; Wed, 01 Dec 2021 00:25:38 -0500 Received: by mail-io1-xd2d.google.com with SMTP id z26so29183751iod.10 for ; Tue, 30 Nov 2021 21:25:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to :content-transfer-encoding; bh=qyYSOExfWOVY1BpSOvMdYC/AGaCG4cvXKq8YWAbU7R0=; b=iPk8kvuM2ffdY2IegPMdw2dL4vCHhK4xCamli3I3Mao1SV/zvPG+NQmVxih2Ve9+mx icScvvzc9Fx1bJNG56xfMEOe8v3f+fYW6TLus5jRL2Q+0zf5fWPjNwq+tYlQc5NqvGYl edbGlIO8kz+Uj8CpSArFEh4RMiM6IT5FWYQghG8GGubu5OTS29vznGNzVTZp6eHlxbeZ T5hJgZRjV96oZi7iieEtiYMAlXph8WtBhY9Th2uBUhLjcp8W1hHUxQwIg04GBaxNDQPq KOUKI5bm0L74ZUv7PHhMPRZxoZlpp+nlnSaR2l1pf9QUYJl56X0tU812mgtAqaFeWpEy hybQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to :content-transfer-encoding; bh=qyYSOExfWOVY1BpSOvMdYC/AGaCG4cvXKq8YWAbU7R0=; b=tW7nsuAYGrG9wwsOF3Wt5HrWIX5vy9S+aNO4t1tgvR98tEq3WAEfw+IdUlPTbP8t78 MicTSwfncKK9dcZkXydgk8ajVJjYgtRYzV1WBMQ4Xa48ihQ4Hqs2wZzEYEkC2XxBhJ8w fisFiQxW9+LyO0q/cp7QHnd9hS/SIKqW/Yv1NHjU7JNDfYv22Ul/kwRqtT4JfuRQt0ix 7psF9x2vvPz39OiTv1wJrjqeW+C9fyjcvj/hqGCwLKoGwGsEPRgDy38N56ipC5WJn9iN HzCtYtby1j2TDKTzmSdwwc+jR3ceWtM6iY2rfppf02Mj2eJlgWMGvvwCPBmpijDmD104 Amqw== X-Gm-Message-State: AOAM531Q72ru59xepxWz/4s9ib2es1RHGhROtJpanVs9Z/XunltVCpZ4 GCzUfPy/5/WCrbdKQQXliwhzhcBC3Ecxe0d9YSAum6+9LFw= X-Google-Smtp-Source: ABdhPJzAmxs1+6riV6vICZSeDlebTwYphpEyu1ljC45mmrRWs2iS7SvgF97VuwOaAhzuTXW0fAJ1AaqXnfWIWgWqrFk= X-Received: by 2002:a5d:8451:: with SMTP id w17mr6572426ior.139.1638336334754; Tue, 30 Nov 2021 21:25:34 -0800 (PST) MIME-Version: 1.0 From: Andy Tai Date: Tue, 30 Nov 2021 21:24:58 -0800 Message-ID: X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::d2d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::d2d; envelope-from=lichengtai@gmail.com; helo=mail-io1-xd2d.google.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (bullet): Update to 3.17 --- gnu/packages/game-development.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (or (getenv "CXXFLAGS") ""))) #:phases 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 "