From 5edd7f223f77453a8a264dce2929f3cc478e4d26 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 25 Sep 2019 12:36:17 +0200
Subject: [PATCH] [wip/hpp-bezier-com-traj] Update to v4.7.0
Changes since v4.5.0:
- allow python 3
- fix link with glpk
- reformat
Packaging changes:
- allow python 3
- update DEPEND_ABI to new pkgname
---
hpp-bezier-com-traj/Makefile | 7 ++-----
hpp-bezier-com-traj/PLIST | 2 +-
hpp-bezier-com-traj/depend.mk | 4 +++-
hpp-bezier-com-traj/distinfo | 6 +++---
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hpp-bezier-com-traj/Makefile b/hpp-bezier-com-traj/Makefile
index 799ccdc7..d2cdedf2 100644
--- a/hpp-bezier-com-traj/Makefile
+++ b/hpp-bezier-com-traj/Makefile
@@ -4,13 +4,11 @@
HPP_PACKAGE= hpp-bezier-com-traj
HPP_COMMENT= trajectory generation for the COM with bezier curves
-HPP_VERSION= 4.5.0
CATEGORIES= wip
-DEPEND_ABI.python+= python<3
-
USE_BOOST_LIBS= python
+USE_PYTHON= true
include ../../meta-pkgs/hpp/Makefile.common
@@ -23,7 +21,6 @@ include ../../math/eigen3/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/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-bezier-com-traj/PLIST b/hpp-bezier-com-traj/PLIST
index 505f5522..52c86554 100644
--- a/hpp-bezier-com-traj/PLIST
+++ b/hpp-bezier-com-traj/PLIST
@@ -23,4 +23,4 @@ include/hpp/bezier-com-traj/waypoints/waypoints_c0_dc0_ddc0_ddc1_dc1_c1.hh
include/hpp/bezier-com-traj/waypoints/waypoints_definition.hh
lib/libhpp-bezier-com-traj.so
lib/pkgconfig/hpp-bezier-com-traj.pc
-${PYTHON_SITELIB}/hpp_bezier_com_traj${PYTHON_EXT_SUFFIX}
+${PYTHON_SITELIB}/hpp_bezier_com_traj.so
diff --git a/hpp-bezier-com-traj/depend.mk b/hpp-bezier-com-traj/depend.mk
index 35b342aa..509d67e8 100644
--- a/hpp-bezier-com-traj/depend.mk
+++ b/hpp-bezier-com-traj/depend.mk
@@ -11,11 +11,13 @@ endif
ifeq (+,$(HPP_BEZIER_COM_TRAJ_DEPEND_MK)) # --------------------------------------
+include ../../mk/sysdep/python.mk
+
PREFER.hpp-bezier-com-traj?= robotpkg
DEPEND_USE+= hpp-bezier-com-traj
-DEPEND_ABI.hpp-bezier-com-traj?= hpp-bezier-com-traj>=4.2.0
+DEPEND_ABI.hpp-bezier-com-traj?= ${PKGTAG.python-}hpp-bezier-com-traj>=4.7.0
DEPEND_DIR.hpp-bezier-com-traj?= ../../wip/hpp-bezier-com-traj
SYSTEM_SEARCH.hpp-bezier-com-traj=\
diff --git a/hpp-bezier-com-traj/distinfo b/hpp-bezier-com-traj/distinfo
index 110293c4..85bea591 100644
--- a/hpp-bezier-com-traj/distinfo
+++ b/hpp-bezier-com-traj/distinfo
@@ -1,3 +1,3 @@
-SHA1 (hpp-bezier-com-traj-4.5.0.tar.gz) = b7bf8d361a48e884599b1adffe87e9728a51b2e0
-RMD160 (hpp-bezier-com-traj-4.5.0.tar.gz) = 6d9078a5cea0300b42ca3a7a1050277857fb715d
-Size (hpp-bezier-com-traj-4.5.0.tar.gz) = 845134 bytes
+SHA1 (hpp-bezier-com-traj-4.7.0.tar.gz) = c4e73e4274608bb6f3e3477dead4ff5718e0b1a1
+RMD160 (hpp-bezier-com-traj-4.7.0.tar.gz) = 349fd7c81d89c4631d7383784968fb85051659cc
+Size (hpp-bezier-com-traj-4.7.0.tar.gz) = 844391 bytes
--
GitLab