summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commit5a547fad30307beeec10ffb9fcb6ad835255d362 (patch)
tree49cb9a86dd126875e69002d5b55c9e88735d8e3f
parent89a75b3dbf87e96ba4f25ae37f15d914e0f93e90 (diff)
downloadaur-ros-ardent-rviz-default-plugins.tar.gz
Update to version 2.0.0-6
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
2 files changed, 12 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bccd12b1331..d0a376e5360 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:45:18 UTC 2017
+# Thu Dec 21 22:29:51 UTC 2017
pkgbase = ros-ardent-rviz-default-plugins
pkgdesc = ROS - Several default plugins for rviz to cover the basic functionality.
pkgver = 2.0.0
@@ -10,10 +10,10 @@ pkgbase = ros-ardent-rviz-default-plugins
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
- depends = ros-ardent-rviz-common
depends = ros-ardent-pluginlib
- depends = ros-ardent-rviz-rendering
depends = ros-ardent-rclcpp
+ depends = ros-ardent-rviz-common
+ depends = ros-ardent-rviz-rendering
depends = qt5-base
source = ros-ardent-rviz-default-plugins-2.0.0-5.tar.gz::https://github.com/ros2-gbp/rviz-release/archive/release/ardent/rviz_default_plugins/2.0.0-5.tar.gz
sha256sums = 9d2762bb80026fb66848c3d0eb6204b3842a8300ecba1df82c73291f37c6b7ba
diff --git a/PKGBUILD b/PKGBUILD
index 6e055528061..6dbe2123cfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@ ros_makedepends=(ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-rviz-common
- ros-ardent-pluginlib
- ros-ardent-rviz-rendering
- ros-ardent-rclcpp)
+ros_depends=(ros-ardent-pluginlib
+ ros-ardent-rclcpp
+ ros-ardent-rviz-common
+ ros-ardent-rviz-rendering)
depends=(${ros_depends[@]}
qt5-base)
@@ -44,17 +44,14 @@ build() {
# Fix Python2/Python3 conflicts
/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
+ export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages
+ export AMENT_PREFIX_PATH=/opt/ros/ardent
+
# Build project
cmake "${srcdir}/${_dir}" \
-DCMAKE_BUILD_TYPE=Release \
- -DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
- -DPYTHON_BASENAME=.cpython-35m \
- -DSETUPTOOLS_DEB_LAYOUT=OFF \
- -DCATKIN_ENABLE_TESTING=OFF
+ -DBUILD_TESTING=Off \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent
make
}