GNU bug report logs - #52215
[PATCH] gnu: bullet: Update to 3.17

Previous Next

Package: guix-patches;

Reported by: Andy Tai <atai <at> atai.org>

Date: Wed, 1 Dec 2021 05:26:02 UTC

Severity: normal

Tags: patch

Done: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 52215 in the body.
You can then email your comments to 52215 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#52215; Package guix-patches. (Wed, 01 Dec 2021 05:26:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Andy Tai <atai <at> atai.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 01 Dec 2021 05:26:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: bullet: Update to 3.17
Date: Tue, 30 Nov 2021 21:24:58 -0800
* 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 <polyakov <at> liltechdude.xyz>
 ;;; Copyright © 2020-2021 James Smith <jsubuntuxp <at> disroot.org>
 ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz <at> elenq.tech>
+;;; Copyright © 2021 Andy Tai <atai <at> atai.org>
 ;;;
 ;;; 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




Information forwarded to guix-patches <at> gnu.org:
bug#52215; Package guix-patches. (Wed, 01 Dec 2021 15:47:01 GMT) Full text and rfc822 format available.

Message #8 received at 52215 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Andy Tai <atai <at> atai.org>
Cc: 52215 <at> debbugs.gnu.org
Subject: Re: [bug#52215] [PATCH] gnu: bullet: Update to 3.17
Date: Wed, 01 Dec 2021 16:46:47 +0100
Hello,

Andy Tai <atai <at> atai.org> writes:

> * gnu/packages/game-development.scm (bullet): Update to 3.17

Nitpick: you need to add periods at the end of the two lines in the
commit message.

But more importantly, I cannot apply your patch cleany on top of master
branch. Could you try rebasing your change and send the patch again?

Thanks!

Regards,
-- 
Nicolas Goaziou




Information forwarded to guix-patches <at> gnu.org:
bug#52215; Package guix-patches. (Wed, 01 Dec 2021 18:14:02 GMT) Full text and rfc822 format available.

Message #11 received at 52215 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 52215 <at> debbugs.gnu.org
Subject: Re: [bug#52215] [PATCH] gnu: bullet: Update to 3.17
Date: Wed, 1 Dec 2021 10:12:33 -0800
OK, will do the rebase and re-send

On Wed, Dec 1, 2021 at 7:46 AM Nicolas Goaziou <mail <at> nicolasgoaziou.fr> wrote:
>
> Hello,
>
> Andy Tai <atai <at> atai.org> writes:
>
> > * gnu/packages/game-development.scm (bullet): Update to 3.17
>
> Nitpick: you need to add periods at the end of the two lines in the
> commit message.
>
> But more importantly, I cannot apply your patch cleany on top of master
> branch. Could you try rebasing your change and send the patch again?
>
> Thanks!
>
> Regards,
> --
> Nicolas Goaziou



-- 
Andy Tai, atai <at> atai.org, Skype: licheng.tai, Line: andy_tai, WeChat: andytai1010
Year 2021 民國110年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能




Information forwarded to guix-patches <at> gnu.org:
bug#52215; Package guix-patches. (Wed, 01 Dec 2021 19:47:02 GMT) Full text and rfc822 format available.

Message #14 received at 52215 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 52215 <at> debbugs.gnu.org
Subject: Re: [bug#52215] [PATCH] gnu: bullet: Update to 3.17
Date: Wed, 1 Dec 2021 11:45:26 -0800
[Message part 1 (text/plain, inline)]
rebased on top of master tip
[0001-gnu-bullet-Update-to-3.17.patch (text/x-patch, attachment)]

Reply sent to Nicolas Goaziou <mail <at> nicolasgoaziou.fr>:
You have taken responsibility. (Wed, 01 Dec 2021 20:56:02 GMT) Full text and rfc822 format available.

Notification sent to Andy Tai <atai <at> atai.org>:
bug acknowledged by developer. (Wed, 01 Dec 2021 20:56:02 GMT) Full text and rfc822 format available.

Message #19 received at 52215-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Andy Tai <atai <at> atai.org>
Cc: 52215-done <at> debbugs.gnu.org
Subject: Re: [bug#52215] [PATCH] gnu: bullet: Update to 3.17
Date: Wed, 01 Dec 2021 21:55:46 +0100
Hello,

Andy Tai <atai <at> atai.org> writes:

> rebased on top of master tip

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou




Information forwarded to guix-patches <at> gnu.org:
bug#52215; Package guix-patches. (Thu, 02 Dec 2021 03:59:02 GMT) Full text and rfc822 format available.

Message #22 received at 52215 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 52215 <at> debbugs.gnu.org, Andy Tai <atai <at> atai.org>
Subject: Re: [bug#52215] [PATCH] gnu: bullet: Update to 3.17
Date: Wed, 1 Dec 2021 22:58:47 -0500
On Wed, Dec 01, 2021 at 04:46:47PM +0100, Nicolas Goaziou wrote:
> But more importantly, I cannot apply your patch cleany on top of master
> branch. Could you try rebasing your change and send the patch again?

When generating the patches with `git format-patch` or `git send-email`,
you can add the argument '--base=auto', which adds a note to the patch
about what commit the patch is based on.

That helps reviewers figure out how to apply the patch.

There's a note about this in the manual section Submitting Patches, but
it's not totally clear. I'll think about improving it.




Information forwarded to guix-patches <at> gnu.org:
bug#52215; Package guix-patches. (Thu, 02 Dec 2021 08:41:02 GMT) Full text and rfc822 format available.

Message #25 received at 52215 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: Leo Famulari <leo <at> famulari.name>
Cc: 52215 <at> debbugs.gnu.org, Nicolas Goaziou <mail <at> nicolasgoaziou.fr>,
 Andy Tai <atai <at> atai.org>
Subject: Re: [bug#52215] [PATCH] gnu: bullet: Update to 3.17
Date: Thu, 2 Dec 2021 09:40:12 +0100
Hi Leo,

On Thu, 2 Dec 2021 at 04:59, Leo Famulari <leo <at> famulari.name> wrote:

> When generating the patches with `git format-patch` or `git send-email`,
> you can add the argument '--base=auto', which adds a note to the patch
> about what commit the patch is based on.

The argument 'auto' often breaks for me.  I mean, I am not sure the
manual should have:

        We recommend to use the command 'git format-patch --base=auto'
        to include the commit where your patch applies.

but 'auto' should only be an advice or a recommendation as suggested
parameter for the otpion '--base'.  IMHO.


> There's a note about this in the manual section Submitting Patches, but
> it's not totally clear. I'll think about improving it.

Cool! :-)

Thanks,
Cheers,




Information forwarded to guix-patches <at> gnu.org:
bug#52215; Package guix-patches. (Thu, 02 Dec 2021 19:33:01 GMT) Full text and rfc822 format available.

Message #28 received at 52215 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: zimoun <zimon.toutoune <at> gmail.com>
Cc: 52215 <at> debbugs.gnu.org, Nicolas Goaziou <mail <at> nicolasgoaziou.fr>,
 Andy Tai <atai <at> atai.org>
Subject: Re: [bug#52215] [PATCH] gnu: bullet: Update to 3.17
Date: Thu, 2 Dec 2021 14:32:15 -0500
On Thu, Dec 02, 2021 at 09:40:12AM +0100, zimoun wrote:
> The argument 'auto' often breaks for me.  I mean, I am not sure the
> manual should have:
> 
>         We recommend to use the command 'git format-patch --base=auto'
>         to include the commit where your patch applies.
> 
> but 'auto' should only be an advice or a recommendation as suggested
> parameter for the otpion '--base'.  IMHO.

Okay, I took your advice and pushed my change to the manual as
f697fc267c317e98e4bba8009452b9d64e76b30a

I hope it helps!




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 31 Dec 2021 12:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 78 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.