diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-09-19 13:59:28 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-09-19 13:59:28 +0200 |
| commit | 7c528924b36e66dac17a4b528cbeb467e36f086c (patch) | |
| tree | da12141a44289406c78aa1a49c36ba7896f005c5 /sci-electronics/gazebo | |
| parent | dev-libs/sdformat: remove old (diff) | |
| download | gentoo-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')
| -rw-r--r-- | sci-electronics/gazebo/Manifest | 1 | ||||
| -rw-r--r-- | sci-electronics/gazebo/files/bullet_283.patch | 41 | ||||
| -rw-r--r-- | sci-electronics/gazebo/gazebo-5.1.0.ebuild | 69 |
3 files changed, 0 insertions, 111 deletions
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 7bfa15f0f847..be018d6fb1da 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,2 +1 @@ DIST gazebo-6.1.0.tar.bz2 50795925 SHA256 0460f1c706f609b6ff0e61a71bdd3cac2d55d714147edc01609b5226e7fb2904 SHA512 ae41b53b0f33e81fe5b3baaaca8649e98c5b99c4701650414b0686f9a327d89e00c674e806cb9537aabfd933c9819d668e45b18e964d383d99325c5ddcdcf7ef WHIRLPOOL bfab23edc9c68ca02aefa4a20206bfdf2973cc5ee7750f4c017543979dca10434d9e38dad8836510b292dc67b97aa0514229c8b5fd9f73897075525e45a5bd74 -DIST gazebo5_5.1.0.tar.bz2 49544340 SHA256 eac72ca2633deb7ea0f5e775c1208f0743d98c8b53083607df77bae6e38ab0b1 SHA512 d3222d9d98cc9d1c52bc1bb24e12ece7ff8d8506782f9cd2d574a1aca8556e33d93781f4d2c91eacfe317a35c7cddfa2c4a4fdb58da1f348142f6a887de3c981 WHIRLPOOL 5e9e01195b02581d684ee0c5e30f9ace0210a7b61a59a63b7a3c01c8c672230ad026f998ed93583eafb9b640c73c9df350e578a774d9579fdb8574570fa0bd94 diff --git a/sci-electronics/gazebo/files/bullet_283.patch b/sci-electronics/gazebo/files/bullet_283.patch deleted file mode 100644 index cc1649b10cd3..000000000000 --- 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; - diff --git a/sci-electronics/gazebo/gazebo-5.1.0.ebuild b/sci-electronics/gazebo/gazebo-5.1.0.ebuild deleted file mode 100644 index d32b6baf675a..000000000000 --- a/sci-electronics/gazebo/gazebo-5.1.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils versionator vcs-snapshot flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" -SRC_URI="https://bitbucket.org/osrf/gazebo/get/${PN}$(get_major_version)_${PV}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 libav test" - -RDEPEND=" - >=dev-libs/protobuf-2.3.0 - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - dev-libs/libtar - dev-cpp/tbb - >=dev-games/ogre-1.7.4 - sci-libs/libccd - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - sci-libs/gts - >=sci-physics/bullet-2.82 - >=dev-libs/sdformat-2.3.1 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-libs/boost:=[threads] - sci-libs/gdal - virtual/libusb:1 - dev-libs/libspnav - media-libs/freeimage -" -DEPEND="${RDEPEND} - dev-qt/qttest:4 - app-text/ronn - virtual/pkgconfig -" -S="${WORKDIR}/${PN}$(get_major_version)_${PV}" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/bullet_283.patch" - "${FILESDIR}/ffmpeg29.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)" - "-DUSE_HOST_CFLAGS=FALSE" - "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" - "-DENABLE_SCREEN_TESTS=FALSE" - ) - cmake-utils_src_configure -} |