upd to noetic, cmake vars, python

2 files changed, 47 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60cb8bc72f48..87894514efc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-tf
+pkgbase = ros-noetic-tf
 	pkgdesc = ROS - tf is a package that lets the user keep track of multiple coordinate frames over time.
 	pkgver = 1.12.0
 	pkgrel = 3
@@ -11,31 +11,31 @@ pkgbase = ros-melodic-tf
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-angles
-	makedepends = ros-melodic-rostime
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-tf2-ros
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-message-filters
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-geometry-msgs
-	depends = ros-melodic-roswtf
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-tf2-ros
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-message-filters
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-geometry-msgs
+	makedepends = ros-noetic-angles
+	makedepends = ros-noetic-rostime
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-tf2-ros
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-message-filters
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-geometry-msgs
+	depends = ros-noetic-roswtf
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-tf2-ros
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-message-filters
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-geometry-msgs
 	depends = graphviz
-	source = ros-melodic-tf-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz
+	source = ros-noetic-tf-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz
 	source = CMakeLists-signal.patch
 	sha256sums = 61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4
 	sha256sums = ab139685eaa571c7e1b3ef527bb9ef367ba05ab7f859602a5d6ed59359459e2d
 
-pkgname = ros-melodic-tf
+pkgname = ros-noetic-tf
 
diff --git a/PKGBUILD b/PKGBUILD
index 88e5c5294674..8b7b5615d557 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,24 @@
 pkgdesc="ROS - tf is a package that lets the user keep track of multiple coordinate frames over time."
 url='https://github.com/ros/geometry'
 
-pkgname='ros-melodic-tf'
+pkgname='ros-noetic-tf'
 pkgver='1.12.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-angles
-	ros-melodic-rostime
-	ros-melodic-catkin
-	ros-melodic-message-generation
-	ros-melodic-std-msgs
-	ros-melodic-tf2-ros
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-message-filters
-	ros-melodic-sensor-msgs
-	ros-melodic-geometry-msgs
+	ros-noetic-angles
+	ros-noetic-rostime
+	ros-noetic-catkin
+	ros-noetic-message-generation
+	ros-noetic-std-msgs
+	ros-noetic-tf2-ros
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-message-filters
+	ros-noetic-sensor-msgs
+	ros-noetic-geometry-msgs
 )
 
 makedepends=(
@@ -30,15 +30,15 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-roswtf
-	ros-melodic-message-runtime
-	ros-melodic-std-msgs
-	ros-melodic-tf2-ros
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-message-filters
-	ros-melodic-sensor-msgs
-	ros-melodic-geometry-msgs
+	ros-noetic-roswtf
+	ros-noetic-message-runtime
+	ros-noetic-std-msgs
+	ros-noetic-tf2-ros
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-message-filters
+	ros-noetic-sensor-msgs
+	ros-noetic-geometry-msgs
 )
 
 depends=(
@@ -60,21 +60,17 @@ prepare() {
 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
 }