updated to work with noetic and OpenCv 4

1 files changed, 14 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7c5999813f8b..e4d8a55b3ab7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
-# Maintainer : okasha
+# Maintainer : ehmish
 pkgdesc="ROS - RTAB-Maps standalone library."
 url='http://introlab.github.io/rtabmap'
 
-pkgname='ros-melodic-rtabmap'
+pkgname='ros-noetic-rtabmap'
 pkgver='0.20.0'
 _pkgver_patch=1
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-octomap
-  ros-melodic-qt-gui-cpp
-  ros-melodic-cv-bridge)
+ros_makedepends=(ros-noetic-octomap
+  ros-noetic-qt-gui-cpp
+  ros-noetic-cv-bridge)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   sqlite
@@ -21,9 +21,9 @@ makedepends=('cmake' 'ros-build-tools'
   pcl
 )
 
-ros_depends=(ros-melodic-octomap
-  ros-melodic-qt-gui-cpp
-  ros-melodic-cv-bridge)
+ros_depends=(ros-noetic-octomap
+  ros-noetic-qt-gui-cpp
+  ros-noetic-cv-bridge)
 depends=(${ros_depends[@]}
   sqlite
   vtk
@@ -32,22 +32,22 @@ depends=(${ros_depends[@]}
   )
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/rtabmap/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/rtabmap/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/introlab/rtabmap-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
 
 # Tarball version (faster download)
-_dir="rtabmap-release-release-melodic-rtabmap-${pkgver}-${_pkgver_patch}"
-#_dir="rtabmap-release-release-melodic-rtabmap"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/introlab/rtabmap-release/archive/release/melodic/rtabmap/${pkgver}-${_pkgver_patch}.tar.gz")
+_dir="rtabmap-release-release-noetic-rtabmap-${pkgver}-${_pkgver_patch}"
+#_dir="rtabmap-release-release-noetic-rtabmap"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/introlab/rtabmap-release/archive/release/noetic/rtabmap/${pkgver}-${_pkgver_patch}.tar.gz")
 sha256sums=('c640fb6039912f68dc405143b6ef79e472b10575d498e3da04ac977891593d4a')
 
 
 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
@@ -60,7 +60,7 @@ build() {
   cmake ${srcdir}/${_dir} \
         -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
         -DPYTHON_EXECUTABLE=/usr/bin/python3 \
         -DPYTHON_LIBRARY=/usr/lib/libpython3.so \
         -DSETUPTOOLS_DEB_LAYOUT=OFF