diff options
author | acxz | 2020-05-24 12:24:09 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:24:09 -0400 |
commit | 329a05aa6af27ddee53c2136ab6dc75db080765e (patch) | |
tree | e5a01d641218be6c3553e9c522c54348860c6d97 | |
parent | b304444acdb0810c0314d94c622246aa569dec63 (diff) | |
download | aur-329a05aa6af27ddee53c2136ab6dc75db080765e.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 27 |
2 files changed, 19 insertions, 26 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-visualization-tutorials +pkgbase = ros-noetic-visualization-tutorials pkgdesc = ROS - Metapackage referencing tutorials related to rviz and visualization. pkgver = 0.10.3 pkgrel = 2 @@ -7,14 +7,14 @@ pkgbase = ros-melodic-visualization-tutorials license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-visualization-marker-tutorials - depends = ros-melodic-librviz-tutorial - depends = ros-melodic-rviz-plugin-tutorials - depends = ros-melodic-interactive-marker-tutorials - depends = ros-melodic-rviz-python-tutorial - source = ros-melodic-visualization-tutorials-0.10.3.tar.gz::https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-visualization-marker-tutorials + depends = ros-noetic-librviz-tutorial + depends = ros-noetic-rviz-plugin-tutorials + depends = ros-noetic-interactive-marker-tutorials + depends = ros-noetic-rviz-python-tutorial + source = ros-noetic-visualization-tutorials-0.10.3.tar.gz::https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz sha256sums = a3162d933fea0dd58b99e46fb71ea5d8596ef6e46eaf3a906e4bf20e9ca1bb1c -pkgname = ros-melodic-visualization-tutorials +pkgname = ros-noetic-visualization-tutorials @@ -3,7 +3,7 @@ pkgdesc="ROS - Metapackage referencing tutorials related to rviz and visualization." url='https://wiki.ros.org/visualization_tutorials' -pkgname='ros-melodic-visualization-tutorials' +pkgname='ros-noetic-visualization-tutorials' pkgver='0.10.3' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -21,11 +21,11 @@ makedepends=( ) ros_depends=( - ros-melodic-visualization-marker-tutorials - ros-melodic-librviz-tutorial - ros-melodic-rviz-plugin-tutorials - ros-melodic-interactive-marker-tutorials - ros-melodic-rviz-python-tutorial + ros-noetic-visualization-marker-tutorials + ros-noetic-librviz-tutorial + ros-noetic-rviz-plugin-tutorials + ros-noetic-interactive-marker-tutorials + ros-noetic-rviz-python-tutorial ) depends=( @@ -39,24 +39,17 @@ sha256sums=('a3162d933fea0dd58b99e46fb71ea5d8596ef6e46eaf3a906e4bf20e9ca1bb1c') build() { # Use ROS environment variables. source /usr/share/ros-build-tools/clear-ros-env.sh - [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash + [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash # Create the 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 3 ${srcdir}/${_dir} - # Build the project. cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=.cpython-37m \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |