upd to noetic, cmake vars, python

2 files changed, 51 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c912a5f4e9a..47a0a2488e61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-image-view
+pkgbase = ros-noetic-image-view
 	pkgdesc = ROS - A simple viewer for ROS image topics.
 	pkgver = 1.13.0
 	pkgrel = 4
@@ -11,35 +11,35 @@ pkgbase = ros-melodic-image-view
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-std-srvs
-	makedepends = ros-melodic-nodelet
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-stereo-msgs
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-cv-bridge
-	makedepends = ros-melodic-camera-calibration-parsers
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-message-filters
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-image-transport
+	makedepends = ros-noetic-std-srvs
+	makedepends = ros-noetic-nodelet
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-stereo-msgs
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-cv-bridge
+	makedepends = ros-noetic-camera-calibration-parsers
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-message-filters
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-image-transport
 	makedepends = gtk2
-	depends = ros-melodic-std-srvs
-	depends = ros-melodic-nodelet
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-cv-bridge
-	depends = ros-melodic-camera-calibration-parsers
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-message-filters
-	depends = ros-melodic-image-transport
+	depends = ros-noetic-std-srvs
+	depends = ros-noetic-nodelet
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-cv-bridge
+	depends = ros-noetic-camera-calibration-parsers
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-message-filters
+	depends = ros-noetic-image-transport
 	depends = gtk2
 	depends = gtk3
-	source = ros-melodic-image-view-1.13.0.tar.gz::https://github.com/ros-perception/image_pipeline/archive/1.13.0.tar.gz
+	source = ros-noetic-image-view-1.13.0.tar.gz::https://github.com/ros-perception/image_pipeline/archive/1.13.0.tar.gz
 	source = CMakeLists.patch
 	sha256sums = 3c2309d421acf354ca69a7c814ceec7c8b24732c31a7f1c47a055aedd95cb1c4
 	sha256sums = 715e30310dec53eb3d19ef40fb40be48a01a10e3fc170c6ec857ddaa0cea8474
 
-pkgname = ros-melodic-image-view
+pkgname = ros-noetic-image-view
 
diff --git a/PKGBUILD b/PKGBUILD
index 687f674d50dc..a0c40219c452 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,26 @@
 pkgdesc="ROS - A simple viewer for ROS image topics."
 url='https://wiki.ros.org/image_view'
 
-pkgname='ros-melodic-image-view'
+pkgname='ros-noetic-image-view'
 pkgver='1.13.0'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=4
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-std-srvs
-	ros-melodic-nodelet
-	ros-melodic-dynamic-reconfigure
-	ros-melodic-stereo-msgs
-	ros-melodic-catkin
-	ros-melodic-cv-bridge
-	ros-melodic-camera-calibration-parsers
-	ros-melodic-message-generation
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-message-filters
-	ros-melodic-sensor-msgs
-	ros-melodic-image-transport
+	ros-noetic-std-srvs
+	ros-noetic-nodelet
+	ros-noetic-dynamic-reconfigure
+	ros-noetic-stereo-msgs
+	ros-noetic-catkin
+	ros-noetic-cv-bridge
+	ros-noetic-camera-calibration-parsers
+	ros-noetic-message-generation
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-message-filters
+	ros-noetic-sensor-msgs
+	ros-noetic-image-transport
 )
 
 makedepends=(
@@ -31,15 +31,15 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-std-srvs
-	ros-melodic-nodelet
-	ros-melodic-dynamic-reconfigure
-	ros-melodic-cv-bridge
-	ros-melodic-camera-calibration-parsers
-	ros-melodic-rosconsole
-	ros-melodic-roscpp
-	ros-melodic-message-filters
-	ros-melodic-image-transport
+	ros-noetic-std-srvs
+	ros-noetic-nodelet
+	ros-noetic-dynamic-reconfigure
+	ros-noetic-cv-bridge
+	ros-noetic-camera-calibration-parsers
+	ros-noetic-rosconsole
+	ros-noetic-roscpp
+	ros-noetic-message-filters
+	ros-noetic-image-transport
 )
 
 depends=(
@@ -62,21 +62,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
 }