summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-26 13:29:17 +0200
committerGonçalo Camelo Neves Pereira2018-09-26 13:29:17 +0200
commit3100c89006c741d34fda9fe2ec9f43a8dee387f0 (patch)
tree364d4ddb13d0546f54bba472cad903e0313581a5
parent6574932d98c5783f70e9e96ba24e177e72772bcb (diff)
downloadaur-3100c89006c741d34fda9fe2ec9f43a8dee387f0.tar.gz
Update
-rw-r--r--.SRCINFO44
-rw-r--r--PKGBUILD153
2 files changed, 91 insertions, 106 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47cfefff1e0..81067c4859e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,42 +7,42 @@ pkgbase = ros-melodic-pcl-ros
license = BSD
makedepends = cmake
makedepends = ros-build-tools
+ makedepends = ros-melodic-rosconsole
+ makedepends = ros-melodic-pcl-conversions
makedepends = ros-melodic-nodelet-topic-tools
+ makedepends = ros-melodic-dynamic-reconfigure
+ makedepends = ros-melodic-std-msgs
+ makedepends = ros-melodic-tf2-eigen
makedepends = ros-melodic-message-filters
- makedepends = ros-melodic-sensor-msgs
- makedepends = ros-melodic-pluginlib
+ makedepends = ros-melodic-roscpp
makedepends = ros-melodic-tf
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-cmake-modules
- makedepends = ros-melodic-dynamic-reconfigure
makedepends = ros-melodic-roslib
- makedepends = ros-melodic-pcl-conversions
+ makedepends = ros-melodic-catkin
+ makedepends = ros-melodic-pluginlib
makedepends = ros-melodic-rosbag
- makedepends = ros-melodic-rosconsole
- makedepends = ros-melodic-roscpp
- makedepends = ros-melodic-tf2-eigen
- makedepends = ros-melodic-pcl-msgs
makedepends = ros-melodic-nodelet
- makedepends = ros-melodic-std-msgs
+ makedepends = ros-melodic-pcl-msgs
+ makedepends = ros-melodic-sensor-msgs
+ makedepends = ros-melodic-cmake-modules
makedepends = eigen3
makedepends = pcl
- depends = ros-melodic-nodelet-topic-tools
- depends = ros-melodic-message-filters
- depends = ros-melodic-sensor-msgs
- depends = ros-melodic-pluginlib
- depends = ros-melodic-tf
+ depends = ros-melodic-pcl-conversions
depends = ros-melodic-dynamic-reconfigure
+ depends = ros-melodic-std-msgs
+ depends = ros-melodic-tf2-eigen
depends = ros-melodic-nodelet
- depends = ros-melodic-rosbag
depends = ros-melodic-roscpp
- depends = ros-melodic-tf2-eigen
+ depends = ros-melodic-pluginlib
+ depends = ros-melodic-rosbag
+ depends = ros-melodic-nodelet-topic-tools
depends = ros-melodic-pcl-msgs
- depends = ros-melodic-pcl-conversions
- depends = ros-melodic-std-msgs
+ depends = ros-melodic-message-filters
+ depends = ros-melodic-sensor-msgs
+ depends = ros-melodic-tf
depends = eigen3
depends = pcl
- source = ros-melodic-pcl-ros::git+https://github.com/ros-gbp/perception_pcl-release.git
- sha256sums = SKIP
+ source = ros-melodic-pcl-ros-1.6.2-0.tar.gz::https://github.com/ros-gbp/perception_pcl-release/archive/release/melodic/pcl_ros/1.6.2-0.tar.gz
+ sha256sums = deb1b59fcc5f3f9247e9fa90e7f5bde35d22668aa13a9300a4d6d3315552215e
pkgname = ros-melodic-pcl-ros
diff --git a/PKGBUILD b/PKGBUILD
index 39b46bba57c..4f258924008 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 - PCL (Point Cloud Library) ROS interface stack."
url='http://ros.org/wiki/perception_pcl'
@@ -10,97 +10,82 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(
- ros-melodic-nodelet-topic-tools
- ros-melodic-message-filters
- ros-melodic-sensor-msgs
- ros-melodic-pluginlib
- ros-melodic-tf
- ros-melodic-catkin
- ros-melodic-cmake-modules
- ros-melodic-dynamic-reconfigure
- ros-melodic-roslib
- ros-melodic-pcl-conversions
- ros-melodic-rosbag
- ros-melodic-rosconsole
- ros-melodic-roscpp
- ros-melodic-tf2-eigen
- ros-melodic-pcl-msgs
- ros-melodic-nodelet
- ros-melodic-std-msgs
-)
+ros_makedepends=(ros-melodic-rosconsole
+ ros-melodic-pcl-conversions
+ ros-melodic-nodelet-topic-tools
+ ros-melodic-dynamic-reconfigure
+ ros-melodic-std-msgs
+ ros-melodic-tf2-eigen
+ ros-melodic-message-filters
+ ros-melodic-roscpp
+ ros-melodic-tf
+ ros-melodic-roslib
+ ros-melodic-catkin
+ ros-melodic-pluginlib
+ ros-melodic-rosbag
+ ros-melodic-nodelet
+ ros-melodic-pcl-msgs
+ ros-melodic-sensor-msgs
+ ros-melodic-cmake-modules)
+makedepends=('cmake' 'ros-build-tools'
+ ${ros_makedepends[@]}
+ eigen3
+ pcl)
-makedepends=(
- 'cmake'
- 'ros-build-tools'
- ${ros_makedepends[@]}
- eigen3
- pcl
-)
+ros_depends=(ros-melodic-pcl-conversions
+ ros-melodic-dynamic-reconfigure
+ ros-melodic-std-msgs
+ ros-melodic-tf2-eigen
+ ros-melodic-nodelet
+ ros-melodic-roscpp
+ ros-melodic-pluginlib
+ ros-melodic-rosbag
+ ros-melodic-nodelet-topic-tools
+ ros-melodic-pcl-msgs
+ ros-melodic-message-filters
+ ros-melodic-sensor-msgs
+ ros-melodic-tf)
+depends=(${ros_depends[@]}
+ eigen3
+ pcl)
-ros_depends=(
- ros-melodic-nodelet-topic-tools
- ros-melodic-message-filters
- ros-melodic-sensor-msgs
- ros-melodic-pluginlib
- ros-melodic-tf
- ros-melodic-dynamic-reconfigure
- ros-melodic-nodelet
- ros-melodic-rosbag
- ros-melodic-roscpp
- ros-melodic-tf2-eigen
- ros-melodic-pcl-msgs
- ros-melodic-pcl-conversions
- ros-melodic-std-msgs
-)
+# Git version (e.g. for debugging)
+# _tag=release/melodic/pcl_ros/${pkgver}-${_pkgver_patch}
+# _dir=${pkgname}
+# source=("${_dir}"::"git+https://github.com/ros-gbp/perception_pcl-release.git"#tag=${_tag})
+# sha256sums=('SKIP')
-depends=(
- ${ros_depends[@]}
- eigen3
- pcl
-)
-
-_dir=${pkgname}
-source=("${_dir}"::"git+https://github.com/ros-gbp/perception_pcl-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="perception_pcl-release-release-melodic-pcl_ros-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/perception_pcl-release/archive/release/melodic/pcl_ros/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('deb1b59fcc5f3f9247e9fa90e7f5bde35d22668aa13a9300a4d6d3315552215e')
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
}