upd to noetic, cmake vars, python

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e1e59f96517..abdf177ff410 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-laser-geometry
+pkgbase = ros-noetic-laser-geometry
 	pkgdesc = ROS - This package contains a class for converting from a 2D laser scan as defined by sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud or sensor_msgs/PointCloud2.
 	pkgver = 1.6.4
 	pkgrel = 3
@@ -11,23 +11,23 @@ pkgbase = ros-melodic-laser-geometry
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-angles
-	makedepends = ros-melodic-cmake-modules
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-sensor-msgs
+	makedepends = ros-noetic-angles
+	makedepends = ros-noetic-cmake-modules
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-sensor-msgs
 	makedepends = boost
 	makedepends = eigen3
-	depends = ros-melodic-tf
-	depends = ros-melodic-angles
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-roscpp
+	depends = ros-noetic-tf
+	depends = ros-noetic-angles
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-roscpp
 	depends = boost
 	depends = eigen3
 	depends = python-numpy
-	source = ros-melodic-laser-geometry-1.6.4.tar.gz::https://github.com/ros-perception/laser_geometry/archive/1.6.4.tar.gz
+	source = ros-noetic-laser-geometry-1.6.4.tar.gz::https://github.com/ros-perception/laser_geometry/archive/1.6.4.tar.gz
 	sha256sums = 8daf8b8b571ca915d8ccbe517af5e6e69a2083a663c5ba4e89a29aa92a58abdb
 
-pkgname = ros-melodic-laser-geometry
+pkgname = ros-noetic-laser-geometry
 
diff --git a/PKGBUILD b/PKGBUILD
index 7c0f1dc27683..0d5afca3f16e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - This package contains a class for converting from a 2D laser scan as defined by sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud or sensor_msgs/PointCloud2."
 url='https://wiki.ros.org/laser_geometry'
 
-pkgname='ros-melodic-laser-geometry'
+pkgname='ros-noetic-laser-geometry'
 pkgver='1.6.4'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,12 +11,12 @@ pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-angles
-	ros-melodic-cmake-modules
-	ros-melodic-catkin
-	ros-melodic-tf
-	ros-melodic-roscpp
-	ros-melodic-sensor-msgs
+	ros-noetic-angles
+	ros-noetic-cmake-modules
+	ros-noetic-catkin
+	ros-noetic-tf
+	ros-noetic-roscpp
+	ros-noetic-sensor-msgs
 )
 
 makedepends=(
@@ -28,10 +28,10 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-tf
-	ros-melodic-angles
-	ros-melodic-sensor-msgs
-	ros-melodic-roscpp
+	ros-noetic-tf
+	ros-noetic-angles
+	ros-noetic-sensor-msgs
+	ros-noetic-roscpp
 )
 
 depends=(
@@ -48,21 +48,17 @@ sha256sums=('8daf8b8b571ca915d8ccbe517af5e6e69a2083a663c5ba4e89a29aa92a58abdb')
 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 the 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 the 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
 }