summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD33
2 files changed, 20 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f2a4ccfe4ac7..7b562dd2b455 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
-pkgbase = ros-melodic-slam-gmapping
+pkgbase = ros-noetic-slam-gmapping
pkgdesc = ROS - slam_gmapping contains a wrapper around gmapping which provides SLAM capabilities.
- pkgver = 1.4.0
+ pkgver = 1.4.1
pkgrel = 1
url = http://ros.org/wiki/slam_gmapping
arch = any
license = CreativeCommons-by-nc-sa-2.0
makedepends = cmake
- makedepends = git
makedepends = ros-build-tools
- makedepends = ros-melodic-catkin
- depends = ros-melodic-gmapping
- depends = ros-melodic-openslam-gmapping
- source = slam_gmapping::git+https://github.com/ros-gbp/slam_gmapping-release.git#tag=release/melodic/slam_gmapping/1.4.0-1
- md5sums = SKIP
+ makedepends = ros-noetic-catkin
+ depends = ros-noetic-gmapping
+ depends = ros-noetic-openslam-gmapping
+ source = ros-noetic-slam-gmapping-1.4.1.tar.gz::https://github.com/ros-perception/slam_gmapping/archive/1.4.1.tar.gz
+ sha256sums = 28429cf962b5ec2c49556aee73b7f87859c0421bc8c8056e3667e3a2b20591e2
-pkgname = ros-melodic-slam-gmapping
+pkgname = ros-noetic-slam-gmapping
diff --git a/PKGBUILD b/PKGBUILD
index 2523703f41f0..567b197ff38f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,47 +3,38 @@
pkgdesc="ROS - slam_gmapping contains a wrapper around gmapping which provides SLAM capabilities."
url='http://ros.org/wiki/slam_gmapping'
-pkgname='ros-melodic-slam-gmapping'
-pkgver='1.4.0'
-_pkgver_patch=1
+pkgname='ros-noetic-slam-gmapping'
+pkgver='1.4.1'
arch=('any')
pkgrel=1
license=('CreativeCommons-by-nc-sa-2.0')
-ros_makedepends=(ros-melodic-catkin)
-makedepends=('cmake' 'git' 'ros-build-tools'
+ros_makedepends=(ros-noetic-catkin)
+makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-melodic-gmapping
- ros-melodic-openslam-gmapping)
+ros_depends=(ros-noetic-gmapping
+ ros-noetic-openslam-gmapping)
depends=(${ros_depends[@]})
-_tag=release/melodic/slam_gmapping/${pkgver}-${_pkgver_patch}
-_dir=slam_gmapping
-source=("${_dir}"::"git+https://github.com/ros-gbp/slam_gmapping-release.git"#tag=${_tag})
-md5sums=('SKIP')
+_dir="slam_gmapping-${pkgver}/slam_gmapping"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-perception/slam_gmapping/archive/${pkgver}.tar.gz")
+sha256sums=('28429cf962b5ec2c49556aee73b7f87859c0421bc8c8056e3667e3a2b20591e2')
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 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.8 \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.8.so \
- -DPYTHON_BASENAME=-python3.8 \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}