upd to noetic, cmake vars, python

2 files changed, 9 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e464982a00a..63711d4d8051 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-octomap
+pkgbase = ros-noetic-octomap
 	pkgdesc = ROS - The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++.
 	pkgver = 1.9.0
 	pkgrel = 4
@@ -7,10 +7,10 @@ pkgbase = ros-melodic-octomap
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	depends = ros-melodic-catkin
+	depends = ros-noetic-catkin
 	options = staticlibs
-	source = ros-melodic-octomap-1.9.0.tar.gz::https://github.com/OctoMap/octomap/archive/v1.9.0.tar.gz
+	source = ros-noetic-octomap-1.9.0.tar.gz::https://github.com/OctoMap/octomap/archive/v1.9.0.tar.gz
 	sha256sums = 5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd
 
-pkgname = ros-melodic-octomap
+pkgname = ros-noetic-octomap
 
diff --git a/PKGBUILD b/PKGBUILD
index cc285ea3289c..59a55bf7dbb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++."
 url='https://octomaphub.io'
 
-pkgname='ros-melodic-octomap'
+pkgname='ros-noetic-octomap'
 pkgver='1.9.0'
 _pkgver_patch=1
 arch=('any')
@@ -15,11 +15,11 @@ ros_makedepends=()
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-catkin)
+ros_depends=(ros-noetic-catkin)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/octomap/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/octomap/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/octomap-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -32,24 +32,17 @@ sha256sums=('5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd')
 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 2 ${srcdir}/${_dir}
-
   # Build project
   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/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }