upd to noetic, cmake vars, python

2 files changed, 20 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 698984e183a4..d7ce1ae187e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-openni-launch
+pkgbase = ros-noetic-openni-launch
 	pkgdesc = ROS - Drivers for the Microsoft Kinect, Asus Xtion, and Primesense Devices.
 	pkgver = 1.11.1
 	pkgrel = 2
@@ -11,16 +11,16 @@ pkgbase = ros-melodic-openni-launch
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-nodelet
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-openni-camera
-	makedepends = ros-melodic-catkin
+	makedepends = ros-noetic-nodelet
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-openni-camera
+	makedepends = ros-noetic-catkin
 	makedepends = openni
-	depends = ros-melodic-nodelet
-	depends = ros-melodic-roscpp
+	depends = ros-noetic-nodelet
+	depends = ros-noetic-roscpp
 	depends = openni
-	source = ros-melodic-openni-launch-1.11.1.tar.gz::https://github.com/ros-drivers/openni_camera/archive/1.11.1.tar.gz
+	source = ros-noetic-openni-launch-1.11.1.tar.gz::https://github.com/ros-drivers/openni_camera/archive/1.11.1.tar.gz
 	sha256sums = 4dd0109628b5f8ed497ed11b35023ac82a9ecd3658469dc35b1a04f52ba14daf
 
-pkgname = ros-melodic-openni-launch
+pkgname = ros-noetic-openni-launch
 
diff --git a/PKGBUILD b/PKGBUILD
index d5a756775cc4..1141e8ab3c08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,27 @@
 pkgdesc="ROS - Drivers for the Microsoft Kinect, Asus Xtion, and Primesense Devices."
 url='https://www.wiki.ros.org/openni_launch'
 
-pkgname='ros-melodic-openni-launch'
+pkgname='ros-noetic-openni-launch'
 pkgver='1.11.1'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-nodelet
-  ros-melodic-roscpp
-	ros-melodic-openni-camera
-  ros-melodic-catkin)
+ros_makedepends=(ros-noetic-nodelet
+  ros-noetic-roscpp
+	ros-noetic-openni-camera
+  ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   openni)
 
-ros_depends=(ros-melodic-nodelet
-  ros-melodic-roscpp)
+ros_depends=(ros-noetic-nodelet
+  ros-noetic-roscpp)
 depends=(${ros_depends[@]}
   openni)
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/openni_camera/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/openni_camera/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-gbp/openni_camera-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -36,21 +36,17 @@ sha256sums=('4dd0109628b5f8ed497ed11b35023ac82a9ecd3658469dc35b1a04f52ba14daf')
 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
 }