summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-09-19 13:59:28 +0200
committerAlexis Ballier <aballier@gentoo.org>2015-09-19 13:59:28 +0200
commit7c528924b36e66dac17a4b528cbeb467e36f086c (patch)
treeda12141a44289406c78aa1a49c36ba7896f005c5 /sci-electronics/gazebo/files
parentdev-libs/sdformat: remove old (diff)
downloadgentoo-7c528924b36e66dac17a4b528cbeb467e36f086c.tar.gz
gentoo-7c528924b36e66dac17a4b528cbeb467e36f086c.tar.bz2
gentoo-7c528924b36e66dac17a4b528cbeb467e36f086c.zip
sci-electronics/gazebo: remove old.
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sci-electronics/gazebo/files')
-rw-r--r--sci-electronics/gazebo/files/bullet_283.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/sci-electronics/gazebo/files/bullet_283.patch b/sci-electronics/gazebo/files/bullet_283.patch
deleted file mode 100644
index cc1649b10cd..00000000000
--- a/sci-electronics/gazebo/files/bullet_283.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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;
-