From 8972c8496a477e0f7188ca3505672d5a4bb6a545 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 4 Mar 2019 18:25:02 +0100 Subject: [PATCH] [wip/hpp-rbprm] Update to v4.4.0 Changes since v4.3.0: - Pinocchio v2 - Make tests independants of private robots models - Adapt paths to package change of environment models - sampler independent from the notion of 'contact normal' in fcl - [BUG FIX] correct handling of rbprmvalidationreport - fixed limb offset for hyq in test - revert packaging wronful commit - [Release] Sample Database + Limb-RRT Packaging changes: - remove patch-aa, applied upstream --- hpp-rbprm/distinfo | 7 +++---- hpp-rbprm/patches/patch-aa | 36 ------------------------------------ 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 hpp-rbprm/patches/patch-aa diff --git a/hpp-rbprm/distinfo b/hpp-rbprm/distinfo index 5e3b7b15..d2cf0655 100644 --- a/hpp-rbprm/distinfo +++ b/hpp-rbprm/distinfo @@ -1,4 +1,3 @@ -SHA1 (hpp-rbprm-4.3.0.tar.gz) = acd6cb789e977c5de40c493b9d9b318e4c5f9d7b -RMD160 (hpp-rbprm-4.3.0.tar.gz) = 461bb624b3b15b822e0372115224e008d2c7b51f -Size (hpp-rbprm-4.3.0.tar.gz) = 1199734 bytes -SHA1 (patch-aa) = e18f1be2743fe0fada6afe2119a73b2cfb9e5537 +SHA1 (hpp-rbprm-4.4.0.tar.gz) = 23acd768732e35b0d880ebb4dca6813e8b3ba7ce +RMD160 (hpp-rbprm-4.4.0.tar.gz) = bb6b8c3a49437de6234086231af8428cefc558a7 +Size (hpp-rbprm-4.4.0.tar.gz) = 1201606 bytes diff --git a/hpp-rbprm/patches/patch-aa b/hpp-rbprm/patches/patch-aa deleted file mode 100644 index 0f6b8f0b..00000000 --- a/hpp-rbprm/patches/patch-aa +++ /dev/null @@ -1,36 +0,0 @@ -cdd headers ar in /usr/include in ArchLinux, /usr/include/cdd in Ubuntu and /usr/include/cddlib in Fedora - ---- cmake2/FindCDD.cmake.orig 2019-01-29 15:13:37.000000000 +0100 -+++ cmake2/FindCDD.cmake 2019-01-31 10:33:17.193453803 +0100 -@@ -6,8 +6,8 @@ - # CDD_DEFINITIONS - Compiler switches required for using CDD - - --find_path(CDD_INCLUDE_DIR cdd/cdd.h -- HINTS ${CDD_INCLUDEDIR} /usr/include -+find_path(CDD_INCLUDE_DIR cdd.h -+ HINTS ${CDD_INCLUDEDIR} /usr/include /usr/include/cdd /usr/include/cddlib - PATH_SUFFIXES CDD ) - - find_library(CDD_LIBRARY NAMES libcdd.so ---- CMakeLists.txt.orig 2019-01-30 08:32:24.000000000 +0100 -+++ CMakeLists.txt 2019-01-31 22:29:28.207695794 +0100 -@@ -46,6 +46,8 @@ - ADD_REQUIRED_DEPENDENCY("hpp-affordance") - ADD_REQUIRED_DEPENDENCY("hpp-spline") - -+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} cmake2) -+find_package(CDD REQUIRED) - FIND_PACKAGE( OpenMP REQUIRED) - find_package(Boost) - find_package(Boost 1.54.0 COMPONENTS filesystem system REQUIRED) ---- src/CMakeLists.txt.orig 2019-01-30 08:32:24.000000000 +0100 -+++ src/CMakeLists.txt 2019-01-31 22:34:44.346889827 +0100 -@@ -76,6 +76,7 @@ - ) - - TARGET_LINK_LIBRARIES(${LIBRARY_NAME} hpp-centroidal-dynamics hpp-bezier-com-traj) -+TARGET_INCLUDE_DIRECTORIES(${LIBRARY_NAME} PUBLIC ${CDD_INCLUDE_DIRS}) - - PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-core) - PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-util) -- GitLab