summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoracxz2020-05-24 12:04:30 -0400
committeracxz2020-05-24 12:04:30 -0400
commitcb0600dc34953e5da4b080d5ef17b0f3edc5194a (patch)
tree4e08173b0d7cc50ff0b22c45f11b4130570ff5fa
parenta50d517b4d7c755f410c5b1f6d48b43daf82c09f (diff)
downloadaur-cb0600dc34953e5da4b080d5ef17b0f3edc5194a.tar.gz
upd to noetic, cmake vars, python
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD25
2 files changed, 16 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e9ea32761c9f..35bc5ab442eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-perception-pcl
+pkgbase = ros-noetic-perception-pcl
pkgdesc = ROS - PCL (Point Cloud Library) ROS interface stack.
pkgver = 1.7.0
pkgrel = 1
@@ -7,12 +7,12 @@ pkgbase = ros-melodic-perception-pcl
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- depends = ros-melodic-pcl-conversions
- depends = ros-melodic-pcl-ros
- depends = ros-melodic-pcl-msgs
- source = ros-melodic-perception-pcl-1.7.0.tar.gz::https://github.com/ros-perception/perception_pcl/archive/1.7.0.tar.gz
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-pcl-conversions
+ depends = ros-noetic-pcl-ros
+ depends = ros-noetic-pcl-msgs
+ source = ros-noetic-perception-pcl-1.7.0.tar.gz::https://github.com/ros-perception/perception_pcl/archive/1.7.0.tar.gz
sha256sums = ac821a662e507df7e48cebc0ba02aaa360b8edbd43873fc6f63bc65ec3d12628
-pkgname = ros-melodic-perception-pcl
+pkgname = ros-noetic-perception-pcl
diff --git a/PKGBUILD b/PKGBUILD
index 3b014ee3090a..2fb842affe09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,24 @@
pkgdesc="ROS - PCL (Point Cloud Library) ROS interface stack."
url='https://wiki.ros.org/perception_pcl'
-pkgname='ros-melodic-perception-pcl'
+pkgname='ros-noetic-perception-pcl'
pkgver='1.7.0'
_pkgver_patch=0
arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-pcl-conversions
- ros-melodic-pcl-ros
- ros-melodic-pcl-msgs)
+ros_depends=(ros-noetic-pcl-conversions
+ ros-noetic-pcl-ros
+ ros-noetic-pcl-msgs)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
-# _tag=release/melodic/perception_pcl/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/perception_pcl/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-gbp/perception_pcl-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -33,24 +33,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 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
- -DPYTHON_BASENAME=.cpython-37m \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}