summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-26 13:38:20 +0200
committerGonçalo Camelo Neves Pereira2018-09-26 13:38:20 +0200
commit2ce319057951f5c98bb80e352f18d5128e3ccde5 (patch)
treedbaaa30d2f90fcffb5a57a0ec7a6e93dd0ac432a
parent1155480ad132954ce71f8d660d41b353e4dd5bc9 (diff)
downloadaur-2ce319057951f5c98bb80e352f18d5128e3ccde5.tar.gz
Update
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD125
2 files changed, 67 insertions, 82 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ba315e8d3b..7276bb75215 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,28 +7,28 @@ pkgbase = ros-melodic-stage-ros
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-sensor-msgs
- makedepends = ros-melodic-std-srvs
makedepends = ros-melodic-tf
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-geometry-msgs
- makedepends = ros-melodic-stage
+ makedepends = ros-melodic-std-msgs
makedepends = ros-melodic-rostest
+ makedepends = ros-melodic-stage
+ makedepends = ros-melodic-catkin
+ makedepends = ros-melodic-std-srvs
makedepends = ros-melodic-roscpp
makedepends = ros-melodic-nav-msgs
- makedepends = ros-melodic-std-msgs
+ makedepends = ros-melodic-sensor-msgs
+ makedepends = ros-melodic-geometry-msgs
makedepends = boost
- depends = ros-melodic-sensor-msgs
- depends = ros-melodic-std-srvs
depends = ros-melodic-tf
+ depends = ros-melodic-std-msgs
+ depends = ros-melodic-roscpp
depends = ros-melodic-stage
+ depends = ros-melodic-std-srvs
depends = ros-melodic-geometry-msgs
- depends = ros-melodic-roscpp
depends = ros-melodic-nav-msgs
- depends = ros-melodic-std-msgs
+ depends = ros-melodic-sensor-msgs
depends = boost
- source = ros-melodic-stage-ros::git+https://github.com/ros-gbp/stage_ros-release.git
- sha256sums = SKIP
+ source = ros-melodic-stage-ros-1.8.0-0.tar.gz::https://github.com/ros-gbp/stage_ros-release/archive/release/melodic/stage_ros/1.8.0-0.tar.gz
+ sha256sums = 5762c477b0401c12f43573895f7a94ec3bdfddc4aa9fe3a127d3acc1ce2960d8
pkgname = ros-melodic-stage-ros
diff --git a/PKGBUILD b/PKGBUILD
index 66f3658e722..9c05c120f10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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 - This package provides ROS specific hooks for stage."
url='http://ros.org/wiki/stage_ros'
@@ -10,83 +10,68 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(
- ros-melodic-sensor-msgs
- ros-melodic-std-srvs
- ros-melodic-tf
- ros-melodic-catkin
- ros-melodic-geometry-msgs
- ros-melodic-stage
- ros-melodic-rostest
- ros-melodic-roscpp
- ros-melodic-nav-msgs
- ros-melodic-std-msgs
-)
+ros_makedepends=(ros-melodic-tf
+ ros-melodic-std-msgs
+ ros-melodic-rostest
+ ros-melodic-stage
+ ros-melodic-catkin
+ ros-melodic-std-srvs
+ ros-melodic-roscpp
+ ros-melodic-nav-msgs
+ ros-melodic-sensor-msgs
+ ros-melodic-geometry-msgs)
+makedepends=('cmake' 'ros-build-tools'
+ ${ros_makedepends[@]}
+ boost)
-makedepends=(
- 'cmake'
- 'ros-build-tools'
- ${ros_makedepends[@]}
- boost
-)
+ros_depends=(ros-melodic-tf
+ ros-melodic-std-msgs
+ ros-melodic-roscpp
+ ros-melodic-stage
+ ros-melodic-std-srvs
+ ros-melodic-geometry-msgs
+ ros-melodic-nav-msgs
+ ros-melodic-sensor-msgs)
+depends=(${ros_depends[@]}
+ boost)
-ros_depends=(
- ros-melodic-sensor-msgs
- ros-melodic-std-srvs
- ros-melodic-tf
- ros-melodic-stage
- ros-melodic-geometry-msgs
- ros-melodic-roscpp
- ros-melodic-nav-msgs
- ros-melodic-std-msgs
-)
+# Git version (e.g. for debugging)
+# _tag=release/melodic/stage_ros/${pkgver}-${_pkgver_patch}
+# _dir=${pkgname}
+# source=("${_dir}"::"git+https://github.com/ros-gbp/stage_ros-release.git"#tag=${_tag})
+# sha256sums=('SKIP')
-depends=(
- ${ros_depends[@]}
- boost
-)
-
-_dir=${pkgname}
-source=("${_dir}"::"git+https://github.com/ros-gbp/stage_ros-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_ros-release-release-melodic-stage_ros-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/stage_ros-release/archive/release/melodic/stage_ros/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('5762c477b0401c12f43573895f7a94ec3bdfddc4aa9fe3a127d3acc1ce2960d8')
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
}