summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-07-15 15:50:26 +0000
committerAlexis Ballier <aballier@gentoo.org>2015-07-15 15:50:26 +0000
commit774b354599976c13b0f7110405603ab92f5832b0 (patch)
treee40f3071c404527ff9017e73f6772f3980629deb /sci-electronics
parentKeyworded on alpha, bug 519772 (diff)
downloadhistorical-774b354599976c13b0f7110405603ab92f5832b0.tar.gz
historical-774b354599976c13b0f7110405603ab92f5832b0.tar.bz2
historical-774b354599976c13b0f7110405603ab92f5832b0.zip
backport fix from upstream to build against bullet 2.83
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/gazebo/ChangeLog6
-rw-r--r--sci-electronics/gazebo/Manifest11
-rw-r--r--sci-electronics/gazebo/files/bullet_283.patch41
-rw-r--r--sci-electronics/gazebo/gazebo-5.1.0.ebuild6
4 files changed, 57 insertions, 7 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/Manifest b/sci-electronics/gazebo/Manifest
index 7b9a7ab95868..ff2421d06371 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX bullet_283.patch 1187 SHA256 8178ec19a20fe3f16dde37cae3539e871b3b18c9792ce240f62f740a61dda0ac SHA512 4e06dbd8374988ac27ab88e175a9ea9848c609d9d2af074528e51cda64e3bc0558262bf227cd9352d4ba52a2b9a69588d19fe4d9fe13fb89c072a72d712f0538 WHIRLPOOL f5d193ec34b60f5565359b323a9a8b37cac131f03cbf5a13a2f9dcbe8b7960d98061cd9484d3d9e6c0f6c9de9e7cecd5ada35ee4d35013d773f092afd3c12b26
DIST gazebo5_5.1.0.tar.bz2 49544340 SHA256 eac72ca2633deb7ea0f5e775c1208f0743d98c8b53083607df77bae6e38ab0b1 SHA512 d3222d9d98cc9d1c52bc1bb24e12ece7ff8d8506782f9cd2d574a1aca8556e33d93781f4d2c91eacfe317a35c7cddfa2c4a4fdb58da1f348142f6a887de3c981 WHIRLPOOL 5e9e01195b02581d684ee0c5e30f9ace0210a7b61a59a63b7a3c01c8c672230ad026f998ed93583eafb9b640c73c9df350e578a774d9579fdb8574570fa0bd94
-EBUILD gazebo-5.1.0.ebuild 1561 SHA256 ce0898458417a85d6c705fd80ef15fa86a41167be03129bc138a63ed9c52abf9 SHA512 2a21dbb1707a23030f5910ba778039af3968c2ddd525a88e3d80c22b6c2b2001bd030ad9d8329df146400dc44a74cc65d565fd0f1d7ead933d48942ef062e520 WHIRLPOOL 3f4e28a98db7f2065c722e8a22f163128dbf847ff1835608cd5e66f2ea00da3756665cbb2ebe417e75864e6bb9e077d9d0fefe00359140b00ceb6bb533c0d32a
-MISC ChangeLog 492 SHA256 c5b932108d47ee0b92870d39de22fec4a3b3de01fae95d772dc0bd9237432fe3 SHA512 629a796ad290044d77391ef2cab6eb8b5f89733f15a74b89fa2902c6ee11f0910e4b9b77e2fc9d15a069fab1c8c9d560ee7828a513824d5c33b5f154d7114435 WHIRLPOOL 93a95aee824beb5eabba8e664202fdb274f19f123c25b8d2dfc5caef7275cc1085b8496d932871faf06bfbf83d4ee88ab662bd585f6f4b7cf96b5dcb68d6e91f
+EBUILD gazebo-5.1.0.ebuild 1697 SHA256 707811774b3682482afb735acf109eddf5fb8c8efe261dd8240af54038de4fa3 SHA512 9a6ddc04c73a1c9613f5f5cb25e560de0be5e2cd5cb22e25674a77524363514fa1cfe1eb880f24f53e4185ae796b457e0f72046238e53926f1f9f4ab90098095 WHIRLPOOL 2f45ccb957bf6543c50c986c2374370635b75817d1fa17d8c6333d93070d38fe6e871fff5a9e212030f562d1690c05f1dbd8423109ef3b34b5b9f6f598cdd6ef
+MISC ChangeLog 651 SHA256 67ebde8ca478a696872483b2e85e9027cb3ee6a907f93532bbc0b587f5a1913e SHA512 e51b8e3e12bc1ee161b2a2fb3d5c132b53404a598ac45b69eaa785570abcb0c074fad7b5bd7688faf7bc617e83df9a873bee59ec560dbceb8cf0d90ca6f3fa8e WHIRLPOOL 09e66475d7e53fc56c38fb5df72abd2f8953d63138f272551693e21252ae46e4e737646339ef7442244370702ca945c9f07ada3c52f425f19cd60e0057ebe227
MISC metadata.xml 229 SHA256 efa9eeb46bc35b87652cf3e48e5170c1771e26d46915689a6a5eb9fc8a3c0ed2 SHA512 0059c0bc3ad622c6ed5c7fca0a6b20aaa4e2247ae1eef4be23a70bb182ac830cf157ab5b6358841d66a4eba8c8f0455c80383eb4b9686d2fe3f6b56c575b7a6f WHIRLPOOL 085226ff4068e04964352c2573e3638f3cc3b574a9e4a35e995248eb251606d7124c3456d57206e8518a5406f3e9051e20d50a021478fbbef23e62a9f13aec2c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlVHYrIACgkQvFcC4BYPU0qf8ACgzsi+4ASs3MiMM2orbIU3iDTA
-9P8An3XqUX+CPYEz7lArZbLRROvrBOoI
-=GhWx
+iEYEAREIAAYFAlWmgTUACgkQvFcC4BYPU0r4RQCeKJvoWG6o+CXMlMa8lWopoRYf
+e4YAn13siEUbTm9v/pr72u7zdjaJ76Qc
+=oALG
-----END PGP SIGNATURE-----
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)"