diff options
author | acxz | 2020-05-24 12:24:01 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:24:01 -0400 |
commit | 0d0a5164d092e592dea17c1e3aa7150f81da0e1c (patch) | |
tree | 05b28d37a1767b01b75d63b4a78ca1bcd0aa90d8 | |
parent | 69ba4be8802756a507b9b3a55362a8ff695e8b3c (diff) | |
download | aur-0d0a5164d092e592dea17c1e3aa7150f81da0e1c.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 22 |
2 files changed, 17 insertions, 21 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-visualization-marker-tutorials +pkgbase = ros-noetic-visualization-marker-tutorials pkgdesc = ROS - The visulalization_marker_tutorials package. pkgver = 0.10.3 pkgrel = 3 @@ -11,13 +11,13 @@ pkgbase = ros-melodic-visualization-marker-tutorials license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-visualization-msgs - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-catkin - depends = ros-melodic-visualization-msgs - depends = ros-melodic-roscpp - source = ros-melodic-visualization-marker-tutorials-0.10.3.tar.gz::https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz + makedepends = ros-noetic-visualization-msgs + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-catkin + depends = ros-noetic-visualization-msgs + depends = ros-noetic-roscpp + source = ros-noetic-visualization-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-visualization-marker-tutorials +pkgname = ros-noetic-visualization-marker-tutorials @@ -3,7 +3,7 @@ pkgdesc="ROS - The visulalization_marker_tutorials package." url='https://wiki.ros.org/visualization_marker_tutorials' -pkgname='ros-melodic-visualization-marker-tutorials' +pkgname='ros-noetic-visualization-marker-tutorials' pkgver='0.10.3' _pkgver_patch=0 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') @@ -11,9 +11,9 @@ pkgrel=3 license=('BSD') ros_makedepends=( - ros-melodic-visualization-msgs - ros-melodic-roscpp - ros-melodic-catkin + ros-noetic-visualization-msgs + ros-noetic-roscpp + ros-noetic-catkin ) makedepends=( @@ -23,8 +23,8 @@ makedepends=( ) ros_depends=( - ros-melodic-visualization-msgs - ros-melodic-roscpp + ros-noetic-visualization-msgs + ros-noetic-roscpp ) depends=( @@ -38,21 +38,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 } |