diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 25 |
2 files changed, 22 insertions, 25 deletions
@@ -1,7 +1,7 @@ -pkgbase = ros-melodic-roslib +pkgbase = ros-noetic-roslib pkgdesc = ROS - Base dependencies and support libraries for ROS. - pkgver = 1.14.6 - pkgrel = 2 + pkgver = 1.15.2 + pkgrel = 1 url = https://wiki.ros.org/roslib arch = i686 arch = x86_64 @@ -11,15 +11,15 @@ pkgbase = ros-melodic-roslib license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-rospack - makedepends = ros-melodic-catkin + makedepends = ros-noetic-rospack + makedepends = ros-noetic-catkin makedepends = boost - depends = ros-melodic-ros-environment - depends = ros-melodic-rospack - depends = ros-melodic-catkin + depends = ros-noetic-ros-environment + depends = ros-noetic-rospack + depends = ros-noetic-catkin depends = python-rospkg - source = ros-melodic-roslib-1.14.6.tar.gz::https://github.com/ros/ros/archive/1.14.6.tar.gz - sha256sums = 62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c + source = ros-noetic-roslib-1.15.2.tar.gz::https://github.com/ros/ros/archive/1.15.2.tar.gz + sha256sums = 596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e -pkgname = ros-melodic-roslib +pkgname = ros-noetic-roslib @@ -3,15 +3,15 @@ pkgdesc="ROS - Base dependencies and support libraries for ROS." url='https://wiki.ros.org/roslib' -pkgname='ros-melodic-roslib' -pkgver='1.14.6' +pkgname='ros-noetic-roslib' +pkgver='1.15.2' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') -pkgrel=2 +pkgrel=1 license=('BSD') ros_makedepends=( - ros-melodic-rospack - ros-melodic-catkin + ros-noetic-rospack + ros-noetic-catkin ) makedepends=( @@ -22,9 +22,9 @@ makedepends=( ) ros_depends=( - ros-melodic-ros-environment - ros-melodic-rospack - ros-melodic-catkin + ros-noetic-ros-environment + ros-noetic-rospack + ros-noetic-catkin ) depends=( @@ -34,25 +34,22 @@ depends=( _dir="ros-${pkgver}/core/roslib" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros/archive/${pkgver}.tar.gz") -sha256sums=('62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c') +sha256sums=('596bb5e04ece0ad0662d6d2ee9b4223aaa890770e83c7310ec71bf9c0c3c7b5e') 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 |