From add216163b69dc3d9e292f8155040001f9698b83 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 26 Sep 2019 18:36:29 +0200
Subject: [PATCH] [wip/hpp-affordance-corba] Update to v4.7.0
Changes since v4.5.0:
- Use plugin mechanism of hpp-corbaserver.
- Fix compatibility with Python 3.
- include pinocchio before boost
Packaging changes:
- removed patch aa, applied upstream
---
hpp-affordance-corba/Makefile | 5 +++--
hpp-affordance-corba/PLIST | 2 +-
hpp-affordance-corba/depend.mk | 8 +++++---
hpp-affordance-corba/distinfo | 7 +++----
hpp-affordance-corba/patches/patch-aa | 13 -------------
5 files changed, 12 insertions(+), 23 deletions(-)
delete mode 100644 hpp-affordance-corba/patches/patch-aa
diff --git a/hpp-affordance-corba/Makefile b/hpp-affordance-corba/Makefile
index 3c8e795a..e386aa91 100644
--- a/hpp-affordance-corba/Makefile
+++ b/hpp-affordance-corba/Makefile
@@ -4,10 +4,11 @@
HPP_PACKAGE= hpp-affordance-corba
HPP_COMMENT= Extract Whole-Body Affordances for Mutli-Contact Planning (CORBA bindings)
-HPP_VERSION= 4.5.0
CATEGORIES= wip
+USE_PYTHON= true
+
include ../../meta-pkgs/hpp/Makefile.common
include ../../wip/hpp-affordance/depend.mk
@@ -26,5 +27,5 @@ include ../../mapping/octomap/depend.mk
include ../../devel/boost-headers/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-affordance-corba/PLIST b/hpp-affordance-corba/PLIST
index 1d095324..eef8e3b2 100644
--- a/hpp-affordance-corba/PLIST
+++ b/hpp-affordance-corba/PLIST
@@ -6,7 +6,7 @@ include/hpp/corbaserver/affordance/deprecated.hh
include/hpp/corbaserver/affordance/fwd.hh
include/hpp/corbaserver/affordance/server.hh
include/hpp/corbaserver/affordance/warning.hh
-lib/libhpp-affordance-corba.so
+lib/hppPlugins/affordance-corba.so
lib/pkgconfig/hpp-affordance-corba.pc
${PYTHON_SITELIB}/hpp/corbaserver/affordance/__init__.py
${PYTHON_SITELIB}/hpp/corbaserver/affordance/affordance.py
diff --git a/hpp-affordance-corba/depend.mk b/hpp-affordance-corba/depend.mk
index aeda13e6..5e36f086 100644
--- a/hpp-affordance-corba/depend.mk
+++ b/hpp-affordance-corba/depend.mk
@@ -11,16 +11,18 @@ endif
ifeq (+,$(HPP_AFFORDANCE_CORBA_DEPEND_MK)) # --------------------------------------
+include ../../mk/sysdep/python.mk
+
PREFER.hpp-affordance-corba?= robotpkg
DEPEND_USE+= hpp-affordance-corba
-DEPEND_ABI.hpp-affordance-corba?= hpp-affordance-corba>=4.3.0
+DEPEND_ABI.hpp-affordance-corba?= ${PKGTAG.python-}hpp-affordance-corba>=4.7.0
DEPEND_DIR.hpp-affordance-corba?= ../../wip/hpp-affordance-corba
SYSTEM_SEARCH.hpp-affordance-corba=\
- include/hpp/corbaserver/affordance/config.hh \
- lib/libhpp-affordance-corba.so \
+ include/hpp/corbaserver/affordance/config.hh \
+ lib/hppPlugins/affordance-corba.so \
'lib/pkgconfig/hpp-affordance-corba.pc:/Version/s/[^0-9.]//gp'
endif # HPP_AFFORDANCE_CORBA_DEPEND_MK --------------------------------------------
diff --git a/hpp-affordance-corba/distinfo b/hpp-affordance-corba/distinfo
index c78dc7e3..9d3d7499 100644
--- a/hpp-affordance-corba/distinfo
+++ b/hpp-affordance-corba/distinfo
@@ -1,4 +1,3 @@
-SHA1 (hpp-affordance-corba-4.5.0.tar.gz) = 4c8269dec95796307079a7dc2b6e2e08460b8e70
-RMD160 (hpp-affordance-corba-4.5.0.tar.gz) = 2bc141b16949fd82234bc1b814de55b2baa8ec0c
-Size (hpp-affordance-corba-4.5.0.tar.gz) = 951237 bytes
-SHA1 (patch-aa) = a38cd4d0527e536d49be7376f3b8a630303d64a8
+SHA1 (hpp-affordance-corba-4.7.0.tar.gz) = 402e2b5b0cda4fc928699c12519071939f780291
+RMD160 (hpp-affordance-corba-4.7.0.tar.gz) = 7389b021bb4a0e83ae4f8f8840a415f87d811364
+Size (hpp-affordance-corba-4.7.0.tar.gz) = 949774 bytes
diff --git a/hpp-affordance-corba/patches/patch-aa b/hpp-affordance-corba/patches/patch-aa
deleted file mode 100644
index a5c8bdda..00000000
--- a/hpp-affordance-corba/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-include pinocchio before boost
-ref https://github.com/stack-of-tasks/pinocchio/issues/849
-
---- src/affordance.impl.cc.orig 2019-04-16 16:02:43.000000000 +0200
-+++ src/affordance.impl.cc 2019-09-17 23:55:48.089288370 +0200
-@@ -10,6 +10,7 @@
-
- #include <iostream>
-
-+#include <pinocchio/fwd.hpp>
- #include <hpp/util/debug.hh>
-
- #include "hpp/affordance/affordance-extraction.hh"
--
GitLab