diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 19 |
2 files changed, 8 insertions, 15 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-melodic-geometric-shapes pkgdesc = ROS - This package contains generic definitions of geometric shapes and bodies. - pkgver = 0.6.1 - pkgrel = 1 + pkgver = 0.6.1r + pkgrel = 2 url = http://wiki.ros.org/geometric_shapes arch = any license = BSD @@ -6,7 +6,7 @@ url='http://wiki.ros.org/geometric_shapes' pkgname='ros-melodic-geometric-shapes' pkgver='0.6.1' arch=('any') -pkgrel=1 +pkgrel=2 license=('BSD') ros_makedepends=(ros-melodic-resource-retriever @@ -38,13 +38,6 @@ depends=(${ros_depends[@]} console-bridge qhull) -# Git version (e.g. for debugging) -# _tag=release/melodic/geometric_shapes/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/geometric_shapes-release.git"#tag=${_tag}) -# sha256sums=('SKIP') - -# Tarball version (faster download) _dir="geometric_shapes-${pkgver}" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/geometric_shapes/archive/${pkgver}.tar.gz") sha256sums=('768ecbd9bf8501a844b358026d6ae1db5d4d70d1958f47f5ca64c1ee7bd20b8c') @@ -59,17 +52,17 @@ build() { cd ${srcdir}/build # Fix Python2/Python3 conflicts - /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} + /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/python2 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPYTHON_BASENAME=-python2.7 \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ + -DPYTHON_BASENAME=.cpython-37m \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |