diff options
author | acxz | 2020-05-24 11:46:23 -0400 |
---|---|---|
committer | acxz | 2020-05-24 11:46:23 -0400 |
commit | 9ff726ed367bbf59318862a328a3b270cdd2dc41 (patch) | |
tree | 8332c86d44c06393550d36226a99f8ab0b8f8b15 | |
parent | dda0e5cd14ab22fa6e77bdcbb30ee583cf643a50 (diff) | |
download | aur-9ff726ed367bbf59318862a328a3b270cdd2dc41.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 25 |
2 files changed, 17 insertions, 24 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-image-common +pkgbase = ros-noetic-image-common pkgdesc = ROS - Common code for working with images in ROS. pkgver = 1.11.13 pkgrel = 2 @@ -7,13 +7,13 @@ pkgbase = ros-melodic-image-common license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - depends = ros-melodic-polled-camera - depends = ros-melodic-camera-calibration-parsers - depends = ros-melodic-camera-info-manager - depends = ros-melodic-image-transport - source = ros-melodic-image-common-1.11.13.tar.gz::https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz + makedepends = ros-noetic-catkin + depends = ros-noetic-polled-camera + depends = ros-noetic-camera-calibration-parsers + depends = ros-noetic-camera-info-manager + depends = ros-noetic-image-transport + source = ros-noetic-image-common-1.11.13.tar.gz::https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz sha256sums = 32a2e07724dec6eaaace21eae006274436d70d40bfe205249438570275c43cac -pkgname = ros-melodic-image-common +pkgname = ros-noetic-image-common @@ -3,7 +3,7 @@ pkgdesc="ROS - Common code for working with images in ROS." url='https://www.wiki.ros.org/image_common' -pkgname='ros-melodic-image-common' +pkgname='ros-noetic-image-common' pkgver='1.11.13' _pkgver_patch=0 arch=('any') @@ -11,7 +11,7 @@ pkgrel=2 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -21,10 +21,10 @@ makedepends=( ) ros_depends=( - ros-melodic-polled-camera - ros-melodic-camera-calibration-parsers - ros-melodic-camera-info-manager - ros-melodic-image-transport + ros-noetic-polled-camera + ros-noetic-camera-calibration-parsers + ros-noetic-camera-info-manager + ros-noetic-image-transport ) depends=( @@ -38,24 +38,17 @@ sha256sums=('32a2e07724dec6eaaace21eae006274436d70d40bfe205249438570275c43cac') 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 } |