summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO54
-rw-r--r--PKGBUILD62
2 files changed, 56 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c7154db8d11..5a892dcdca2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-navfn
+pkgbase = ros-noetic-navfn
pkgdesc = ROS - navfn provides a fast interpolated navigation function that can be used to create plans for a mobile base.
pkgver = 1.16.2
pkgrel = 3
@@ -11,33 +11,33 @@ pkgbase = ros-melodic-navfn
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-nav-core
- makedepends = ros-melodic-pcl-ros
- makedepends = ros-melodic-roscpp
- makedepends = ros-melodic-geometry-msgs
- makedepends = ros-melodic-costmap-2d
- makedepends = ros-melodic-rosconsole
- makedepends = ros-melodic-pcl-conversions
- makedepends = ros-melodic-visualization-msgs
- makedepends = ros-melodic-catkin
- makedepends = ros-melodic-cmake-modules
- makedepends = ros-melodic-tf
- makedepends = ros-melodic-nav-msgs
- makedepends = ros-melodic-pluginlib
+ makedepends = ros-noetic-nav-core
+ makedepends = ros-noetic-pcl-ros
+ makedepends = ros-noetic-roscpp
+ makedepends = ros-noetic-geometry-msgs
+ makedepends = ros-noetic-costmap-2d
+ makedepends = ros-noetic-rosconsole
+ makedepends = ros-noetic-pcl-conversions
+ makedepends = ros-noetic-visualization-msgs
+ makedepends = ros-noetic-catkin
+ makedepends = ros-noetic-cmake-modules
+ makedepends = ros-noetic-tf
+ makedepends = ros-noetic-nav-msgs
+ makedepends = ros-noetic-pluginlib
makedepends = netpbm
- depends = ros-melodic-nav-core
- depends = ros-melodic-pcl-ros
- depends = ros-melodic-roscpp
- depends = ros-melodic-geometry-msgs
- depends = ros-melodic-costmap-2d
- depends = ros-melodic-rosconsole
- depends = ros-melodic-pcl-conversions
- depends = ros-melodic-visualization-msgs
- depends = ros-melodic-tf
- depends = ros-melodic-nav-msgs
- depends = ros-melodic-pluginlib
- source = ros-melodic-navfn-1.16.2.tar.gz::https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz
+ depends = ros-noetic-nav-core
+ depends = ros-noetic-pcl-ros
+ depends = ros-noetic-roscpp
+ depends = ros-noetic-geometry-msgs
+ depends = ros-noetic-costmap-2d
+ depends = ros-noetic-rosconsole
+ depends = ros-noetic-pcl-conversions
+ depends = ros-noetic-visualization-msgs
+ depends = ros-noetic-tf
+ depends = ros-noetic-nav-msgs
+ depends = ros-noetic-pluginlib
+ source = ros-noetic-navfn-1.16.2.tar.gz::https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz
sha256sums = d83201296e773e2789635fddf39ac18e9465219b18707e53bd2361de4762d205
-pkgname = ros-melodic-navfn
+pkgname = ros-noetic-navfn
diff --git a/PKGBUILD b/PKGBUILD
index 29af389ba74..bdb3b35c157 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,44 +2,44 @@
pkgdesc="ROS - navfn provides a fast interpolated navigation function that can be used to create plans for a mobile base."
url='https://wiki.ros.org/navfn'
-pkgname='ros-melodic-navfn'
+pkgname='ros-noetic-navfn'
pkgver='1.16.2'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgrel=3
license=('BSD')
-ros_makedepends=(ros-melodic-nav-core
- ros-melodic-pcl-ros
- ros-melodic-roscpp
- ros-melodic-geometry-msgs
- ros-melodic-costmap-2d
- ros-melodic-rosconsole
- ros-melodic-pcl-conversions
- ros-melodic-visualization-msgs
- ros-melodic-catkin
- ros-melodic-cmake-modules
- ros-melodic-tf
- ros-melodic-nav-msgs
- ros-melodic-pluginlib)
+ros_makedepends=(ros-noetic-nav-core
+ ros-noetic-pcl-ros
+ ros-noetic-roscpp
+ ros-noetic-geometry-msgs
+ ros-noetic-costmap-2d
+ ros-noetic-rosconsole
+ ros-noetic-pcl-conversions
+ ros-noetic-visualization-msgs
+ ros-noetic-catkin
+ ros-noetic-cmake-modules
+ ros-noetic-tf
+ ros-noetic-nav-msgs
+ ros-noetic-pluginlib)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]}
netpbm)
-ros_depends=(ros-melodic-nav-core
- ros-melodic-pcl-ros
- ros-melodic-roscpp
- ros-melodic-geometry-msgs
- ros-melodic-costmap-2d
- ros-melodic-rosconsole
- ros-melodic-pcl-conversions
- ros-melodic-visualization-msgs
- ros-melodic-tf
- ros-melodic-nav-msgs
- ros-melodic-pluginlib)
+ros_depends=(ros-noetic-nav-core
+ ros-noetic-pcl-ros
+ ros-noetic-roscpp
+ ros-noetic-geometry-msgs
+ ros-noetic-costmap-2d
+ ros-noetic-rosconsole
+ ros-noetic-pcl-conversions
+ ros-noetic-visualization-msgs
+ ros-noetic-tf
+ ros-noetic-nav-msgs
+ ros-noetic-pluginlib)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
-# _tag=release/melodic/navfn/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/navfn/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
# source=("${_dir}"::"git+https://github.com/ros-gbp/navigation-release.git"#tag=${_tag})
# sha256sums=('SKIP')
@@ -52,21 +52,17 @@ sha256sums=('d83201296e773e2789635fddf39ac18e9465219b18707e53bd2361de4762d205')
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
}