summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commit203236843485f5476675dd6d4a165b9ba84ae55f (patch)
tree6f16037f9930e50fff89543f6c2db8bd7cffd9ed
parent4c4bb2d4cb064bf1b1a22bc59d1b8677c2497b5f (diff)
downloadaur-ros-ardent-rviz-rendering.tar.gz
Update to version 2.0.0-6
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7904bb8c150..6b43b364669 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:45:23 UTC 2017
+# Thu Dec 21 22:29:54 UTC 2017
pkgbase = ros-ardent-rviz-rendering
pkgdesc = ROS - Library which provides the 3D rendering functionality in rviz.
pkgver = 2.0.0
@@ -10,8 +10,8 @@ pkgbase = ros-ardent-rviz-rendering
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
- depends = ros-ardent-rviz-ogre-vendor
depends = ros-ardent-ament-index-cpp
+ depends = ros-ardent-rviz-ogre-vendor
depends = qt5-base
source = ros-ardent-rviz-rendering-2.0.0-5.tar.gz::https://github.com/ros2-gbp/rviz-release/archive/release/ardent/rviz_rendering/2.0.0-5.tar.gz
sha256sums = 653bcb9a571f1a704b02b24e944297e537ac7159f4ff0c9e9d43c2f33dcae69a
diff --git a/PKGBUILD b/PKGBUILD
index 4891b660629..22ad4879a73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ ros_makedepends=(ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-rviz-ogre-vendor
- ros-ardent-ament-index-cpp)
+ros_depends=(ros-ardent-ament-index-cpp
+ ros-ardent-rviz-ogre-vendor)
depends=(${ros_depends[@]}
qt5-base)
@@ -42,17 +42,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
}