upd to noetic, cmake vars, python

2 files changed, 43 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ee5c793428a..a4c8bc890bb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-image-proc
+pkgbase = ros-noetic-image-proc
 	pkgdesc = ROS - Single image rectification and color processing.
 	pkgver = 1.14.0
 	pkgrel = 2
@@ -11,27 +11,27 @@ pkgbase = ros-melodic-image-proc
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-image-geometry
-	makedepends = ros-melodic-nodelet
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-cv-bridge
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-nodelet-topic-tools
-	makedepends = ros-melodic-image-transport
+	makedepends = ros-noetic-image-geometry
+	makedepends = ros-noetic-nodelet
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-cv-bridge
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-nodelet-topic-tools
+	makedepends = ros-noetic-image-transport
 	makedepends = boost
-	depends = ros-melodic-image-geometry
-	depends = ros-melodic-nodelet
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-cv-bridge
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-nodelet-topic-tools
-	depends = ros-melodic-image-transport
-	depends = ros-melodic-rostest
-	source = ros-melodic-image-proc-1.14.0.tar.gz::https://github.com/ros-perception/image_pipeline/archive/1.14.0.tar.gz
+	depends = ros-noetic-image-geometry
+	depends = ros-noetic-nodelet
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-cv-bridge
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-nodelet-topic-tools
+	depends = ros-noetic-image-transport
+	depends = ros-noetic-rostest
+	source = ros-noetic-image-proc-1.14.0.tar.gz::https://github.com/ros-perception/image_pipeline/archive/1.14.0.tar.gz
 	sha256sums = dcf1336d43c0c03165b76c9419fb7b5a275d0b091e1890b28daf37a02c1326b3
 
-pkgname = ros-melodic-image-proc
+pkgname = ros-noetic-image-proc
 
diff --git a/PKGBUILD b/PKGBUILD
index a7b29559bed5..078182369af5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 pkgdesc="ROS - Single image rectification and color processing."
 url='https://wiki.ros.org/image_proc'
 
-pkgname='ros-melodic-image-proc'
+pkgname='ros-noetic-image-proc'
 pkgver='1.14.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=2
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-image-geometry
-	ros-melodic-nodelet
-	ros-melodic-dynamic-reconfigure
-	ros-melodic-catkin
-	ros-melodic-cv-bridge
-	ros-melodic-roscpp
-	ros-melodic-sensor-msgs
-	ros-melodic-nodelet-topic-tools
-	ros-melodic-image-transport
+	ros-noetic-image-geometry
+	ros-noetic-nodelet
+	ros-noetic-dynamic-reconfigure
+	ros-noetic-catkin
+	ros-noetic-cv-bridge
+	ros-noetic-roscpp
+	ros-noetic-sensor-msgs
+	ros-noetic-nodelet-topic-tools
+	ros-noetic-image-transport
 )
 
 makedepends=(
@@ -27,15 +27,15 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-image-geometry
-	ros-melodic-nodelet
-	ros-melodic-dynamic-reconfigure
-	ros-melodic-cv-bridge
-	ros-melodic-roscpp
-	ros-melodic-sensor-msgs
-	ros-melodic-nodelet-topic-tools
-	ros-melodic-image-transport
-	ros-melodic-rostest
+	ros-noetic-image-geometry
+	ros-noetic-nodelet
+	ros-noetic-dynamic-reconfigure
+	ros-noetic-cv-bridge
+	ros-noetic-roscpp
+	ros-noetic-sensor-msgs
+	ros-noetic-nodelet-topic-tools
+	ros-noetic-image-transport
+	ros-noetic-rostest
 )
 
 depends=(
@@ -49,21 +49,17 @@ sha256sums=('dcf1336d43c0c03165b76c9419fb7b5a275d0b091e1890b28daf37a02c1326b3')
 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
 }