diff options
author | acxz | 2020-05-24 12:00:14 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:00:14 -0400 |
commit | 2b28c5de56267c5b94fa15b710a53ebcbe8ff96c (patch) | |
tree | 8bcdf21fc55491c9d7f507bbe079d23aea9a559b | |
parent | f79f87e1e679998f916eceae72fc1b51a28d2c79 (diff) | |
download | aur-2b28c5de56267c5b94fa15b710a53ebcbe8ff96c.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 48 | ||||
-rw-r--r-- | PKGBUILD | 56 |
2 files changed, 50 insertions, 54 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-moveit-ros-manipulation +pkgbase = ros-noetic-moveit-ros-manipulation pkgdesc = ROS - Components of MoveIt used for manipulation. pkgver = 1.0.2 pkgrel = 2 @@ -11,30 +11,30 @@ pkgbase = ros-melodic-moveit-ros-manipulation license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-moveit-core - makedepends = ros-melodic-moveit-msgs - makedepends = ros-melodic-tf - makedepends = ros-melodic-moveit-ros-move-group - makedepends = ros-melodic-pluginlib - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-dynamic-reconfigure - makedepends = ros-melodic-moveit-ros-planning - makedepends = ros-melodic-actionlib - makedepends = ros-melodic-rosconsole - makedepends = ros-melodic-catkin + makedepends = ros-noetic-moveit-core + makedepends = ros-noetic-moveit-msgs + makedepends = ros-noetic-tf + makedepends = ros-noetic-moveit-ros-move-group + makedepends = ros-noetic-pluginlib + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-dynamic-reconfigure + makedepends = ros-noetic-moveit-ros-planning + makedepends = ros-noetic-actionlib + makedepends = ros-noetic-rosconsole + makedepends = ros-noetic-catkin makedepends = eigen - depends = ros-melodic-moveit-core - depends = ros-melodic-moveit-msgs - depends = ros-melodic-tf - depends = ros-melodic-moveit-ros-move-group - depends = ros-melodic-pluginlib - depends = ros-melodic-roscpp - depends = ros-melodic-dynamic-reconfigure - depends = ros-melodic-moveit-ros-planning - depends = ros-melodic-actionlib - depends = ros-melodic-rosconsole - source = ros-melodic-moveit-ros-manipulation-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz + depends = ros-noetic-moveit-core + depends = ros-noetic-moveit-msgs + depends = ros-noetic-tf + depends = ros-noetic-moveit-ros-move-group + depends = ros-noetic-pluginlib + depends = ros-noetic-roscpp + depends = ros-noetic-dynamic-reconfigure + depends = ros-noetic-moveit-ros-planning + depends = ros-noetic-actionlib + depends = ros-noetic-rosconsole + source = ros-noetic-moveit-ros-manipulation-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4 -pkgname = ros-melodic-moveit-ros-manipulation +pkgname = ros-noetic-moveit-ros-manipulation @@ -2,41 +2,41 @@ pkgdesc="ROS - Components of MoveIt used for manipulation." url='https://moveit.ros.org' -pkgname='ros-melodic-moveit-ros-manipulation' +pkgname='ros-noetic-moveit-ros-manipulation' pkgver='1.0.2' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') pkgrel=2 license=('BSD') -ros_makedepends=(ros-melodic-moveit-core - ros-melodic-moveit-msgs - ros-melodic-tf - ros-melodic-moveit-ros-move-group - ros-melodic-pluginlib - ros-melodic-roscpp - ros-melodic-dynamic-reconfigure - ros-melodic-moveit-ros-planning - ros-melodic-actionlib - ros-melodic-rosconsole - ros-melodic-catkin) +ros_makedepends=(ros-noetic-moveit-core + ros-noetic-moveit-msgs + ros-noetic-tf + ros-noetic-moveit-ros-move-group + ros-noetic-pluginlib + ros-noetic-roscpp + ros-noetic-dynamic-reconfigure + ros-noetic-moveit-ros-planning + ros-noetic-actionlib + ros-noetic-rosconsole + ros-noetic-catkin) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]} eigen) -ros_depends=(ros-melodic-moveit-core - ros-melodic-moveit-msgs - ros-melodic-tf - ros-melodic-moveit-ros-move-group - ros-melodic-pluginlib - ros-melodic-roscpp - ros-melodic-dynamic-reconfigure - ros-melodic-moveit-ros-planning - ros-melodic-actionlib - ros-melodic-rosconsole) +ros_depends=(ros-noetic-moveit-core + ros-noetic-moveit-msgs + ros-noetic-tf + ros-noetic-moveit-ros-move-group + ros-noetic-pluginlib + ros-noetic-roscpp + ros-noetic-dynamic-reconfigure + ros-noetic-moveit-ros-planning + ros-noetic-actionlib + ros-noetic-rosconsole) depends=(${ros_depends[@]}) # Git version (e.g. for debugging) -# _tag=release/melodic/moveit_ros_manipulation/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/moveit_ros_manipulation/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag}) # sha256sums=('7de3f6be5c047901bfe324986686e8d8370be6ebfef96738a8ad3f3365b570f4') @@ -49,21 +49,17 @@ sha256sums=('b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4') 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 } |