initial commit with adjusted kinetic package (changes python2 to python3, kinetic to melodic). Added patch for different Macro in Nodelet

3 files changed, 155 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..402a460a0638
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,45 @@
+pkgbase = ros-melodic-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.4
+	pkgrel = 1
+	url = http://ros.org/wiki/random_numbers
+	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 = 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 = boost
+	source = ros-melodic-octomap-server-0.6.4-0.tar.gz::https://github.com/OctoMap/octomap_mapping/archive/master/octomap_mapping/0.6.4.tar.gz
+	source = export_nodelet_macro.patch
+	sha256sums = ac14c36ac5ac7e17b2ade091abaaa33afeecc813fc85ee91f208fca0e38d4d32
+	sha256sums = SKIP
+
+pkgname = ros-melodic-octomap-server
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..67f626d3f70d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,97 @@
+# 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'
+
+pkgname='ros-melodic-octomap-server'
+pkgver='0.6.4'
+_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   
+)
+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
+)
+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')
+
+# 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
+}
+
+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
+
+  # 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 \
+        -DSETUPTOOLS_DEB_LAYOUT=OFF
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}/" install
+}
+
diff --git a/export_nodelet_macro.patch b/export_nodelet_macro.patch
new file mode 100644
index 000000000000..c5190f3d3d7c
--- /dev/null
+++ b/export_nodelet_macro.patch
@@ -0,0 +1,13 @@
+*** 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);