Created
July 30, 2016 08:10
-
-
Save hauptmech/162044fac57a3ed721830b2e551c4a4b to your computer and use it in GitHub Desktop.
ros-indigo-moveit-ros-planning patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Script generated with import_catkin_packages.py | |
# For more information: https://github.com/bchretien/arch-ros-stacks | |
pkgdesc="ROS - Planning components of MoveIt that use ROS." | |
url='http://moveit.ros.org' | |
pkgname='ros-indigo-moveit-ros-planning' | |
pkgver='0.6.5' | |
_pkgver_patch=0 | |
arch=('any') | |
pkgrel=4 | |
license=('BSD') | |
ros_makedepends=(ros-indigo-angles | |
ros-indigo-catkin | |
ros-indigo-actionlib | |
ros-indigo-moveit-core | |
ros-indigo-cmake-modules | |
ros-indigo-moveit-ros-perception | |
ros-indigo-dynamic-reconfigure | |
ros-indigo-pluginlib) | |
makedepends=('cmake' 'git' 'ros-build-tools' 'qt4' | |
${ros_makedepends[@]}) | |
ros_depends=(ros-indigo-angles | |
ros-indigo-actionlib | |
ros-indigo-moveit-core | |
ros-indigo-moveit-ros-perception | |
ros-indigo-dynamic-reconfigure | |
ros-indigo-pluginlib) | |
depends=(${ros_depends[@]}) | |
_tag=release/indigo/moveit_ros_planning/${pkgver}-${_pkgver_patch} | |
_dir=moveit_ros_planning | |
source=("${_dir}"::"git+https://github.com/ros-gbp/moveit_ros-release.git"#tag=${_tag}) | |
md5sums=('SKIP') | |
build() { | |
# Use ROS environment variables | |
source /usr/share/ros-build-tools/clear-ros-env.sh | |
[ -f /opt/ros/indigo/setup.bash ] && source /opt/ros/indigo/setup.bash | |
cd ${srcdir}/${_dir} | |
patch -p1 < ../../trajectory_monitor.patch | |
# Create build directory | |
[ -d ${srcdir}/build ] || mkdir ${srcdir}/build | |
cd ${srcdir}/build | |
# Fix Python2/Python3 conflicts | |
/usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} | |
# Build project | |
cmake ${srcdir}/${_dir} \ | |
-DCMAKE_BUILD_TYPE=Release \ | |
-DCATKIN_BUILD_BINARY_PACKAGE=ON \ | |
-DCMAKE_INSTALL_PREFIX=/opt/ros/indigo \ | |
-DPYTHON_EXECUTABLE=/usr/bin/python2 \ | |
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ | |
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ | |
-DPYTHON_BASENAME=-lpython2.7 \ | |
-DSETUPTOOLS_DEB_LAYOUT=OFF | |
make | |
} | |
package() { | |
cd "${srcdir}/build" | |
make DESTDIR="${pkgdir}/" install | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/planning_scene_monitor/src/trajectory_monitor.cpp b/planning_scene_monitor/src/trajectory_monitor.cpp | |
index d491bab..b3b53e3 100644 | |
--- a/planning_scene_monitor/src/trajectory_monitor.cpp | |
+++ b/planning_scene_monitor/src/trajectory_monitor.cpp | |
@@ -62,7 +62,7 @@ void planning_scene_monitor::TrajectoryMonitor::setSamplingFrequency(double samp | |
bool planning_scene_monitor::TrajectoryMonitor::isActive() const | |
{ | |
- return record_states_thread_; | |
+ return record_states_thread_ != nullptr; | |
} | |
void planning_scene_monitor::TrajectoryMonitor::startTrajectoryMonitor() |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment