diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
2 files changed, 15 insertions, 22 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-pr2-dashboard-aggregator +pkgbase = ros-noetic-pr2-dashboard-aggregator pkgdesc = ROS - A simple script that aggregates all of the topics that a "pr2_dashboard" app might be interested in. pkgver = 1.12.4 pkgrel = 1 @@ -7,12 +7,12 @@ pkgbase = ros-melodic-pr2-dashboard-aggregator license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-std-msgs - depends = ros-melodic-pr2-msgs - depends = ros-melodic-rospy - source = ros-melodic-pr2-dashboard-aggregator-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-std-msgs + depends = ros-noetic-pr2-msgs + depends = ros-noetic-rospy + source = ros-noetic-pr2-dashboard-aggregator-1.12.4.tar.gz::https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz sha256sums = 135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009 -pkgname = ros-melodic-pr2-dashboard-aggregator +pkgname = ros-noetic-pr2-dashboard-aggregator @@ -2,19 +2,19 @@ pkgdesc="ROS - A simple script that aggregates all of the topics that a \"pr2_dashboard\" app might be interested in." url='https://wiki.ros.org/pr2_dashboard_aggregator' -pkgname='ros-melodic-pr2-dashboard-aggregator' +pkgname='ros-noetic-pr2-dashboard-aggregator' pkgver='1.12.4' arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin) +ros_makedepends=(ros-noetic-catkin) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-melodic-std-msgs - ros-melodic-pr2-msgs - ros-melodic-rospy) +ros_depends=(ros-noetic-std-msgs + ros-noetic-pr2-msgs + ros-noetic-rospy) depends=(${ros_depends[@]}) _dir="pr2_common-${pkgver}/pr2_dashboard_aggregator" @@ -24,24 +24,17 @@ sha256sums=('135c6947f7511bcb3644fa6c0cf5972c309516895737e83f8eeed2b2d069f009') 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 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7.so \ - -DPYTHON_BASENAME=-python3.7 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |