diff options
author | acxz | 2020-05-24 12:00:52 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:00:52 -0400 |
commit | 195a6c5684628918468dd152be8f1a673d41cedf (patch) | |
tree | b7088fab4b25438b1998eaffae506d4c07ee6f73 | |
parent | ebe9dfe46f409b587c3d8e6e4605cde538dc2d06 (diff) | |
download | aur-195a6c5684628918468dd152be8f1a673d41cedf.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 52 | ||||
-rw-r--r-- | PKGBUILD | 60 |
2 files changed, 54 insertions, 58 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-moveit-ros-visualization +pkgbase = ros-noetic-moveit-ros-visualization pkgdesc = ROS - Components of MoveIt that offer visualization. pkgver = 1.0.2 pkgrel = 2 @@ -11,33 +11,33 @@ pkgbase = ros-melodic-moveit-ros-visualization license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-object-recognition-msgs - makedepends = ros-melodic-pluginlib - makedepends = ros-melodic-moveit-ros-warehouse - makedepends = ros-melodic-interactive-markers - makedepends = ros-melodic-rospy - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-moveit-ros-planning-interface - makedepends = ros-melodic-rviz - makedepends = ros-melodic-moveit-ros-robot-interaction - makedepends = ros-melodic-geometric-shapes - makedepends = ros-melodic-catkin - makedepends = ros-melodic-moveit-ros-perception + makedepends = ros-noetic-object-recognition-msgs + makedepends = ros-noetic-pluginlib + makedepends = ros-noetic-moveit-ros-warehouse + makedepends = ros-noetic-interactive-markers + makedepends = ros-noetic-rospy + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-moveit-ros-planning-interface + makedepends = ros-noetic-rviz + makedepends = ros-noetic-moveit-ros-robot-interaction + makedepends = ros-noetic-geometric-shapes + makedepends = ros-noetic-catkin + makedepends = ros-noetic-moveit-ros-perception makedepends = eigen3 makedepends = pkg-config - depends = ros-melodic-object-recognition-msgs - depends = ros-melodic-pluginlib - depends = ros-melodic-moveit-ros-warehouse - depends = ros-melodic-interactive-markers - depends = ros-melodic-rospy - depends = ros-melodic-roscpp - depends = ros-melodic-moveit-ros-planning-interface - depends = ros-melodic-rviz - depends = ros-melodic-moveit-ros-robot-interaction - depends = ros-melodic-geometric-shapes - depends = ros-melodic-moveit-ros-perception - source = ros-melodic-moveit-ros-visualization-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz + depends = ros-noetic-object-recognition-msgs + depends = ros-noetic-pluginlib + depends = ros-noetic-moveit-ros-warehouse + depends = ros-noetic-interactive-markers + depends = ros-noetic-rospy + depends = ros-noetic-roscpp + depends = ros-noetic-moveit-ros-planning-interface + depends = ros-noetic-rviz + depends = ros-noetic-moveit-ros-robot-interaction + depends = ros-noetic-geometric-shapes + depends = ros-noetic-moveit-ros-perception + source = ros-noetic-moveit-ros-visualization-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4 -pkgname = ros-melodic-moveit-ros-visualization +pkgname = ros-noetic-moveit-ros-visualization @@ -2,44 +2,44 @@ pkgdesc="ROS - Components of MoveIt that offer visualization." url='https://moveit.ros.org' -pkgname='ros-melodic-moveit-ros-visualization' +pkgname='ros-noetic-moveit-ros-visualization' pkgver='1.0.2' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') pkgrel=2 license=('BSD') -ros_makedepends=(ros-melodic-object-recognition-msgs - ros-melodic-pluginlib - ros-melodic-moveit-ros-warehouse - ros-melodic-interactive-markers - ros-melodic-rospy - ros-melodic-roscpp - ros-melodic-moveit-ros-planning-interface - ros-melodic-rviz - ros-melodic-moveit-ros-robot-interaction - ros-melodic-geometric-shapes - ros-melodic-catkin - ros-melodic-moveit-ros-perception) +ros_makedepends=(ros-noetic-object-recognition-msgs + ros-noetic-pluginlib + ros-noetic-moveit-ros-warehouse + ros-noetic-interactive-markers + ros-noetic-rospy + ros-noetic-roscpp + ros-noetic-moveit-ros-planning-interface + ros-noetic-rviz + ros-noetic-moveit-ros-robot-interaction + ros-noetic-geometric-shapes + ros-noetic-catkin + ros-noetic-moveit-ros-perception) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]} eigen3 pkg-config) -ros_depends=(ros-melodic-object-recognition-msgs - ros-melodic-pluginlib - ros-melodic-moveit-ros-warehouse - ros-melodic-interactive-markers - ros-melodic-rospy - ros-melodic-roscpp - ros-melodic-moveit-ros-planning-interface - ros-melodic-rviz - ros-melodic-moveit-ros-robot-interaction - ros-melodic-geometric-shapes - ros-melodic-moveit-ros-perception) +ros_depends=(ros-noetic-object-recognition-msgs + ros-noetic-pluginlib + ros-noetic-moveit-ros-warehouse + ros-noetic-interactive-markers + ros-noetic-rospy + ros-noetic-roscpp + ros-noetic-moveit-ros-planning-interface + ros-noetic-rviz + ros-noetic-moveit-ros-robot-interaction + ros-noetic-geometric-shapes + ros-noetic-moveit-ros-perception) depends=(${ros_depends[@]}) # Git version (e.g. for debugging) -# _tag=release/melodic/moveit_ros_visualization/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/moveit_ros_visualization/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag}) # sha256sums=('648a7419c00fa9e0d6575e1d7afa381dfe33cdcfe83348a8145c23801ecb80dd') @@ -56,21 +56,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 } |