+++ /dev/null
-# 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;
-
+++ /dev/null
-# 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
-}