upd to noetic, cmake vars, python

2 files changed, 105 insertions, 109 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c325fb17d36c..682dc9e8a947 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-gazebo-plugins
+pkgbase = ros-noetic-gazebo-plugins
 	pkgdesc = ROS - Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.
 	pkgver = 2.8.6
 	pkgrel = 1
@@ -11,57 +11,57 @@ pkgbase = ros-melodic-gazebo-plugins
 	license = BSD, Apache 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-diagnostic-updater
-	makedepends = ros-melodic-rosgraph-msgs
-	makedepends = ros-melodic-std-srvs
-	makedepends = ros-melodic-cv-bridge
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-gazebo-msgs
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-gazebo-dev
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-trajectory-msgs
-	makedepends = ros-melodic-nodelet
-	makedepends = ros-melodic-tf2-ros
-	makedepends = ros-melodic-urdf
-	makedepends = ros-melodic-nav-msgs
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-camera-info-manager
-	makedepends = ros-melodic-angles
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-polled-camera
-	makedepends = ros-melodic-image-transport
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-rospy
-	depends = ros-melodic-diagnostic-updater
-	depends = ros-melodic-rosgraph-msgs
-	depends = ros-melodic-std-srvs
-	depends = ros-melodic-cv-bridge
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-tf
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-gazebo-msgs
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-trajectory-msgs
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-nodelet
-	depends = ros-melodic-tf2-ros
-	depends = ros-melodic-urdf
-	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-camera-info-manager
-	depends = ros-melodic-angles
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-polled-camera
-	depends = ros-melodic-image-transport
-	depends = ros-melodic-gazebo-dev
-	depends = ros-melodic-rospy
-	source = ros-melodic-gazebo-plugins-2.8.6.tar.gz::https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.6.tar.gz
+	makedepends = ros-noetic-diagnostic-updater
+	makedepends = ros-noetic-rosgraph-msgs
+	makedepends = ros-noetic-std-srvs
+	makedepends = ros-noetic-cv-bridge
+	makedepends = ros-noetic-rosconsole
+	makedepends = ros-noetic-tf
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-gazebo-msgs
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-gazebo-dev
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-trajectory-msgs
+	makedepends = ros-noetic-nodelet
+	makedepends = ros-noetic-tf2-ros
+	makedepends = ros-noetic-urdf
+	makedepends = ros-noetic-nav-msgs
+	makedepends = ros-noetic-sensor-msgs
+	makedepends = ros-noetic-camera-info-manager
+	makedepends = ros-noetic-angles
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-polled-camera
+	makedepends = ros-noetic-image-transport
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-rospy
+	depends = ros-noetic-diagnostic-updater
+	depends = ros-noetic-rosgraph-msgs
+	depends = ros-noetic-std-srvs
+	depends = ros-noetic-cv-bridge
+	depends = ros-noetic-rosconsole
+	depends = ros-noetic-tf
+	depends = ros-noetic-std-msgs
+	depends = ros-noetic-gazebo-msgs
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-trajectory-msgs
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-nodelet
+	depends = ros-noetic-tf2-ros
+	depends = ros-noetic-urdf
+	depends = ros-noetic-nav-msgs
+	depends = ros-noetic-sensor-msgs
+	depends = ros-noetic-camera-info-manager
+	depends = ros-noetic-angles
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-polled-camera
+	depends = ros-noetic-image-transport
+	depends = ros-noetic-gazebo-dev
+	depends = ros-noetic-rospy
+	source = ros-noetic-gazebo-plugins-2.8.6.tar.gz::https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.6.tar.gz
 	sha256sums = df928fbeebd277b8eedf7eb367ab88631de71ef6c552424731eaf855186bc4b4
 
-pkgname = ros-melodic-gazebo-plugins
+pkgname = ros-noetic-gazebo-plugins
 
diff --git a/PKGBUILD b/PKGBUILD
index 73981b737980..c2e282b8f336 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,64 +3,64 @@
 pkgdesc="ROS - Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components."
 url='https://wiki.ros.org/gazebo_plugins'
 
-pkgname='ros-melodic-gazebo-plugins'
+pkgname='ros-noetic-gazebo-plugins'
 pkgver='2.8.6'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
 pkgrel=1
 license=('BSD, Apache 2.0')
 
-ros_makedepends=(ros-melodic-diagnostic-updater
-  ros-melodic-rosgraph-msgs
-  ros-melodic-std-srvs
-  ros-melodic-cv-bridge
-  ros-melodic-rosconsole
-  ros-melodic-tf
-  ros-melodic-std-msgs
-  ros-melodic-gazebo-msgs
-  ros-melodic-catkin
-  ros-melodic-gazebo-dev
-  ros-melodic-geometry-msgs
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-trajectory-msgs
-  ros-melodic-nodelet
-  ros-melodic-tf2-ros
-  ros-melodic-urdf
-  ros-melodic-nav-msgs
-  ros-melodic-sensor-msgs
-  ros-melodic-camera-info-manager
-  ros-melodic-angles
-  ros-melodic-roscpp
-  ros-melodic-polled-camera
-  ros-melodic-image-transport
-  ros-melodic-message-generation
-  ros-melodic-rospy)
+ros_makedepends=(ros-noetic-diagnostic-updater
+  ros-noetic-rosgraph-msgs
+  ros-noetic-std-srvs
+  ros-noetic-cv-bridge
+  ros-noetic-rosconsole
+  ros-noetic-tf
+  ros-noetic-std-msgs
+  ros-noetic-gazebo-msgs
+  ros-noetic-catkin
+  ros-noetic-gazebo-dev
+  ros-noetic-geometry-msgs
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-trajectory-msgs
+  ros-noetic-nodelet
+  ros-noetic-tf2-ros
+  ros-noetic-urdf
+  ros-noetic-nav-msgs
+  ros-noetic-sensor-msgs
+  ros-noetic-camera-info-manager
+  ros-noetic-angles
+  ros-noetic-roscpp
+  ros-noetic-polled-camera
+  ros-noetic-image-transport
+  ros-noetic-message-generation
+  ros-noetic-rospy)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-diagnostic-updater
-  ros-melodic-rosgraph-msgs
-  ros-melodic-std-srvs
-  ros-melodic-cv-bridge
-  ros-melodic-rosconsole
-  ros-melodic-tf
-  ros-melodic-std-msgs
-  ros-melodic-gazebo-msgs
-  ros-melodic-geometry-msgs
-  ros-melodic-trajectory-msgs
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-message-runtime
-  ros-melodic-nodelet
-  ros-melodic-tf2-ros
-  ros-melodic-urdf
-  ros-melodic-nav-msgs
-  ros-melodic-sensor-msgs
-  ros-melodic-camera-info-manager
-  ros-melodic-angles
-  ros-melodic-roscpp
-  ros-melodic-polled-camera
-  ros-melodic-image-transport
-  ros-melodic-gazebo-dev
-  ros-melodic-rospy)
+ros_depends=(ros-noetic-diagnostic-updater
+  ros-noetic-rosgraph-msgs
+  ros-noetic-std-srvs
+  ros-noetic-cv-bridge
+  ros-noetic-rosconsole
+  ros-noetic-tf
+  ros-noetic-std-msgs
+  ros-noetic-gazebo-msgs
+  ros-noetic-geometry-msgs
+  ros-noetic-trajectory-msgs
+  ros-noetic-dynamic-reconfigure
+  ros-noetic-message-runtime
+  ros-noetic-nodelet
+  ros-noetic-tf2-ros
+  ros-noetic-urdf
+  ros-noetic-nav-msgs
+  ros-noetic-sensor-msgs
+  ros-noetic-camera-info-manager
+  ros-noetic-angles
+  ros-noetic-roscpp
+  ros-noetic-polled-camera
+  ros-noetic-image-transport
+  ros-noetic-gazebo-dev
+  ros-noetic-rospy)
 depends=(${ros_depends[@]})
 
 _dir="gazebo_ros_pkgs-${pkgver}/gazebo_plugins"
@@ -70,21 +70,17 @@ sha256sums=('df928fbeebd277b8eedf7eb367ab88631de71ef6c552424731eaf855186bc4b4')
 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 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 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
 }