upd to noetic, cmake vars, python

2 files changed, 38 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75b94482eb91..4f72cf6d3e93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-openni2-camera
+pkgbase = ros-noetic-openni2-camera
 	pkgdesc = ROS - Drivers for the Asus Xtion and Primesense Devices.
 	pkgver = 0.4.2
 	pkgrel = 2
@@ -11,25 +11,25 @@ pkgbase = ros-melodic-openni2-camera
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-nodelet
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-camera-info-manager
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-image-transport
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-nodelet
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-camera-info-manager
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-image-transport
+	makedepends = ros-noetic-catkin
 	makedepends = openni2
-	depends = ros-melodic-nodelet
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-camera-info-manager
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-image-transport
+	depends = ros-noetic-nodelet
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-camera-info-manager
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-image-transport
 	depends = openni2
-	source = ros-melodic-openni2-camera-0.4.2.tar.gz::https://github.com/ros-drivers/openni2_camera/archive/0.4.2.tar.gz
+	source = ros-noetic-openni2-camera-0.4.2.tar.gz::https://github.com/ros-drivers/openni2_camera/archive/0.4.2.tar.gz
 	sha256sums = 98df75bef6d8865eab33ebeaec6b3bd098ca249b18c0e0459221483d51b0d2ca
 
-pkgname = ros-melodic-openni2-camera
+pkgname = ros-noetic-openni2-camera
 
diff --git a/PKGBUILD b/PKGBUILD
index e120d67e6732..ecaa8358bdc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,36 @@
 pkgdesc="ROS - Drivers for the Asus Xtion and Primesense Devices."
 url='https://wiki.ros.org/openni2_camera'
 
-pkgname='ros-melodic-openni2-camera'
+pkgname='ros-noetic-openni2-camera'
 pkgver='0.4.2'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-nodelet
-  ros-melodic-roscpp
-  ros-melodic-message-generation
-  ros-melodic-camera-info-manager
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-sensor-msgs
-  ros-melodic-image-transport
-  ros-melodic-catkin)
+ros_makedepends=(ros-noetic-nodelet
+  ros-noetic-roscpp
+  ros-noetic-message-generation
+  ros-noetic-camera-info-manager
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-sensor-msgs
+  ros-noetic-image-transport
+  ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   openni2)
 
-ros_depends=(ros-melodic-nodelet
-  ros-melodic-roscpp
-  ros-melodic-message-runtime
-  ros-melodic-camera-info-manager
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-sensor-msgs
-  ros-melodic-image-transport)
+ros_depends=(ros-noetic-nodelet
+  ros-noetic-roscpp
+  ros-noetic-message-runtime
+  ros-noetic-camera-info-manager
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-sensor-msgs
+  ros-noetic-image-transport)
 depends=(${ros_depends[@]}
   openni2)
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/openni2_camera/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/openni2_camera/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/openni2_camera-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -45,21 +45,17 @@ sha256sums=('98df75bef6d8865eab33ebeaec6b3bd098ca249b18c0e0459221483d51b0d2ca')
 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
 }