diff options
author | acxz | 2020-05-24 11:48:15 -0400 |
---|---|---|
committer | acxz | 2020-05-24 11:48:15 -0400 |
commit | 5fd60529e013023d669420b3af8f4185911d433f (patch) | |
tree | 7bd6e8313128eb84f1171f9a0f31c5f44d7ecff0 | |
parent | bb113b81d4cd0a983c56ff46a99224e509954516 (diff) | |
download | aur-5fd60529e013023d669420b3af8f4185911d433f.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | PKGBUILD | 30 |
2 files changed, 25 insertions, 29 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-interactive-marker-tutorials +pkgbase = ros-noetic-interactive-marker-tutorials pkgdesc = ROS - The interactive_marker_tutorials package. pkgver = 0.10.3 pkgrel = 3 @@ -11,17 +11,17 @@ pkgbase = ros-melodic-interactive-marker-tutorials license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - makedepends = ros-melodic-tf - makedepends = ros-melodic-interactive-markers - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-visualization-msgs - depends = ros-melodic-tf - depends = ros-melodic-visualization-msgs - depends = ros-melodic-interactive-markers - depends = ros-melodic-roscpp - source = ros-melodic-interactive-marker-tutorials-0.10.3.tar.gz::https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz + makedepends = ros-noetic-catkin + makedepends = ros-noetic-tf + makedepends = ros-noetic-interactive-markers + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-visualization-msgs + depends = ros-noetic-tf + depends = ros-noetic-visualization-msgs + depends = ros-noetic-interactive-markers + depends = ros-noetic-roscpp + source = ros-noetic-interactive-marker-tutorials-0.10.3.tar.gz::https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz sha256sums = a3162d933fea0dd58b99e46fb71ea5d8596ef6e46eaf3a906e4bf20e9ca1bb1c -pkgname = ros-melodic-interactive-marker-tutorials +pkgname = ros-noetic-interactive-marker-tutorials @@ -3,7 +3,7 @@ pkgdesc="ROS - The interactive_marker_tutorials package." url='https://wiki.ros.org/interactive_marker_tutorials' -pkgname='ros-melodic-interactive-marker-tutorials' +pkgname='ros-noetic-interactive-marker-tutorials' pkgver='0.10.3' _pkgver_patch=0 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') @@ -11,11 +11,11 @@ pkgrel=3 license=('BSD') ros_makedepends=( - ros-melodic-catkin - ros-melodic-tf - ros-melodic-interactive-markers - ros-melodic-roscpp - ros-melodic-visualization-msgs + ros-noetic-catkin + ros-noetic-tf + ros-noetic-interactive-markers + ros-noetic-roscpp + ros-noetic-visualization-msgs ) makedepends=( @@ -25,10 +25,10 @@ makedepends=( ) ros_depends=( - ros-melodic-tf - ros-melodic-visualization-msgs - ros-melodic-interactive-markers - ros-melodic-roscpp + ros-noetic-tf + ros-noetic-visualization-msgs + ros-noetic-interactive-markers + ros-noetic-roscpp ) depends=( @@ -42,21 +42,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 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |