diff options
author | acxz | 2020-05-24 12:23:55 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:23:55 -0400 |
commit | 1ec0d948c50f5004a1e31bf23ffdcb0bdf193467 (patch) | |
tree | 3ef282b7e9fa146c620ede8aabce52baa938ee22 | |
parent | 7442bed21667696eb2fad2e667b48f505567328b (diff) | |
download | aur-1ec0d948c50f5004a1e31bf23ffdcb0bdf193467.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 40 | ||||
-rw-r--r-- | PKGBUILD | 48 |
2 files changed, 42 insertions, 46 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-viso2-ros +pkgbase = ros-noetic-viso2-ros pkgdesc = ROS - wrapper for libviso2 pkgver = 0.0.1 pkgrel = 2 @@ -13,30 +13,30 @@ pkgbase = ros-melodic-viso2-ros makedepends = ros-build-tools makedepends = boost-libs makedepends = opencv - makedepends = ros-melodic-libviso2 - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-rostime - makedepends = ros-melodic-rosconsole - makedepends = ros-melodic-cv-bridge - makedepends = ros-melodic-image-geometry - makedepends = ros-melodic-tf - makedepends = ros-melodic-image-transport - makedepends = ros-melodic-message-filters + makedepends = ros-noetic-libviso2 + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-rostime + makedepends = ros-noetic-rosconsole + makedepends = ros-noetic-cv-bridge + makedepends = ros-noetic-image-geometry + makedepends = ros-noetic-tf + makedepends = ros-noetic-image-transport + makedepends = ros-noetic-message-filters depends = cmake depends = ros-build-tools depends = boost-libs depends = opencv - depends = ros-melodic-libviso2 - depends = ros-melodic-roscpp - depends = ros-melodic-rostime - depends = ros-melodic-rosconsole - depends = ros-melodic-cv-bridge - depends = ros-melodic-image-geometry - depends = ros-melodic-tf - depends = ros-melodic-image-transport - depends = ros-melodic-message-filters + depends = ros-noetic-libviso2 + depends = ros-noetic-roscpp + depends = ros-noetic-rostime + depends = ros-noetic-rosconsole + depends = ros-noetic-cv-bridge + depends = ros-noetic-image-geometry + depends = ros-noetic-tf + depends = ros-noetic-image-transport + depends = ros-noetic-message-filters source = viso2::git+https://github.com/srv/viso2.git sha256sums = SKIP -pkgname = ros-melodic-viso2-ros +pkgname = ros-noetic-viso2-ros @@ -2,34 +2,34 @@ pkgdesc="ROS - wrapper for libviso2" url='https://www.wiki.ros.org/viso2' -pkgname='ros-melodic-viso2-ros' +pkgname='ros-noetic-viso2-ros' pkgver='0.0.1' _pkgver_patch=0 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') pkgrel=2 license=('GPL') -ros_makedepends=(ros-melodic-libviso2 - ros-melodic-roscpp - ros-melodic-rostime - ros-melodic-rosconsole - ros-melodic-cv-bridge - ros-melodic-image-geometry - ros-melodic-tf - ros-melodic-image-transport - ros-melodic-message-filters) +ros_makedepends=(ros-noetic-libviso2 + ros-noetic-roscpp + ros-noetic-rostime + ros-noetic-rosconsole + ros-noetic-cv-bridge + ros-noetic-image-geometry + ros-noetic-tf + ros-noetic-image-transport + ros-noetic-message-filters) makedepends=('cmake' 'ros-build-tools' 'boost-libs' 'opencv' ${ros_makedepends[@]}) -ros_depends=(ros-melodic-libviso2 - ros-melodic-roscpp - ros-melodic-rostime - ros-melodic-rosconsole - ros-melodic-cv-bridge - ros-melodic-image-geometry - ros-melodic-tf - ros-melodic-image-transport - ros-melodic-message-filters) +ros_depends=(ros-noetic-libviso2 + ros-noetic-roscpp + ros-noetic-rostime + ros-noetic-rosconsole + ros-noetic-cv-bridge + ros-noetic-image-geometry + ros-noetic-tf + ros-noetic-image-transport + ros-noetic-message-filters) depends=('cmake' 'ros-build-tools' 'boost-libs' 'opencv' ${ros_depends[@]}) @@ -47,21 +47,17 @@ prepare() { 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 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 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 } |