Merge pull request #2 from acxz/master

Update and fix dependencies

2 files changed, 46 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12dbfa45e5b6..8c4ad9fcf056 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,66 +1,41 @@
 pkgbase = ros-melodic-moveit-core
 	pkgdesc = ROS - Core libraries used by MoveIt!.
 	pkgver = 1.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://moveit.ros.org
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-eigen-stl-containers
-	makedepends = ros-melodic-octomap-msgs
-	makedepends = ros-melodic-trajectory-msgs
-	makedepends = ros-melodic-moveit-msgs
-	makedepends = ros-melodic-roslib
-	makedepends = ros-melodic-kdl-parser
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-urdf
-	makedepends = ros-melodic-random-numbers
-	makedepends = ros-melodic-rostime
-	makedepends = ros-melodic-srdfdom
-	makedepends = ros-melodic-octomap
-	makedepends = ros-melodic-visualization-msgs
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-geometric-shapes
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-eigen-conversions
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-shape-msgs
-	makedepends = ros-melodic-tf2-eigen
-	makedepends = ros-melodic-fcl
-	makedepends = ros-melodic-moveit-resources
-	makedepends = eigen
-	makedepends = urdfdom-headers
-	makedepends = assimp
-	makedepends = console-bridge
-	makedepends = boost
-	makedepends = urdfdom
 	makedepends = pkg-config
 	depends = ros-melodic-eigen-stl-containers
-	depends = ros-melodic-octomap-msgs
-	depends = ros-melodic-trajectory-msgs
-	depends = ros-melodic-moveit-msgs
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-kdl-parser
+	depends = ros-melodic-geometric-shapes
 	depends = ros-melodic-geometry-msgs
+	depends = ros-melodic-kdl-parser
 	depends = ros-melodic-urdf
+	depends = ros-melodic-moveit-msgs
+	depends = ros-melodic-octomap
+	depends = ros-melodic-octomap-msgs
 	depends = ros-melodic-random-numbers
+	depends = ros-melodic-roslib
 	depends = ros-melodic-rostime
-	depends = ros-melodic-srdfdom
-	depends = ros-melodic-octomap
-	depends = ros-melodic-visualization-msgs
+	depends = ros-melodic-rosconsole
 	depends = ros-melodic-sensor-msgs
-	depends = ros-melodic-geometric-shapes
-	depends = ros-melodic-eigen-conversions
-	depends = ros-melodic-fcl
+	depends = ros-melodic-shape-msgs
+	depends = ros-melodic-srdfdom
+	depends = ros-melodic-std-msgs
 	depends = ros-melodic-tf2-eigen
-	depends = ros-melodic-moveit-resources
+	depends = ros-melodic-tf2-geometry-msgs
+	depends = ros-melodic-trajectory-msgs
+	depends = ros-melodic-visualization-msgs
+	depends = ros-melodic-xmlrpcpp
 	depends = eigen
 	depends = urdfdom-headers
 	depends = assimp
 	depends = console-bridge
 	depends = boost
 	depends = urdfdom
+	depends = fcl
 	source = ros-melodic-moveit-core-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz
 	sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4
 
diff --git a/PKGBUILD b/PKGBUILD
index ad8e5b91105d..d284ccdb0eeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,75 +5,53 @@ url='https://moveit.ros.org'
 pkgname='ros-melodic-moveit-core'
 pkgver='1.0.2'
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-eigen-stl-containers
-  ros-melodic-octomap-msgs
-  ros-melodic-trajectory-msgs
-  ros-melodic-moveit-msgs
-  ros-melodic-roslib
-  ros-melodic-kdl-parser
+ros_makedepends=(
+)
+
+makedepends=(
+  'cmake' 'ros-build-tools'
+  ${ros_makedepends[@]}
+  pkg-config
+)
+
+ros_depends=(
+  ros-melodic-eigen-stl-containers
+  ros-melodic-geometric-shapes
   ros-melodic-geometry-msgs
+  ros-melodic-kdl-parser
   ros-melodic-urdf
+  ros-melodic-moveit-msgs
+  ros-melodic-octomap
+  ros-melodic-octomap-msgs
   ros-melodic-random-numbers
+  ros-melodic-roslib
   ros-melodic-rostime
-  ros-melodic-srdfdom
-  ros-melodic-octomap
-  ros-melodic-visualization-msgs
+  ros-melodic-rosconsole
   ros-melodic-sensor-msgs
-  ros-melodic-geometric-shapes
-  ros-melodic-catkin
-  ros-melodic-eigen-conversions
-  ros-melodic-std-msgs
   ros-melodic-shape-msgs
+  ros-melodic-srdfdom
+  ros-melodic-std-msgs
   ros-melodic-tf2-eigen
-  ros-melodic-fcl
-  ros-melodic-moveit-resources)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  eigen
-  urdfdom-headers
-  assimp
-  console-bridge
-  boost
-  urdfdom
-  pkg-config)
-
-ros_depends=(ros-melodic-eigen-stl-containers
-  ros-melodic-octomap-msgs
+  ros-melodic-tf2-geometry-msgs
   ros-melodic-trajectory-msgs
-  ros-melodic-moveit-msgs
-  ros-melodic-std-msgs
-  ros-melodic-kdl-parser
-  ros-melodic-geometry-msgs
-  ros-melodic-urdf
-  ros-melodic-random-numbers
-  ros-melodic-rostime
-  ros-melodic-srdfdom
-  ros-melodic-octomap
   ros-melodic-visualization-msgs
-  ros-melodic-sensor-msgs
-  ros-melodic-geometric-shapes
-  ros-melodic-eigen-conversions
-  ros-melodic-fcl
-  ros-melodic-tf2-eigen
-  ros-melodic-moveit-resources)
-depends=(${ros_depends[@]}
+  ros-melodic-xmlrpcpp
+)
+
+depends=(
+  ${ros_depends[@]}
   eigen
   urdfdom-headers
   assimp
   console-bridge
   boost
-  urdfdom)
-
-# Git version (e.g. for debugging)
-# _tag=release/melodic/moveit_core/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag})
-# sha256sums=('6178568b18b13a3570a8ae85c404227e1e3fbd57250b23d7d705795c2463be57')
+  urdfdom
+  fcl
+)
 
-# Tarball version (faster download)
 _dir="moveit-${pkgver}/moveit_core"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/moveit/archive/${pkgver}.tar.gz")
 sha256sums=('b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4')