diff options
| author | Benjamin Chrétien | 2015-08-26 20:12:23 +0900 |
|---|---|---|
| committer | Benjamin Chrétien | 2015-08-26 20:12:23 +0900 |
| commit | f7816993efa9ca68137cde7e35f7c1b61635ca4a (patch) | |
| tree | 4b95571eb6b27ce00d0e317ef47b7a20f67c175b | |
| parent | 791ddc0051c7d0a75719e3cd095107b14b0fd6f4 (diff) | |
| download | aur-ros-jade-pcl-ros.tar.gz | |
Update to version 1.3.0
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | eigen3.patch | 20 |
3 files changed, 41 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-jade-pcl-ros pkgdesc = ROS - PCL (Point Cloud Library) ROS interface stack. - pkgver = 1.2.6 - pkgrel = 2 + pkgver = 1.3.0 + pkgrel = 1 url = http://ros.org/wiki/perception_pcl arch = any license = BSD @@ -9,16 +9,19 @@ pkgbase = ros-jade-pcl-ros makedepends = git makedepends = ros-build-tools makedepends = ros-jade-pcl-msgs + makedepends = ros-jade-roslib makedepends = ros-jade-cmake-modules makedepends = ros-jade-dynamic-reconfigure makedepends = ros-jade-std-msgs makedepends = ros-jade-sensor-msgs + makedepends = ros-jade-genmsg makedepends = ros-jade-nodelet makedepends = ros-jade-roscpp makedepends = ros-jade-catkin makedepends = ros-jade-tf makedepends = ros-jade-nodelet-topic-tools makedepends = ros-jade-rosbag + makedepends = ros-jade-rosconsole makedepends = ros-jade-pluginlib makedepends = ros-jade-pcl-conversions makedepends = vtk @@ -39,8 +42,10 @@ pkgbase = ros-jade-pcl-ros depends = vtk depends = eigen3 depends = pcl - source = pcl_ros::git+https://github.com/ros-gbp/perception_pcl-release.git#tag=release/jade/pcl_ros/1.2.6-1 + source = pcl_ros::git+https://github.com/ros-gbp/perception_pcl-release.git#tag=release/jade/pcl_ros/1.3.0-0 + source = eigen3.patch md5sums = SKIP + md5sums = 88edcccaf4a04f30dd683ca304a90d82 pkgname = ros-jade-pcl-ros @@ -4,23 +4,26 @@ pkgdesc="ROS - PCL (Point Cloud Library) ROS interface stack." url='http://ros.org/wiki/perception_pcl' pkgname='ros-jade-pcl-ros' -pkgver='1.2.6' -_pkgver_patch=1 +pkgver='1.3.0' +_pkgver_patch=0 arch=('any') -pkgrel=2 +pkgrel=1 license=('BSD') ros_makedepends=(ros-jade-pcl-msgs + ros-jade-roslib ros-jade-cmake-modules ros-jade-dynamic-reconfigure ros-jade-std-msgs ros-jade-sensor-msgs + ros-jade-genmsg ros-jade-nodelet ros-jade-roscpp ros-jade-catkin ros-jade-tf ros-jade-nodelet-topic-tools ros-jade-rosbag + ros-jade-rosconsole ros-jade-pluginlib ros-jade-pcl-conversions) makedepends=('cmake' 'git' 'ros-build-tools' @@ -48,8 +51,10 @@ depends=(${ros_depends[@]} _tag=release/jade/pcl_ros/${pkgver}-${_pkgver_patch} _dir=pcl_ros -source=("${_dir}"::"git+https://github.com/ros-gbp/perception_pcl-release.git"#tag=${_tag}) -md5sums=('SKIP') +source=("${_dir}"::"git+https://github.com/ros-gbp/perception_pcl-release.git"#tag=${_tag} + "eigen3.patch") +md5sums=('SKIP' + '88edcccaf4a04f30dd683ca304a90d82') build() { # Use ROS environment variables @@ -60,6 +65,9 @@ build() { [ -d ${srcdir}/build ] || mkdir ${srcdir}/build cd ${srcdir}/build + # Apply patch + git -C ${srcdir}/${_dir} apply ${srcdir}/eigen3.patch + # Fix Python2/Python3 conflicts /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} diff --git a/eigen3.patch b/eigen3.patch new file mode 100644 index 000000000000..5ee2eaba59ea --- /dev/null +++ b/eigen3.patch @@ -0,0 +1,20 @@ +From 6e42c5511c5df5d8893a66761d76c36d8c3dcf62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= <chretien@lirmm.fr> +Date: Wed, 26 Aug 2015 20:00:47 +0900 +Subject: Use pkg-config rather than FindEigen3.cmake + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f11bd18..3acbc95 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,8 @@ project(pcl_ros) + ## Find system dependencies + find_package(cmake_modules REQUIRED) + find_package(Boost REQUIRED COMPONENTS system filesystem thread) +-find_package(Eigen3 REQUIRED) ++find_package(PkgConfig) ++pkg_search_module(Eigen3 REQUIRED eigen3) + find_package(PCL REQUIRED) + + ## Find catkin packages |