<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/163c15de78f0738e62cbf28cdc9f4a79a4d044ca">https://github.com/macports/macports-ports/commit/163c15de78f0738e62cbf28cdc9f4a79a4d044ca</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 163c15de78f0738e62cbf28cdc9f4a79a4d044ca
</span>Author: jjandersson <44439490+jjandersson@users.noreply.github.com>
AuthorDate: Fri Nov 2 14:37:31 2018 +0100

<span style='display:block; white-space:pre;color:#404040;'>    h3dphysics: patches for upgraded Bullet+ODE
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * variable used in BulletCallbacks changed name
</span><span style='display:block; white-space:pre;color:#404040;'>    * function called from BulletJoints obsoleted
</span><span style='display:block; white-space:pre;color:#404040;'>    * type in ODECallbacks changed to const
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/57465
</span>---
 graphics/h3dphysics/Portfile                       |  5 ++++-
 .../h3dphysics/files/patch-bulletcallbacks.diff    | 13 ++++++++++++
 graphics/h3dphysics/files/patch-bulletjoints.diff  | 24 ++++++++++++++++++++++
 graphics/h3dphysics/files/patch-odecallbacks.diff  | 11 ++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dphysics/Portfile b/graphics/h3dphysics/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a0e1f97..ed10556 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/h3dphysics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dphysics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,10 @@ depends_lib         port:h3dapi \
</span>                     port:ode \
                     port:bullet
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-build-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-build-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-bulletcallbacks.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-bulletjoints.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-odecallbacks.diff
</span> 
 configure.post_args ${worksrcpath}/build
 cmake.out_of_source yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dphysics/files/patch-bulletcallbacks.diff b/graphics/h3dphysics/files/patch-bulletcallbacks.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fa59ed2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dphysics/files/patch-bulletcallbacks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/BulletCallbacks.cpp.org    2014-05-22 09:43:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/BulletCallbacks.cpp        2018-10-24 10:31:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2167,8 +2167,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else if ( a == "CONSTANT_FORCE" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       // The softnessConstantForceMix field value in the contact evaluation should be used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      cp.m_contactCFM1= p.softness_constant_force_mix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      cp.m_contactCFM2= p.softness_constant_force_mix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      //cp.m_contactCFM1= p.softness_constant_force_mix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      //cp.m_contactCFM2= p.softness_constant_force_mix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else if ( a == "SPEED-1" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dphysics/files/patch-bulletjoints.diff b/graphics/h3dphysics/files/patch-bulletjoints.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..843d82e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dphysics/files/patch-bulletjoints.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/BulletJoints.cpp.org       2014-04-04 11:37:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/BulletJoints.cpp   2018-10-24 10:45:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -565,10 +565,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     doubleHingeJointParameters->haveSuspensionErrorCorrection() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     updateSuspension ( *doubleHingeJointParameters );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if BT_BULLET_VERSION < 283
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // stopBounce1 - restitution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if ( doubleHingeJointParameters->haveStopBounce1() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     doubleHingeJoint->getRotationalLimitMotor(2)->m_limitSoftness= btScalar ( doubleHingeJointParameters->getStopBounce1() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma message("Bullet version is equal to or above 2.83. stopBounce1 field of DoubleAxisHingeJoint will not be used.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#warning Bullet version is equal to or above 2.83. stopBounce1 field of DoubleAxisHingeJoint will not be used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // stopConstantForceMix1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if ( doubleHingeJointParameters->haveStopConstantForceMix1() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     doubleHingeJoint->getRotationalLimitMotor(2)->m_stopCFM= btScalar ( doubleHingeJointParameters->getStopConstantForceMix1() );
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/h3dphysics/files/patch-odecallbacks.diff b/graphics/h3dphysics/files/patch-odecallbacks.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..98e4a18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/h3dphysics/files/patch-odecallbacks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ODECallbacks.cpp.org       2014-05-22 09:43:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ODECallbacks.cpp   2018-10-24 11:12:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       transforms[index+15] = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if( index == 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        dReal* t = dGeomTriMeshGetLastTransform( i->second );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        const dReal* t = dGeomTriMeshGetLastTransform( i->second );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>