upd to noetic, cmake vars, python

1 files changed, 22 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 50ceacedb40b..a64691bb857a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,34 @@
 pkgdesc="ROS - wrapper for libviso2"
 url='https://www.wiki.ros.org/viso2'
 
-pkgname='ros-melodic-viso2-ros'
+pkgname='ros-noetic-viso2-ros'
 pkgver='0.0.1'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('GPL')
 
-ros_makedepends=(ros-melodic-libviso2
-  ros-melodic-roscpp
-  ros-melodic-rostime
-  ros-melodic-rosconsole
-  ros-melodic-cv-bridge
-  ros-melodic-image-geometry
-  ros-melodic-tf
-  ros-melodic-image-transport
-  ros-melodic-message-filters)
+ros_makedepends=(ros-noetic-libviso2
+  ros-noetic-roscpp
+  ros-noetic-rostime
+  ros-noetic-rosconsole
+  ros-noetic-cv-bridge
+  ros-noetic-image-geometry
+  ros-noetic-tf
+  ros-noetic-image-transport
+  ros-noetic-message-filters)
 makedepends=('cmake' 'ros-build-tools' 'boost-libs' 'opencv'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-libviso2
-  ros-melodic-roscpp
-  ros-melodic-rostime
-  ros-melodic-rosconsole
-  ros-melodic-cv-bridge
-  ros-melodic-image-geometry
-  ros-melodic-tf
-  ros-melodic-image-transport
-  ros-melodic-message-filters)
+ros_depends=(ros-noetic-libviso2
+  ros-noetic-roscpp
+  ros-noetic-rostime
+  ros-noetic-rosconsole
+  ros-noetic-cv-bridge
+  ros-noetic-image-geometry
+  ros-noetic-tf
+  ros-noetic-image-transport
+  ros-noetic-message-filters)
 depends=('cmake' 'ros-build-tools' 'boost-libs' 'opencv'
   ${ros_depends[@]})
 
@@ -47,21 +47,17 @@ prepare() {
 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
 }