summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-26 13:32:43 +0200
committerGonçalo Camelo Neves Pereira2018-09-26 13:32:43 +0200
commit20f1031cf11a849d973c7d9c77c813e72c8d3924 (patch)
treeab4453543d93891354728ac58f6f12308fc8f628
parent5150b9aeef663f9d28b2414ebfde093b6ff98fb7 (diff)
downloadaur-20f1031cf11a849d973c7d9c77c813e72c8d3924.tar.gz
Update
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD107
2 files changed, 53 insertions, 68 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 531324b5a4e..d4bfbe103ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,18 +8,18 @@ pkgbase = ros-melodic-roslaunch
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-melodic-catkin
- depends = ros-melodic-rosclean
- depends = ros-melodic-rosmaster
+ depends = ros-melodic-rosunit
+ depends = ros-melodic-rosgraph-msgs
depends = ros-melodic-rosparam
depends = ros-melodic-roslib
- depends = ros-melodic-rosgraph-msgs
+ depends = ros-melodic-rosclean
+ depends = ros-melodic-rosmaster
depends = ros-melodic-rosout
- depends = ros-melodic-rosunit
- depends = python-yaml
depends = python-rospkg
depends = python-paramiko
- source = ros-melodic-roslaunch::git+https://github.com/ros-gbp/ros_comm-release.git
- sha256sums = SKIP
+ depends = python-yaml
+ source = ros-melodic-roslaunch-1.14.3-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roslaunch/1.14.3-0.tar.gz
+ sha256sums = 6332d21a5e4ba14d3cdc2d0a0492eb1ba63615e78c63dfbb828df59c93c87e63
pkgname = ros-melodic-roslaunch
diff --git a/PKGBUILD b/PKGBUILD
index b033d19df90..737ffb9ed66 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 - roslaunch is a tool for easily launching multiple ROS nodes locally and remotely via SSH, as well as setting parameters on the Parameter Server."
url='http://ros.org/wiki/roslaunch'
@@ -10,74 +10,59 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(
- ros-melodic-catkin
-)
+ros_makedepends=(ros-melodic-catkin)
+makedepends=('cmake' 'ros-build-tools'
+ ${ros_makedepends[@]})
-makedepends=(
- 'cmake'
- 'ros-build-tools'
- ${ros_makedepends[@]}
-)
+ros_depends=(ros-melodic-rosunit
+ ros-melodic-rosgraph-msgs
+ ros-melodic-rosparam
+ ros-melodic-roslib
+ ros-melodic-rosclean
+ ros-melodic-rosmaster
+ ros-melodic-rosout)
+depends=(${ros_depends[@]}
+ python-rospkg
+ python-paramiko
+ python-yaml)
-ros_depends=(
- ros-melodic-rosclean
- ros-melodic-rosmaster
- ros-melodic-rosparam
- ros-melodic-roslib
- ros-melodic-rosgraph-msgs
- ros-melodic-rosout
- ros-melodic-rosunit
-)
+# Git version (e.g. for debugging)
+# _tag=release/melodic/roslaunch/${pkgver}-${_pkgver_patch}
+# _dir=${pkgname}
+# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-release.git"#tag=${_tag})
+# sha256sums=('SKIP')
-depends=(
- ${ros_depends[@]}
- python-yaml
- python-rospkg
- python-paramiko
-)
-
-_dir=${pkgname}
-source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-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="ros_comm-release-release-melodic-roslaunch-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roslaunch/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('6332d21a5e4ba14d3cdc2d0a0492eb1ba63615e78c63dfbb828df59c93c87e63')
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
}