diff options
author | acxz | 2020-05-24 21:04:03 -0400 |
---|---|---|
committer | acxz | 2020-05-24 21:04:03 -0400 |
commit | af548de0da0f0ad342bc556d2afad70043cc6b7e (patch) | |
tree | fc1373f043ed097bce34c4e8acda84d9cb72e1c5 | |
parent | d0fe2f1445a852be1c978ff776cc68d89961cc63 (diff) | |
download | aur-af548de0da0f0ad342bc556d2afad70043cc6b7e.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 66 | ||||
-rw-r--r-- | PKGBUILD | 95 | ||||
-rw-r--r-- | export_nodelet_macro.patch | 13 |
3 files changed, 69 insertions, 105 deletions
@@ -1,45 +1,43 @@ -pkgbase = ros-melodic-octomap-server +pkgbase = ros-noetic-octomap-server pkgdesc = ROS - This library loads a 3D map (as Octree-based OctoMap) and distributes it to other nodes in a compact binary format pkgver = 0.6.5 pkgrel = 1 - url = http://ros.org/wiki/random_numbers + url = http://ros.org/wiki/octomap_server arch = any license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-visualization-msgs - makedepends = ros-melodic-sensor-msgs - makedepends = ros-melodic-pcl-ros - makedepends = ros-melodic-pcl-conversions - makedepends = ros-melodic-nav-msgs - makedepends = ros-melodic-std-msgs - makedepends = ros-melodic-std-srvs - makedepends = ros-melodic-octomap - makedepends = ros-melodic-octomap-msgs - makedepends = ros-melodic-octomap-ros - makedepends = ros-melodic-dynamic-reconfigure - makedepends = ros-melodic-nodelet + makedepends = ros-noetic-catkin + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-visualization-msgs + makedepends = ros-noetic-sensor-msgs + makedepends = ros-noetic-pcl-ros + makedepends = ros-noetic-pcl-conversions + makedepends = ros-noetic-nav-msgs + makedepends = ros-noetic-std-msgs + makedepends = ros-noetic-std-srvs + makedepends = ros-noetic-octomap + makedepends = ros-noetic-octomap-msgs + makedepends = ros-noetic-octomap-ros + makedepends = ros-noetic-dynamic-reconfigure + makedepends = ros-noetic-nodelet makedepends = boost - depends = ros-melodic-roscpp - depends = ros-melodic-visualization-msgs - depends = ros-melodic-sensor-msgs - depends = ros-melodic-pcl-ros - depends = ros-melodic-pcl-conversions - depends = ros-melodic-nav-msgs - depends = ros-melodic-std-msgs - depends = ros-melodic-std-srvs - depends = ros-melodic-octomap - depends = ros-melodic-octomap-msgs - depends = ros-melodic-octomap-ros - depends = ros-melodic-dynamic-reconfigure - depends = ros-melodic-nodelet + depends = ros-noetic-roscpp + depends = ros-noetic-visualization-msgs + depends = ros-noetic-sensor-msgs + depends = ros-noetic-pcl-ros + depends = ros-noetic-pcl-conversions + depends = ros-noetic-nav-msgs + depends = ros-noetic-std-msgs + depends = ros-noetic-std-srvs + depends = ros-noetic-octomap + depends = ros-noetic-octomap-msgs + depends = ros-noetic-octomap-ros + depends = ros-noetic-dynamic-reconfigure + depends = ros-noetic-nodelet depends = boost - source = ros-melodic-octomap-server-0.6.5-0.tar.gz::https://github.com/OctoMap/octomap_mapping/archive/master/octomap_mapping/0.6.5.tar.gz - source = export_nodelet_macro.patch - sha256sums = ac14c36ac5ac7e17b2ade091abaaa33afeecc813fc85ee91f208fca0e38d4d32 - sha256sums = SKIP + source = ros-noetic-octomap-server-0.6.5.tar.gz::https://github.com/OctoMap/octomap_mapping/archive/0.6.5.tar.gz + sha256sums = dda5b56259a80ab115f547df7a117140016587ec1fe45602845976a518b3c881 -pkgname = ros-melodic-octomap-server +pkgname = ros-noetic-octomap-server @@ -1,91 +1,71 @@ # Script generated with import_catkin_packages.py # For more information: https://github.com/bchretien/arch-ros-stacks pkgdesc="ROS - This library loads a 3D map (as Octree-based OctoMap) and distributes it to other nodes in a compact binary format" -url='http://ros.org/wiki/random_numbers' +url='http://ros.org/wiki/octomap_server' -pkgname='ros-melodic-octomap-server' +pkgname='ros-noetic-octomap-server' pkgver='0.6.5' -_pkgver_patch=0 arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin - ros-melodic-roscpp - ros-melodic-visualization-msgs - ros-melodic-sensor-msgs - ros-melodic-pcl-ros - ros-melodic-pcl-conversions - ros-melodic-nav-msgs - ros-melodic-std-msgs - ros-melodic-std-srvs - ros-melodic-octomap - ros-melodic-octomap-msgs - ros-melodic-octomap-ros - ros-melodic-dynamic-reconfigure - ros-melodic-nodelet +ros_makedepends=( + ros-noetic-catkin + ros-noetic-roscpp + ros-noetic-visualization-msgs + ros-noetic-sensor-msgs + ros-noetic-pcl-ros + ros-noetic-pcl-conversions + ros-noetic-nav-msgs + ros-noetic-std-msgs + ros-noetic-std-srvs + ros-noetic-octomap + ros-noetic-octomap-msgs + ros-noetic-octomap-ros + ros-noetic-dynamic-reconfigure + ros-noetic-nodelet ) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]} boost) -ros_depends=(ros-melodic-roscpp - ros-melodic-visualization-msgs - ros-melodic-sensor-msgs - ros-melodic-pcl-ros - ros-melodic-pcl-conversions - ros-melodic-nav-msgs - ros-melodic-std-msgs - ros-melodic-std-srvs - ros-melodic-octomap - ros-melodic-octomap-msgs - ros-melodic-octomap-ros - ros-melodic-dynamic-reconfigure - ros-melodic-nodelet +ros_depends=( + ros-noetic-roscpp + ros-noetic-visualization-msgs + ros-noetic-sensor-msgs + ros-noetic-pcl-ros + ros-noetic-pcl-conversions + ros-noetic-nav-msgs + ros-noetic-std-msgs + ros-noetic-std-srvs + ros-noetic-octomap + ros-noetic-octomap-msgs + ros-noetic-octomap-ros + ros-noetic-dynamic-reconfigure + ros-noetic-nodelet ) depends=(${ros_depends[@]} boost) -# Git version (e.g. for debugging) -# _tag=release/melodic/octomap_mapping/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/OctoMap/octomap_mapping.git"#tag=${_tag}) -# sha256sums=('SKIP') +_dir="octomap_mapping-${pkgver}/octomap_server" +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/OctoMap/octomap_mapping/archive/${pkgver}.tar.gz") -# Tarball version (faster download) -_dir="octomap_mapping-master/octomap_server" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/OctoMap/octomap_mapping/archive/master/octomap_mapping/${pkgver}.tar.gz" - "export_nodelet_macro.patch") - -sha256sums=('ac14c36ac5ac7e17b2ade091abaaa33afeecc813fc85ee91f208fca0e38d4d32' - 'SKIP') - -prepare() { - cd ${srcdir}/${_dir} - patch -Np1 -i ${srcdir}/export_nodelet_macro.patch -} +sha256sums=('dda5b56259a80ab115f547df7a117140016587ec1fe45602845976a518b3c881') 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 } @@ -94,4 +74,3 @@ package() { cd "${srcdir}/build" make DESTDIR="${pkgdir}/" install } - diff --git a/export_nodelet_macro.patch b/export_nodelet_macro.patch deleted file mode 100644 index c5190f3d3d7c..000000000000 --- a/export_nodelet_macro.patch +++ /dev/null @@ -1,13 +0,0 @@ -*** a/src/octomap_server_nodelet.cpp 2020-01-10 00:54:40.937341522 +0000 ---- b/src/octomap_server_nodelet.cpp 2020-01-10 00:56:28.510670074 +0000 -*************** -*** 56,59 **** - - } // namespace - -! PLUGINLIB_DECLARE_CLASS(octomap_server, OctomapServerNodelet, octomap_server::OctomapServerNodelet, nodelet::Nodelet); ---- 56,59 ---- - - } // namespace - -! PLUGINLIB_EXPORT_CLASS(octomap_server::OctomapServerNodelet, nodelet::Nodelet); |