upd to noetic, cmake vars, python

1 files changed, 35 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c4710686eef6..3d3b1cb78bcd 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
 }