diff options
author | acxz | 2020-05-24 12:17:18 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:17:18 -0400 |
commit | 6f3a4146e8edfa832c7e4f728f1186280ade734e (patch) | |
tree | bbd1a0c1c0da701966471663f36df8db7690723f | |
parent | 25a0a8299bbf7ca0ba2df2fcc3d0f1efae9ab2a3 (diff) | |
download | aur-6f3a4146e8edfa832c7e4f728f1186280ade734e.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 29 |
2 files changed, 21 insertions, 28 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-rqt-web +pkgbase = ros-noetic-rqt-web pkgdesc = ROS - rqt_web is a simple web content viewer for rqt. pkgver = 0.4.8 pkgrel = 2 @@ -7,16 +7,16 @@ pkgbase = ros-melodic-rqt-web license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-rqt-gui-py - depends = ros-melodic-qt-gui - depends = ros-melodic-webkit-dependency - depends = ros-melodic-python-qt-binding - depends = ros-melodic-rqt-gui - depends = ros-melodic-rospy + makedepends = ros-noetic-catkin + depends = ros-noetic-rqt-gui-py + depends = ros-noetic-qt-gui + depends = ros-noetic-webkit-dependency + depends = ros-noetic-python-qt-binding + depends = ros-noetic-rqt-gui + depends = ros-noetic-rospy depends = python-rospkg - source = ros-melodic-rqt-web-0.4.8.tar.gz::https://github.com/ros-visualization/rqt_web/archive/0.4.8.tar.gz + source = ros-noetic-rqt-web-0.4.8.tar.gz::https://github.com/ros-visualization/rqt_web/archive/0.4.8.tar.gz sha256sums = fe355496bd9eae53b62ba8866d0694c73de69bca7484d2c548f48789148691c2 -pkgname = ros-melodic-rqt-web +pkgname = ros-noetic-rqt-web @@ -3,7 +3,7 @@ pkgdesc="ROS - rqt_web is a simple web content viewer for rqt." url='https://wiki.ros.org/rqt_web' -pkgname='ros-melodic-rqt-web' +pkgname='ros-noetic-rqt-web' pkgver='0.4.8' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -21,12 +21,12 @@ makedepends=( ) ros_depends=( - ros-melodic-rqt-gui-py - ros-melodic-qt-gui - ros-melodic-webkit-dependency - ros-melodic-python-qt-binding - ros-melodic-rqt-gui - ros-melodic-rospy + ros-noetic-rqt-gui-py + ros-noetic-qt-gui + ros-noetic-webkit-dependency + ros-noetic-python-qt-binding + ros-noetic-rqt-gui + ros-noetic-rospy ) depends=( @@ -41,24 +41,17 @@ sha256sums=('fe355496bd9eae53b62ba8866d0694c73de69bca7484d2c548f48789148691c2') 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 \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=.cpython-37m \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |