summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 12:04:15 -0400
committeracxz2020-05-24 12:04:15 -0400
commit11730a4197998d90bfac94bd0470741751745fb6 (patch)
tree68bf95ff19a1ba182840a4df7c65f85addecdb46
parent6f6ff4e195c4709a509b3d5f25efb8bad85c37c6 (diff)
downloadaur-11730a4197998d90bfac94bd0470741751745fb6.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO66
-rw-r--r--PKGBUILD74
2 files changed, 68 insertions, 72 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1df18942da5..15f2129f945 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-pcl-ros
+pkgbase = ros-noetic-pcl-ros
pkgdesc = ROS - PCL (Point Cloud Library) ROS interface stack.
pkgver = 1.7.0
pkgrel = 2
@@ -11,42 +11,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-roscpp
- makedepends = ros-melodic-tf
- makedepends = ros-melodic-roslib
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-pluginlib
- makedepends = ros-melodic-rosbag
- makedepends = ros-melodic-nodelet
- makedepends = ros-melodic-pcl-msgs
- makedepends = ros-melodic-sensor-msgs
- makedepends = ros-melodic-cmake-modules
+ makedepends = ros-noetic-rosconsole
+ makedepends = ros-noetic-pcl-conversions
+ makedepends = ros-noetic-nodelet-topic-tools
+ makedepends = ros-noetic-dynamic-reconfigure
+ makedepends = ros-noetic-std-msgs
+ makedepends = ros-noetic-tf2-eigen
+ makedepends = ros-noetic-message-filters
+ makedepends = ros-noetic-roscpp
+ makedepends = ros-noetic-tf
+ makedepends = ros-noetic-roslib
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-pluginlib
+ makedepends = ros-noetic-rosbag
+ makedepends = ros-noetic-nodelet
+ makedepends = ros-noetic-pcl-msgs
+ makedepends = ros-noetic-sensor-msgs
+ makedepends = ros-noetic-cmake-modules
makedepends = eigen3
makedepends = pcl
- 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-roscpp
- depends = ros-melodic-pluginlib
- depends = ros-melodic-rosbag
- depends = ros-melodic-nodelet-topic-tools
- depends = ros-melodic-pcl-msgs
- depends = ros-melodic-message-filters
- depends = ros-melodic-sensor-msgs
- depends = ros-melodic-tf
+ depends = ros-noetic-pcl-conversions
+ depends = ros-noetic-dynamic-reconfigure
+ depends = ros-noetic-std-msgs
+ depends = ros-noetic-tf2-eigen
+ depends = ros-noetic-nodelet
+ depends = ros-noetic-roscpp
+ depends = ros-noetic-pluginlib
+ depends = ros-noetic-rosbag
+ depends = ros-noetic-nodelet-topic-tools
+ depends = ros-noetic-pcl-msgs
+ depends = ros-noetic-message-filters
+ depends = ros-noetic-sensor-msgs
+ depends = ros-noetic-tf
depends = eigen3
depends = pcl
- source = ros-melodic-pcl-ros-1.7.0.tar.gz::https://github.com/ros-perception/perception_pcl/archive/1.7.0.tar.gz
+ source = ros-noetic-pcl-ros-1.7.0.tar.gz::https://github.com/ros-perception/perception_pcl/archive/1.7.0.tar.gz
sha256sums = ac821a662e507df7e48cebc0ba02aaa360b8edbd43873fc6f63bc65ec3d12628
-pkgname = ros-melodic-pcl-ros
+pkgname = ros-noetic-pcl-ros
diff --git a/PKGBUILD b/PKGBUILD
index c4710686eef..3d3b1cb78bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,54 +3,54 @@
pkgdesc="ROS - PCL (Point Cloud Library) ROS interface stack."
url='https://wiki.ros.org/perception_pcl'
-pkgname='ros-melodic-pcl-ros'
+pkgname='ros-noetic-pcl-ros'
pkgver='1.7.0'
_pkgver_patch=0
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=2
license=('BSD')
-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)
+ros_makedepends=(ros-noetic-rosconsole
+ ros-noetic-pcl-conversions
+ ros-noetic-nodelet-topic-tools
+ ros-noetic-dynamic-reconfigure
+ ros-noetic-std-msgs
+ ros-noetic-tf2-eigen
+ ros-noetic-message-filters
+ ros-noetic-roscpp
+ ros-noetic-tf
+ ros-noetic-roslib
+ ros-noetic-catkin
+ ros-noetic-pluginlib
+ ros-noetic-rosbag
+ ros-noetic-nodelet
+ ros-noetic-pcl-msgs
+ ros-noetic-sensor-msgs
+ ros-noetic-cmake-modules)
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)
+ros_depends=(ros-noetic-pcl-conversions
+ ros-noetic-dynamic-reconfigure
+ ros-noetic-std-msgs
+ ros-noetic-tf2-eigen
+ ros-noetic-nodelet
+ ros-noetic-roscpp
+ ros-noetic-pluginlib
+ ros-noetic-rosbag
+ ros-noetic-nodelet-topic-tools
+ ros-noetic-pcl-msgs
+ ros-noetic-message-filters
+ ros-noetic-sensor-msgs
+ ros-noetic-tf)
depends=(${ros_depends[@]}
eigen3
pcl)
# Git version (e.g. for debugging)
-# _tag=release/melodic/pcl_ros/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/pcl_ros/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-gbp/perception_pcl-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -63,21 +63,17 @@ sha256sums=('ac821a662e507df7e48cebc0ba02aaa360b8edbd43873fc6f63bc65ec3d12628')
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
+ [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
# 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}
-
# 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 \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}