diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-07-15 15:50:04 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-07-15 15:50:04 +0000 |
| commit | 2632c73f867aa3d300221bef444c13c88149078a (patch) | |
| tree | 09e112fbd59b9fdaec97e0a90e8ee67d35413262 /sci-electronics | |
| parent | Keyworded on alpha, bug 519772 (diff) | |
| download | gentoo-2-2632c73f867aa3d300221bef444c13c88149078a.tar.gz gentoo-2-2632c73f867aa3d300221bef444c13c88149078a.tar.bz2 gentoo-2-2632c73f867aa3d300221bef444c13c88149078a.zip | |
backport fix from upstream to build against bullet 2.83
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/gazebo/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-electronics/gazebo/files/bullet_283.patch | 41 | ||||
| -rw-r--r-- | sci-electronics/gazebo/gazebo-5.1.0.ebuild | 6 |
3 files changed, 51 insertions, 2 deletions
diff --git a/sci-electronics/gazebo/ChangeLog b/sci-electronics/gazebo/ChangeLog index cde5e9d84348..37b9e16a2499 100644 --- a/sci-electronics/gazebo/ChangeLog +++ b/sci-electronics/gazebo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-electronics/gazebo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/ChangeLog,v 1.2 2015/05/04 12:14:40 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/ChangeLog,v 1.3 2015/07/15 15:50:04 aballier Exp $ + + 15 Jul 2015; Alexis Ballier <aballier@gentoo.org> gazebo-5.1.0.ebuild, + +files/bullet_283.patch: + backport fix from upstream to build against bullet 2.83 04 May 2015; Alexis Ballier <aballier@gentoo.org> gazebo-5.1.0.ebuild: add missing build dep on qttest, bug #548580 diff --git a/sci-electronics/gazebo/files/bullet_283.patch b/sci-electronics/gazebo/files/bullet_283.patch new file mode 100644 index 000000000000..cc1649b10cd3 --- /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; + diff --git a/sci-electronics/gazebo/gazebo-5.1.0.ebuild b/sci-electronics/gazebo/gazebo-5.1.0.ebuild index eb0344eaf70d..dbd9aaa7752f 100644 --- a/sci-electronics/gazebo/gazebo-5.1.0.ebuild +++ b/sci-electronics/gazebo/gazebo-5.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild,v 1.2 2015/05/04 12:14:40 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild,v 1.3 2015/07/15 15:50:04 aballier Exp $ EAPI=5 @@ -45,12 +45,16 @@ DEPEND="${RDEPEND} " S="${WORKDIR}/${PN}$(get_major_version)_${PV}" CMAKE_BUILD_TYPE=RelWithDebInfo +PATCHES=( "${FILESDIR}/bullet_283.patch" ) src_configure() { # doesnt build without it append-cxxflags "-std=c++11" # doesnt build with as-needed either append-ldflags "-Wl,--no-as-needed" + + has_version '>=sci-physics/bullet-2.83' && append-cppflags "-DLIBBULLET_VERSION_GT_282=1" + local mycmakeargs=( "-DUSE_UPSTREAM_CFLAGS=OFF" "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |