upd to noetic, cmake vars, python

2 files changed, 37 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c241c8e04e21..966c9256a0f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-image-publisher
+pkgbase = ros-noetic-image-publisher
 	pkgdesc = ROS - Contains a node publish an image stream from single image file or avi motion file.
 	pkgver = 1.12.23
 	pkgrel = 3
@@ -11,23 +11,23 @@ pkgbase = ros-melodic-image-publisher
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-nodelet
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-cv-bridge
-	makedepends = ros-melodic-camera-info-manager
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-image-transport
-	depends = ros-melodic-nodelet
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-cv-bridge
-	depends = ros-melodic-camera-info-manager
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-image-transport
-	source = ros-melodic-image-publisher-1.12.23.tar.gz::https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz
+	makedepends = ros-noetic-nodelet
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-cv-bridge
+	makedepends = ros-noetic-camera-info-manager
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-image-transport
+	depends = ros-noetic-nodelet
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-cv-bridge
+	depends = ros-noetic-camera-info-manager
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-image-transport
+	source = ros-noetic-image-publisher-1.12.23.tar.gz::https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz
 	sha256sums = 0b024f155f79f16982b31951ad0b1bde5440159b0ba6b1128ecbe2e867a2e357
 
-pkgname = ros-melodic-image-publisher
+pkgname = ros-noetic-image-publisher
 
diff --git a/PKGBUILD b/PKGBUILD
index 1c3ed8cf7d0f..701ca201ca12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgdesc="ROS -  Contains a node publish an image stream from single image file or avi motion file."
 url='https://wiki.ros.org/image_publisher'
 
-pkgname='ros-melodic-image-publisher'
+pkgname='ros-noetic-image-publisher'
 pkgver='1.12.23'
 _pkgver_patch=0
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
@@ -11,14 +11,14 @@ pkgrel=3
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-nodelet
-	ros-melodic-dynamic-reconfigure
-	ros-melodic-catkin
-	ros-melodic-cv-bridge
-	ros-melodic-camera-info-manager
-	ros-melodic-roscpp
-	ros-melodic-sensor-msgs
-	ros-melodic-image-transport
+	ros-noetic-nodelet
+	ros-noetic-dynamic-reconfigure
+	ros-noetic-catkin
+	ros-noetic-cv-bridge
+	ros-noetic-camera-info-manager
+	ros-noetic-roscpp
+	ros-noetic-sensor-msgs
+	ros-noetic-image-transport
 )
 
 makedepends=(
@@ -28,13 +28,13 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-nodelet
-	ros-melodic-dynamic-reconfigure
-	ros-melodic-cv-bridge
-	ros-melodic-camera-info-manager
-	ros-melodic-roscpp
-	ros-melodic-sensor-msgs
-	ros-melodic-image-transport
+	ros-noetic-nodelet
+	ros-noetic-dynamic-reconfigure
+	ros-noetic-cv-bridge
+	ros-noetic-camera-info-manager
+	ros-noetic-roscpp
+	ros-noetic-sensor-msgs
+	ros-noetic-image-transport
 )
 
 depends=(
@@ -48,21 +48,17 @@ sha256sums=('0b024f155f79f16982b31951ad0b1bde5440159b0ba6b1128ecbe2e867a2e357')
 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
 }