upd to noetic, cmake vars, python

2 files changed, 27 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0ba8db63a5c..b5ef94161845 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-tf-conversions
+pkgbase = ros-noetic-tf-conversions
 	pkgdesc = ROS - This package contains a set of conversion functions to convert common tf datatypes (point, vector, pose, etc) into semantically identical datatypes used by other libraries.
 	pkgver = 1.12.0
 	pkgrel = 2
@@ -7,20 +7,20 @@ pkgbase = ros-melodic-tf-conversions
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-kdl-conversions
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-orocos-kdl
-	makedepends = ros-melodic-geometry-msgs
+	makedepends = ros-noetic-kdl-conversions
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-orocos-kdl
+	makedepends = ros-noetic-geometry-msgs
 	makedepends = eigen3
-	depends = ros-melodic-kdl-conversions
-	depends = ros-melodic-python-orocos-kdl
-	depends = ros-melodic-tf
-	depends = ros-melodic-orocos-kdl
-	depends = ros-melodic-geometry-msgs
+	depends = ros-noetic-kdl-conversions
+	depends = ros-noetic-python-orocos-kdl
+	depends = ros-noetic-tf
+	depends = ros-noetic-orocos-kdl
+	depends = ros-noetic-geometry-msgs
 	depends = eigen3
-	source = ros-melodic-tf-conversions-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz
+	source = ros-noetic-tf-conversions-1.12.0.tar.gz::https://github.com/ros/geometry/archive/1.12.0.tar.gz
 	sha256sums = 61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4
 
-pkgname = ros-melodic-tf-conversions
+pkgname = ros-noetic-tf-conversions
 
diff --git a/PKGBUILD b/PKGBUILD
index b94cdd4480a4..4e97b8723865 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS - This package contains a set of conversion functions to convert common tf datatypes (point, vector, pose, etc) into semantically identical datatypes used by other libraries."
 url='https://wiki.ros.org/tf_conversions'
 
-pkgname='ros-melodic-tf-conversions'
+pkgname='ros-noetic-tf-conversions'
 pkgver='1.12.0'
 _pkgver_patch=0
 arch=('any')
@@ -11,11 +11,11 @@ pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-kdl-conversions
-	ros-melodic-catkin
-	ros-melodic-tf
-	ros-melodic-orocos-kdl
-	ros-melodic-geometry-msgs
+	ros-noetic-kdl-conversions
+	ros-noetic-catkin
+	ros-noetic-tf
+	ros-noetic-orocos-kdl
+	ros-noetic-geometry-msgs
 )
 
 makedepends=(
@@ -26,11 +26,11 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-kdl-conversions
-	ros-melodic-python-orocos-kdl
-	ros-melodic-tf
-	ros-melodic-orocos-kdl
-	ros-melodic-geometry-msgs
+	ros-noetic-kdl-conversions
+	ros-noetic-python-orocos-kdl
+	ros-noetic-tf
+	ros-noetic-orocos-kdl
+	ros-noetic-geometry-msgs
 )
 
 depends=(
@@ -45,24 +45,17 @@ sha256sums=('61a278bdd50e00ea442055d9f70eaf82b5a36916739edca188fa1b71a59507b4')
 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 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }