diff options
author | Hermann von Kleist | 2020-05-10 01:15:58 +0200 |
---|---|---|
committer | Hermann von Kleist | 2020-05-10 01:15:58 +0200 |
commit | 00a141db67264e06e06b969c62ef9f391811b196 (patch) | |
tree | 1f181a8108cfb64ee2493286a7815fa0015e4f43 | |
parent | f8e0843c69bad5fef748b5ca7371749e26c74361 (diff) | |
download | aur-00a141db67264e06e06b969c62ef9f391811b196.tar.gz |
Update to 2.6.1 and noetic
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 21 |
2 files changed, 18 insertions, 21 deletions
@@ -1,7 +1,7 @@ -pkgbase = ros-melodic-rospack +pkgbase = ros-noetic-rospack pkgdesc = ROS - ROS Package Tool. - pkgver = 2.5.4 - pkgrel = 2 + pkgver = 2.6.1 + pkgrel = 1 url = https://wiki.ros.org/rospack arch = i686 arch = x86_64 @@ -11,22 +11,22 @@ pkgbase = ros-melodic-rospack license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-cmake-modules - makedepends = ros-melodic-catkin + makedepends = ros-noetic-cmake-modules + makedepends = ros-noetic-catkin makedepends = tinyxml2 makedepends = gtest makedepends = pkg-config makedepends = boost makedepends = python - depends = ros-melodic-ros-environment + depends = ros-noetic-ros-environment depends = tinyxml2 depends = python-rosdep depends = python-catkin_pkg depends = pkg-config depends = boost depends = python - source = ros-melodic-rospack-2.5.4.tar.gz::https://github.com/ros/rospack/archive/2.5.4.tar.gz - sha256sums = f28c9399bb45818a60d2e348ad5a5a43a87aea4a362ebaea63230fd9120e19af + source = ros-noetic-rospack-2.6.1.tar.gz::https://github.com/ros/rospack/archive/2.6.1.tar.gz + sha256sums = 3f963ae217b44eb1bbf128bfcbedfed474c880c6d1cc4379e64dbdd7c8a0d1b9 -pkgname = ros-melodic-rospack +pkgname = ros-noetic-rospack @@ -3,15 +3,15 @@ pkgdesc="ROS - ROS Package Tool." url='https://wiki.ros.org/rospack' -pkgname='ros-melodic-rospack' -pkgver='2.5.4' +pkgname='ros-noetic-rospack' +pkgver='2.6.1' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') -pkgrel=2 +pkgrel=1 license=('BSD') ros_makedepends=( - ros-melodic-cmake-modules - ros-melodic-catkin + ros-noetic-cmake-modules + ros-noetic-catkin ) makedepends=( @@ -26,7 +26,7 @@ makedepends=( ) ros_depends=( - ros-melodic-ros-environment + ros-noetic-ros-environment ) depends=( @@ -41,25 +41,22 @@ depends=( _dir="rospack-${pkgver}" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/rospack/archive/${pkgver}.tar.gz") -sha256sums=('f28c9399bb45818a60d2e348ad5a5a43a87aea4a362ebaea63230fd9120e19af') +sha256sums=('3f963ae217b44eb1bbf128bfcbedfed474c880c6d1cc4379e64dbdd7c8a0d1b9') 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 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DSETUPTOOLS_DEB_LAYOUT=OFF make |