summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Exner2020-05-20 23:22:23 +0200
committerFelix Exner2020-11-30 20:46:12 +0100
commit97f36c1c141f34e360fe0b32c96a3717b645662d (patch)
tree0372dfddee53ca69c07f5ed3b0e75cbaf827adc7
parenta8f92ab159aad92f507593f29d5801b87562eedf (diff)
downloadaur-97f36c1c141f34e360fe0b32c96a3717b645662d.tar.gz
Updated eigenpy patch
Upstream has migrated from the catkin component to find_package, but that seems not to resolve the include dirs of numpy. Using the PkgConfig approach from before seems to work still. Updated pkgrel and SRCINFO
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--eigenpy.patch28
3 files changed, 11 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d42fab9108..08080ed36ee 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 = 3
+ pkgrel = 4
url = https://moveit.ros.org
arch = i686
arch = x86_64
@@ -43,7 +43,7 @@ pkgbase = ros-melodic-moveit-ros-planning-interface
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 = 797e2415ec9c66b2f7137bb6c0037e4f0ef5520baba7eff3af3eb04119e42b40
+ sha256sums = afce9fb9948f8a1c4f619745426843eac6257d8169f9989499b33e324b4c0356
pkgname = ros-melodic-moveit-ros-planning-interface
diff --git a/PKGBUILD b/PKGBUILD
index 62ed16b5269..d81055392b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ url='https://moveit.ros.org'
pkgname='ros-melodic-moveit-ros-planning-interface'
pkgver='1.0.3'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=3
+pkgrel=4
license=('BSD')
ros_makedepends=(ros-melodic-tf-conversions
@@ -53,7 +53,7 @@ _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'
- '797e2415ec9c66b2f7137bb6c0037e4f0ef5520baba7eff3af3eb04119e42b40')
+ 'afce9fb9948f8a1c4f619745426843eac6257d8169f9989499b33e324b4c0356')
prepare() {
cd ${srcdir}/${_dir}
diff --git a/eigenpy.patch b/eigenpy.patch
index 56bcc55b7cf..e18f34fefaf 100644
--- a/eigenpy.patch
+++ b/eigenpy.patch
@@ -1,29 +1,15 @@
diff --git a/moveit_ros/planning_interface/CMakeLists.txt b/moveit_ros/planning_interface/CMakeLists.txt
-index d1b5594b1..a5e130843 100644
+index d4ff38ebd..8e9e1c0c3 100644
--- a/moveit_ros/planning_interface/CMakeLists.txt
+++ b/moveit_ros/planning_interface/CMakeLists.txt
-@@ -19,13 +19,15 @@ find_package(catkin REQUIRED COMPONENTS
- tf2_eigen
- tf2_geometry_msgs
- tf2_ros
-- eigenpy
- roscpp
- actionlib
- rospy
- rosconsole
+@@ -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)
+
- find_package(PythonInterp REQUIRED)
- find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
-
-@@ -77,6 +79,7 @@ catkin_package(
-
- include_directories(${THIS_PACKAGE_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}
-+ ${eigenpy_INCLUDE_DIRS}
- ${catkin_INCLUDE_DIRS})
- include_directories(SYSTEM
+ set(THIS_PACKAGE_INCLUDE_DIRS
+ py_bindings_tools/include