diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:38:16 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:38:16 +0200 |
commit | aa709ad5f04fe6e15502ea7c0723ff15551bd109 (patch) | |
tree | 801ae2c0c3c71f2cdf615f580ee7c25566dcbb7a | |
parent | 816c4e0bc3c1486e9c43112fe6f962ed4f5df644 (diff) | |
download | aur-aa709ad5f04fe6e15502ea7c0723ff15551bd109.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 108 |
2 files changed, 53 insertions, 67 deletions
@@ -7,19 +7,19 @@ pkgbase = ros-melodic-stage license = GPL makedepends = cmake makedepends = ros-build-tools - makedepends = pkg-config - makedepends = mesa makedepends = fltk makedepends = libjpeg-turbo makedepends = gtk2 makedepends = libtool + makedepends = mesa + makedepends = pkg-config depends = ros-melodic-catkin - depends = gtk2 - depends = fltk depends = libjpeg-turbo depends = mesa - source = ros-melodic-stage::git+https://github.com/ros-gbp/stage-release.git - sha256sums = SKIP + depends = fltk + depends = gtk2 + source = ros-melodic-stage-4.3.0-0.tar.gz::https://github.com/ros-gbp/stage-release/archive/release/melodic/stage/4.3.0-0.tar.gz + sha256sums = 3c72bba7242ecd98b26f177e4227aef06ec85915f196ee88ec6103be4dfb492d pkgname = ros-melodic-stage @@ -1,5 +1,5 @@ -# Script generated with import_catkin_packages.py. -# For more information: https://github.com/bchretien/arch-ros-stacks. +# Script generated with import_catkin_packages.py +# For more information: https://github.com/bchretien/arch-ros-stacks pkgdesc="ROS - Mobile robot simulator http://rtv.github.com/Stage." url='http://rtv.github.com/Stage' @@ -10,74 +10,60 @@ arch=('any') pkgrel=1 license=('GPL') -ros_makedepends=( -) +ros_makedepends=() +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + fltk + libjpeg-turbo + gtk2 + libtool + mesa + pkg-config) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - pkg-config - mesa - fltk - libjpeg-turbo - gtk2 - libtool -) +ros_depends=(ros-melodic-catkin) +depends=(${ros_depends[@]} + libjpeg-turbo + mesa + fltk + gtk2) -ros_depends=( - ros-melodic-catkin -) +# Git version (e.g. for debugging) +# _tag=release/melodic/stage/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/stage-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - gtk2 - fltk - libjpeg-turbo - mesa -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/stage-release.git") -sha256sums=('SKIP') - -prepare() { - cd ${srcdir}/${_dir} - git checkout upstream - _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g') - - if [ -d ${_pkgname} ]; then - git subtree split -P ${_pkgname} --branch ${_pkgname} - git checkout ${_pkgname} - fi -} +# Tarball version (faster download) +_dir="stage-release-release-melodic-stage-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/stage-release/archive/release/melodic/stage/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('3c72bba7242ecd98b26f177e4227aef06ec85915f196ee88ec6103be4dfb492d') 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 + # 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 - # Create the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # 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} + # 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 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # 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.7m \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ + -DPYTHON_BASENAME=.cpython-37m \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |