upgpkg: ros-noetic-moveit-resources 0.8.2-1

2 files changed, 60 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 977531fa20b5..7f71fa7d88e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,25 @@
 pkgbase = ros-noetic-moveit-resources
 	pkgdesc = ROS - Resources used for MoveIt! testing.
-	pkgver = 0.6.4
-	pkgrel = 2
+	pkgver = 0.8.2
+	pkgrel = 1
 	url = https://moveit.ros.org
-	arch = any
+	arch = i686
+	arch = x86_64
+	arch = aarch64
+	arch = armv7h
+	arch = armv6h
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-noetic-catkin
+	depends = ros-noetic-moveit-resources-fanuc-description
+	depends = ros-noetic-moveit-resources-fanuc-moveit-config
+	depends = ros-noetic-moveit-resources-panda-description
+	depends = ros-noetic-moveit-resources-panda-moveit-config
+	depends = ros-noetic-moveit-resources-pr2-description
 	depends = ros-noetic-joint-state-publisher
 	depends = ros-noetic-robot-state-publisher
-	source = ros-noetic-moveit-resources-0.6.4.tar.gz::https://github.com/ros-planning/moveit_resources/archive/0.6.4.tar.gz
-	sha256sums = 6d050a7511f930ca2e2080bcfa379134687eaa24010e2a2cb350dd827de099f1
+	source = ros-noetic-moveit-resources-0.8.2.tar.gz::https://github.com/ros-planning/moveit_resources/archive/0.8.2.tar.gz
+	sha256sums = eefedc471515f63648924893de796a7533005af8aec86e158fde8b18c0dc95b3
 
 pkgname = ros-noetic-moveit-resources
-
diff --git a/PKGBUILD b/PKGBUILD
index 5a65428b7ba5..f57848be2104 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,59 @@
-# Maintainer: Timon Engelke <aur@timonengelke.de>
 pkgdesc="ROS - Resources used for MoveIt! testing."
 url='https://moveit.ros.org'
 
 pkgname='ros-noetic-moveit-resources'
-pkgver='0.6.4'
-arch=('any')
-pkgrel=2
+pkgver='0.8.2'
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
+pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-noetic-catkin)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
-
-ros_depends=(ros-noetic-joint-state-publisher
-  ros-noetic-robot-state-publisher)
-depends=(${ros_depends[@]})
-
-# Git version (e.g. for debugging)
-# _tag=release/noetic/moveit_resources/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/moveit_resources-release.git"#tag=${_tag})
-# sha256sums=('d98d7e113ff2313fdbc0799a2abf4dc39f462bf7dc904b9b9584cbe241883ab6')
-
-# Tarball version (faster download)
-_dir="moveit_resources-${pkgver}"
+ros_makedepends=(
+    ros-noetic-catkin
+)
+
+makedepends=(
+    cmake
+    ros-build-tools
+    ${ros_makedepends[@]}
+)
+
+ros_depends=(
+    ros-noetic-moveit-resources-fanuc-description
+    ros-noetic-moveit-resources-fanuc-moveit-config
+    ros-noetic-moveit-resources-panda-description
+    ros-noetic-moveit-resources-panda-moveit-config
+    ros-noetic-moveit-resources-pr2-description
+    ros-noetic-joint-state-publisher
+    ros-noetic-robot-state-publisher
+)
+
+depends=(
+    ${ros_depends[@]}
+)
+
+_dir="moveit_resources-${pkgver}/moveit_resources"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/moveit_resources/archive/${pkgver}.tar.gz")
-sha256sums=('6d050a7511f930ca2e2080bcfa379134687eaa24010e2a2cb350dd827de099f1')
+sha256sums=('eefedc471515f63648924893de796a7533005af8aec86e158fde8b18c0dc95b3')
 
 build() {
-  # Use ROS environment variables
-  source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
-
-  # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
-
-  # Build project
-  cmake ${srcdir}/${_dir} \
-        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
+    # Use ROS environment variables
+    source /usr/share/ros-build-tools/clear-ros-env.sh
+    [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
+
+    # Create build directory
+    [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+    cd ${srcdir}/build
+
+    # Build project
+    cmake ${srcdir}/${_dir} \
+          -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+          -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+          -DPYTHON_EXECUTABLE=/usr/bin/python \
+          -DSETUPTOOLS_DEB_LAYOUT=OFF
+    make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+    cd "${srcdir}/build"
+    make DESTDIR="${pkgdir}/" install
 }