From d1b07f17753c5ad73543bfbf34aeed90f9c854b4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 26 Sep 2019 12:47:12 +0200
Subject: [PATCH] [wip/hpp-rbprm] Update to v4.7.0
Changes since v4.6.0:
- remove use of ProblemSolver::latest from test/tools-obstacle
- projection : fix and add desired rotation
- [BUG FIX] addGoalConfig does not work with interpolateConfig
- include pinocchio before boost
- Topic/kinodynamic_orientation
- [test] update value of mass for hyq abstract model
- Change reachability API for quasiStatic methods
Packaging changes:
- remove patch-aa, applied upstream
---
hpp-rbprm-robot-data/Makefile | 3 ++-
hpp-rbprm/Makefile | 4 +++-
hpp-rbprm/depend.mk | 4 +++-
hpp-rbprm/distinfo | 7 +++----
hpp-rbprm/patches/patch-aa | 38 -----------------------------------
5 files changed, 11 insertions(+), 45 deletions(-)
delete mode 100644 hpp-rbprm/patches/patch-aa
diff --git a/hpp-rbprm-robot-data/Makefile b/hpp-rbprm-robot-data/Makefile
index 90af9f53..3a869870 100644
--- a/hpp-rbprm-robot-data/Makefile
+++ b/hpp-rbprm-robot-data/Makefile
@@ -7,9 +7,10 @@ HPP_COMMENT= file database
CATEGORIES= wip
+USE_PYTHON= true
+
include ../../meta-pkgs/hpp/Makefile.common
-include ../../mk/sysdep/python.mk
include ../../mk/language/c.mk
include ../../mk/language/c++11.mk
include ../../mk/robotpkg.mk
diff --git a/hpp-rbprm/Makefile b/hpp-rbprm/Makefile
index 3cff0151..c7fb6fff 100644
--- a/hpp-rbprm/Makefile
+++ b/hpp-rbprm/Makefile
@@ -7,6 +7,8 @@ HPP_COMMENT= RB-PRM planner in HPP
CATEGORIES= wip
+USE_PYTHON= true
+
include ../../meta-pkgs/hpp/Makefile.common
include ../../wip/hpp-rbprm-robot-data/depend.mk
@@ -29,5 +31,5 @@ include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
+include ../../mk/language/c++11.mk
include ../../mk/robotpkg.mk
diff --git a/hpp-rbprm/depend.mk b/hpp-rbprm/depend.mk
index 0df63c04..3cbf4e5a 100644
--- a/hpp-rbprm/depend.mk
+++ b/hpp-rbprm/depend.mk
@@ -11,11 +11,13 @@ endif
ifeq (+,$(HPP_RBPRM_DEPEND_MK)) # --------------------------------------
+include ../../mk/sysdep/python.mk
+
PREFER.hpp-rbprm?= robotpkg
DEPEND_USE+= hpp-rbprm
-DEPEND_ABI.hpp-rbprm?= hpp-rbprm>=4.6.0
+DEPEND_ABI.hpp-rbprm?= ${PKGTAG.python-}hpp-rbprm>=4.7.0
DEPEND_DIR.hpp-rbprm?= ../../wip/hpp-rbprm
SYSTEM_SEARCH.hpp-rbprm=\
diff --git a/hpp-rbprm/distinfo b/hpp-rbprm/distinfo
index c5e97b21..7b573deb 100644
--- a/hpp-rbprm/distinfo
+++ b/hpp-rbprm/distinfo
@@ -1,4 +1,3 @@
-SHA1 (hpp-rbprm-4.6.0.tar.gz) = 1e3fb3824339b452148edc3ffed908ff24ffd780
-RMD160 (hpp-rbprm-4.6.0.tar.gz) = 947f18b705ca397801dfadc221a0c7d5c5ddd6cb
-Size (hpp-rbprm-4.6.0.tar.gz) = 1233157 bytes
-SHA1 (patch-aa) = 4dc13a6bc53de45ad0190e8b953059b085c9924d
+SHA1 (hpp-rbprm-4.7.0.tar.gz) = 0d728f955ec9fc5482f895c910abc032f2c778c5
+RMD160 (hpp-rbprm-4.7.0.tar.gz) = 74eab97be13abbf54f2ca9da1d0d669c6b842758
+Size (hpp-rbprm-4.7.0.tar.gz) = 1237717 bytes
diff --git a/hpp-rbprm/patches/patch-aa b/hpp-rbprm/patches/patch-aa
deleted file mode 100644
index ac20ca70..00000000
--- a/hpp-rbprm/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-include pinocchio before boost, ref
-https://github.com/stack-of-tasks/pinocchio/issues/849
-
---- src/utils/algorithms.cc.orig 2019-05-29 17:04:49.000000000 +0200
-+++ src/utils/algorithms.cc 2019-08-21 13:47:38.987440983 +0200
-@@ -1,3 +1,4 @@
-+#include <pinocchio/fwd.hpp>
- #include "hpp/rbprm/utils/algorithms.h"
- #include <hpp/fcl/intersect.h>
- #include <hpp/util/debug.hh>
---- tests/test-rbrrt.cc.orig 2019-05-29 17:04:49.000000000 +0200
-+++ tests/test-rbrrt.cc 2019-08-21 13:48:38.358849918 +0200
-@@ -18,6 +18,7 @@
-
-
- #define BOOST_TEST_MODULE test-rbrrt
-+#include <pinocchio/fwd.hpp>
- #include <boost/test/included/unit_test.hpp>
-
- #include <hpp/core/problem-solver.hh>
---- tests/test-projection.cc.orig 2019-05-29 17:04:49.000000000 +0200
-+++ tests/test-projection.cc 2019-08-21 13:49:20.094435386 +0200
-@@ -1,4 +1,5 @@
- #define BOOST_TEST_MODULE test-projection
-+#include <pinocchio/fwd.hpp>
- #include <boost/test/included/unit_test.hpp>
-
- #include "tools-fullbody.hh"
---- tests/test-kinodynamic.cc.orig 2019-05-29 17:04:49.000000000 +0200
-+++ tests/test-kinodynamic.cc 2019-08-21 13:49:57.286066627 +0200
-@@ -18,6 +18,7 @@
-
-
- #define BOOST_TEST_MODULE test-kinodynamic
-+#include <pinocchio/fwd.hpp>
- #include <boost/test/included/unit_test.hpp>
-
- #include <hpp/core/problem-solver.hh>
--
GitLab