From ffa02f660ed5ddeac492f9a9f04706e0f7093ede Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 26 Sep 2019 18:40:08 +0200
Subject: [PATCH] [wip/hpp-baxter] Update to v4.7.0
Changes since v4.5.0:
- [urdf] Rename some links and joints so that they have different names.
- Fix compatibility with Python 3.
---
hpp-baxter/Makefile | 6 +++---
hpp-baxter/depend.mk | 4 +++-
hpp-baxter/distinfo | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hpp-baxter/Makefile b/hpp-baxter/Makefile
index 8e262296..98c284fe 100644
--- a/hpp-baxter/Makefile
+++ b/hpp-baxter/Makefile
@@ -4,7 +4,6 @@
HPP_PACKAGE= hpp-baxter
HPP_COMMENT= Wrappers for Baxter robot in HPP
-HPP_VERSION= 4.5.0
ROSNAME= $(subst -,_,${HPP_PACKAGE})
@@ -12,6 +11,8 @@ CATEGORIES= wip
DYNAMIC_PLIST_DIRS+= share/doc/${ROSNAME}
+USE_PYTHON= true
+
include ../../meta-pkgs/hpp/Makefile.common
include ../../wip/ros-baxter-common/depend.mk
@@ -19,7 +20,6 @@ include ../../wip/ros-baxter-common/depend.mk
include ../../mapping/octomap/depend.mk
include ../../path/hpp-corbaserver/depend.mk
-include ../../mk/sysdep/python.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-baxter/depend.mk b/hpp-baxter/depend.mk
index 0a6002ae..9693002f 100644
--- a/hpp-baxter/depend.mk
+++ b/hpp-baxter/depend.mk
@@ -11,11 +11,13 @@ endif
ifeq (+,$(HPP_BAXTER_DEPEND_MK)) # --------------------------------------
+include ../../mk/sysdep/python.mk
+
PREFER.hpp-baxter?= robotpkg
DEPEND_USE+= hpp-baxter
-DEPEND_ABI.hpp-baxter?= hpp-baxter>=4.3.0
+DEPEND_ABI.hpp-baxter?= ${PKGTAG.python-}hpp-baxter>=4.7.0
DEPEND_DIR.hpp-baxter?= ../../wip/hpp-baxter
SYSTEM_SEARCH.hpp-baxter=\
diff --git a/hpp-baxter/distinfo b/hpp-baxter/distinfo
index dcb575ef..efe75823 100644
--- a/hpp-baxter/distinfo
+++ b/hpp-baxter/distinfo
@@ -1,3 +1,3 @@
-SHA1 (hpp-baxter-4.5.0.tar.gz) = 8d90c97a3b884439108b85a63fbf9a9da77f1d59
-RMD160 (hpp-baxter-4.5.0.tar.gz) = 3aa26524b5440a7bc28005574bf6c28656ba2eec
-Size (hpp-baxter-4.5.0.tar.gz) = 783464 bytes
+SHA1 (hpp-baxter-4.7.0.tar.gz) = 99310c903f59058eb4218c379d6a3b7c81ab975b
+RMD160 (hpp-baxter-4.7.0.tar.gz) = 2da553cb50710170cabccaa4b8a69f395c08d76c
+Size (hpp-baxter-4.7.0.tar.gz) = 784944 bytes
--
GitLab