summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-electronics/gazebo/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-electronics/gazebo/files')
-rw-r--r--sci-electronics/gazebo/files/bullet_283.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/sci-electronics/gazebo/files/bullet_283.patch b/sci-electronics/gazebo/files/bullet_283.patch
new file mode 100644
index 00000000000..cc1649b10cd
--- /dev/null
+++ b/sci-electronics/gazebo/files/bullet_283.patch
@@ -0,0 +1,41 @@
+# HG changeset patch
+# User Steve Peters <scpeters@osrfoundation.org>
+# Date 1430782295 25200
+# Branch issue_1074
+# Node ID 05b7ee5db6f524e19b6cca54d66208cb48a0854c
+# Parent 2cbd32c6246166f6f50af3503553180e7c1cd4a4
+Fix build when compiled against bullet 2.83
+
+diff --git a/gazebo/physics/bullet/BulletHinge2Joint.cc b/gazebo/physics/bullet/BulletHinge2Joint.cc
+--- a/gazebo/physics/bullet/BulletHinge2Joint.cc
++++ b/gazebo/physics/bullet/BulletHinge2Joint.cc
+@@ -211,8 +211,12 @@
+ return math::Angle();
+ }
+
+- btRotationalLimitMotor *motor =
+- this->bulletHinge2->getRotationalLimitMotor(_index);
++#ifndef LIBBULLET_VERSION_GT_282
++ btRotationalLimitMotor
++#else
++ btRotationalLimitMotor2
++#endif
++ *motor = this->bulletHinge2->getRotationalLimitMotor(_index);
+ if (motor)
+ return motor->m_hiLimit;
+
+@@ -229,8 +233,12 @@
+ return math::Angle(0.0);
+ }
+
+- btRotationalLimitMotor *motor =
+- this->bulletHinge2->getRotationalLimitMotor(_index);
++#ifndef LIBBULLET_VERSION_GT_282
++ btRotationalLimitMotor
++#else
++ btRotationalLimitMotor2
++#endif
++ *motor = this->bulletHinge2->getRotationalLimitMotor(_index);
+ if (motor)
+ return motor->m_loLimit;
+