upd to noetic, cmake vars, python

2 files changed, 24 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 776822677c72..4ea4d78ab1e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-rgbd-launch
+pkgbase = ros-noetic-rgbd-launch
 	pkgdesc = ROS - Launch files to open an RGBD device and load all nodelets to convert raw depth/RGB/IR streams to depth images, disparity images, and (registered) point clouds.
 	pkgver = 2.2.2
 	pkgrel = 3
@@ -7,17 +7,17 @@ pkgbase = ros-melodic-rgbd-launch
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-image-proc
-	makedepends = ros-melodic-depth-image-proc
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf2-ros
-	makedepends = ros-melodic-nodelet
-	depends = ros-melodic-image-proc
-	depends = ros-melodic-depth-image-proc
-	depends = ros-melodic-tf2-ros
-	depends = ros-melodic-nodelet
-	source = ros-melodic-rgbd-launch-2.2.2.tar.gz::https://github.com/ros-drivers/rgbd_launch/archive/2.2.2.tar.gz
+	makedepends = ros-noetic-image-proc
+	makedepends = ros-noetic-depth-image-proc
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-tf2-ros
+	makedepends = ros-noetic-nodelet
+	depends = ros-noetic-image-proc
+	depends = ros-noetic-depth-image-proc
+	depends = ros-noetic-tf2-ros
+	depends = ros-noetic-nodelet
+	source = ros-noetic-rgbd-launch-2.2.2.tar.gz::https://github.com/ros-drivers/rgbd_launch/archive/2.2.2.tar.gz
 	sha256sums = 2e4bebe8e9f2d9e23f6e0678f6e0f594cd3616f3db0724075bde7219637e6baa
 
-pkgname = ros-melodic-rgbd-launch
+pkgname = ros-noetic-rgbd-launch
 
diff --git a/PKGBUILD b/PKGBUILD
index 74f587021a99..8ad0e1a0255a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,24 @@
 pkgdesc="ROS - Launch files to open an RGBD device and load all nodelets to convert raw depth/RGB/IR streams to depth images, disparity images, and (registered) point clouds."
 url='https://wiki.ros.org/rgbd_launch'
 
-pkgname='ros-melodic-rgbd-launch'
+pkgname='ros-noetic-rgbd-launch'
 pkgver='2.2.2'
 arch=('any')
 pkgrel=3
 license=('BSD')
 
-ros_makedepends=(ros-melodic-image-proc
-  ros-melodic-depth-image-proc
-  ros-melodic-catkin
-  ros-melodic-tf2-ros
-  ros-melodic-nodelet)
+ros_makedepends=(ros-noetic-image-proc
+  ros-noetic-depth-image-proc
+  ros-noetic-catkin
+  ros-noetic-tf2-ros
+  ros-noetic-nodelet)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-image-proc
-  ros-melodic-depth-image-proc
-  ros-melodic-tf2-ros
-  ros-melodic-nodelet)
+ros_depends=(ros-noetic-image-proc
+  ros-noetic-depth-image-proc
+  ros-noetic-tf2-ros
+  ros-noetic-nodelet)
 depends=(${ros_depends[@]})
 
 _dir="rgbd_launch-${pkgver}"
@@ -30,24 +30,17 @@ sha256sums=('2e4bebe8e9f2d9e23f6e0678f6e0f594cd3616f3db0724075bde7219637e6baa')
 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/python \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }