create ros-noetic-amcl package

2 files changed, 71 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4045c148dc1c..e20cb0592120 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-amcl
+pkgbase = ros-noetic-amcl
 	pkgdesc = ROS - amcl is a probabilistic localization system for a robot moving in 2D.
-	pkgver = 1.16.6
-	pkgrel = 4
+	pkgver = 1.17.1
+	pkgrel = 1
 	url = https://wiki.ros.org/amcl
 	arch = i686
 	arch = x86_64
@@ -11,30 +11,30 @@ pkgbase = ros-melodic-amcl
 	license = LGPL
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-message-filters
-	makedepends = ros-melodic-nav-msgs
-	makedepends = ros-melodic-rosbag
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-std-srvs
-	makedepends = ros-melodic-tf2
-	makedepends = ros-melodic-tf2-geometry-msgs
-	makedepends = ros-melodic-tf2-msgs
-	makedepends = ros-melodic-tf2-ros
-	makedepends = ros-melodic-sensor-msgs
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-rosbag
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-std-srvs
-	depends = ros-melodic-tf2
-	depends = ros-melodic-tf2-msgs
-	depends = ros-melodic-tf2-ros
-	source = ros-melodic-amcl-1.16.6.tar.gz::https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz
-	sha256sums = 88e3b4433de9645e1132db15b01f436a75a28ebc15cd5b70660b158dd6ba42dd
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-dynamic-reconfigure
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-message-filters
+	makedepends = ros-noetic-nav-msgs
+	makedepends = ros-noetic-rosbag
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-std-srvs
+	makedepends = ros-noetic-tf2
+	makedepends = ros-noetic-tf2-geometry-msgs
+	makedepends = ros-noetic-tf2-msgs
+	makedepends = ros-noetic-tf2-ros
+	makedepends = ros-noetic-sensor-msgs
+	depends = ros-noetic-dynamic-reconfigure
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-nav-msgs
+	depends = ros-noetic-rosbag
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-std-srvs
+	depends = ros-noetic-tf2
+	depends = ros-noetic-tf2-msgs
+	depends = ros-noetic-tf2-ros
+	source = ros-noetic-amcl-1.17.1.tar.gz::https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz
+	sha256sums = 50e1fb4a0beb190202e9730180464b76b3a481cae2665e0f1944eb908929148e
 
-pkgname = ros-melodic-amcl
+pkgname = ros-noetic-amcl
 
diff --git a/PKGBUILD b/PKGBUILD
index ac56b4c8c892..7ffec75e4e57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,68 @@
-# Maintainer: Oskar Roesler <oskar@oskar-roesler.de>
 pkgdesc="ROS - amcl is a probabilistic localization system for a robot moving in 2D."
 url='https://wiki.ros.org/amcl'
 
-pkgname='ros-melodic-amcl'
-pkgver='1.16.6'
+pkgname='ros-noetic-amcl'
+pkgver='1.17.1'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=4
+pkgrel=1
 license=('LGPL')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-geometry-msgs
-  ros-melodic-message-filters
-  ros-melodic-nav-msgs
-  ros-melodic-rosbag
-  ros-melodic-roscpp
-  ros-melodic-std-srvs
-  ros-melodic-tf2
-  ros-melodic-tf2-geometry-msgs
-  ros-melodic-tf2-msgs
-  ros-melodic-tf2-ros
-  ros-melodic-sensor-msgs)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
+ros_makedepends=(
+    ros-noetic-catkin
+    ros-noetic-dynamic-reconfigure
+    ros-noetic-geometry-msgs
+    ros-noetic-message-filters
+    ros-noetic-nav-msgs
+    ros-noetic-rosbag
+    ros-noetic-roscpp
+    ros-noetic-std-srvs
+    ros-noetic-tf2
+    ros-noetic-tf2-geometry-msgs
+    ros-noetic-tf2-msgs
+    ros-noetic-tf2-ros
+    ros-noetic-sensor-msgs
+)
 
-ros_depends=(ros-melodic-dynamic-reconfigure
-  ros-melodic-geometry-msgs
-  ros-melodic-nav-msgs
-  ros-melodic-rosbag
-  ros-melodic-roscpp
-  ros-melodic-std-srvs
-  ros-melodic-tf2
-  ros-melodic-tf2-msgs
-  ros-melodic-tf2-ros)
-depends=(${ros_depends[@]})
+makedepends=(
+    cmake
+    ros-build-tools
+    ${ros_makedepends[@]}
+)
+
+ros_depends=(
+    ros-noetic-dynamic-reconfigure
+    ros-noetic-geometry-msgs
+    ros-noetic-nav-msgs
+    ros-noetic-rosbag
+    ros-noetic-roscpp
+    ros-noetic-std-srvs
+    ros-noetic-tf2
+    ros-noetic-tf2-msgs
+    ros-noetic-tf2-ros
+)
+
+depends=(
+    ${ros_depends[@]}
+)
 
-# Tarball version (faster download)
 _dir="navigation-${pkgver}/amcl"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/navigation/archive/${pkgver}.tar.gz")
-sha256sums=('88e3b4433de9645e1132db15b01f436a75a28ebc15cd5b70660b158dd6ba42dd')
+sha256sums=('50e1fb4a0beb190202e9730180464b76b3a481cae2665e0f1944eb908929148e')
 
 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
 }