diff options
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 20 |
2 files changed, 11 insertions, 16 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Dec 19 18:45:20 UTC 2017 +# Thu Dec 21 22:29:49 UTC 2017 pkgbase = ros-ardent-rviz-ogre-vendor pkgdesc = ROS - Wrapper around ogre3d, it provides a fixed CMake module and an ExternalProject build of ogre. pkgver = 2.0.0 @@ -11,10 +11,9 @@ pkgbase = ros-ardent-rviz-ogre-vendor makedepends = ros-build-tools makedepends = ros-ardent-ament-cmake makedepends = pkg-config - makedepends = libfreetype6-dev - depends = libxaw - depends = libfreetype6 + depends = freetype2 depends = libx11 + depends = libxaw depends = libxrandr depends = mesa source = ros-ardent-rviz-ogre-vendor-2.0.0-5.tar.gz::https://github.com/ros2-gbp/rviz-release/archive/release/ardent/rviz_ogre_vendor/2.0.0-5.tar.gz @@ -13,14 +13,13 @@ license=('Apache License 2.0, MIT') ros_makedepends=(ros-ardent-ament-cmake) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]} - pkg-config - libfreetype6-dev) + pkg-config) ros_depends=() depends=(${ros_depends[@]} - libxaw - libfreetype6 + freetype2 libx11 + libxaw libxrandr mesa) @@ -47,17 +46,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 } |