summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rw-r--r--eigenpy.patch15
3 files changed, 8 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08080ed36ee..c70fdd7d214 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-melodic-moveit-ros-planning-interface
pkgdesc = ROS - Components of MoveIt that offer simpler interfaces to planning and execution.
- pkgver = 1.0.3
- pkgrel = 4
+ pkgver = 1.0.6
+ pkgrel = 1
url = https://moveit.ros.org
arch = i686
arch = x86_64
@@ -40,10 +40,8 @@ pkgbase = ros-melodic-moveit-ros-planning-interface
depends = ros-melodic-rosconsole
depends = python
depends = eigenpy
- source = ros-melodic-moveit-ros-planning-interface-1.0.3.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.3.tar.gz
- source = eigenpy.patch
- sha256sums = b0ac91cd4c4dc29d9bd5e3885a1a457252495b3f2bedb46ddfe04154f5ac2358
- sha256sums = afce9fb9948f8a1c4f619745426843eac6257d8169f9989499b33e324b4c0356
+ source = ros-melodic-moveit-ros-planning-interface-1.0.6.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.6.tar.gz
+ sha256sums = a633830d2ed7e23089f9642d99298cb6eb96148c695c0b4890f2792eac4904b4
pkgname = ros-melodic-moveit-ros-planning-interface
diff --git a/PKGBUILD b/PKGBUILD
index d81055392b7..346f761d6bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@ pkgdesc="ROS - Components of MoveIt that offer simpler interfaces to planning an
url='https://moveit.ros.org'
pkgname='ros-melodic-moveit-ros-planning-interface'
-pkgver='1.0.3'
+pkgver='1.0.6'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=4
+pkgrel=1
license=('BSD')
ros_makedepends=(ros-melodic-tf-conversions
@@ -50,15 +50,10 @@ depends=(${ros_depends[@]}
# Tarball version (faster download)
_dir="moveit-${pkgver}/moveit_ros/planning_interface"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/moveit/archive/${pkgver}.tar.gz"
- "eigenpy.patch")
-sha256sums=('b0ac91cd4c4dc29d9bd5e3885a1a457252495b3f2bedb46ddfe04154f5ac2358'
- 'afce9fb9948f8a1c4f619745426843eac6257d8169f9989499b33e324b4c0356')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/moveit/archive/${pkgver}.tar.gz")
+sha256sums=('a633830d2ed7e23089f9642d99298cb6eb96148c695c0b4890f2792eac4904b4')
prepare() {
- cd ${srcdir}/${_dir}
- patch -uN CMakeLists.txt ${srcdir}/eigenpy.patch || return 1
-
cd ${srcdir}
find . \( -iname *.cpp -o -iname *.h \) \
-exec sed -r -i "s/[^_]logError/CONSOLE_BRIDGE_logError/" {} \; \
diff --git a/eigenpy.patch b/eigenpy.patch
deleted file mode 100644
index e18f34fefaf..00000000000
--- a/eigenpy.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/moveit_ros/planning_interface/CMakeLists.txt b/moveit_ros/planning_interface/CMakeLists.txt
-index d4ff38ebd..8e9e1c0c3 100644
---- a/moveit_ros/planning_interface/CMakeLists.txt
-+++ b/moveit_ros/planning_interface/CMakeLists.txt
-@@ -45,7 +45,9 @@ find_package(Boost REQUIRED COMPONENTS
- thread
- )
- find_package(Eigen3 REQUIRED)
--find_package(eigenpy REQUIRED)
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(eigenpy eigenpy REQUIRED)
-+
-
- set(THIS_PACKAGE_INCLUDE_DIRS
- py_bindings_tools/include