[wip/{ → py-}sot-talos] Update to v1.1.0

Changes since v1.0.6:
- Python 3 compatibility
- Format

Packaging changes:
- removed patch-aa, applied upstream
- renamed with PKGTAG.python-

Makefile

@@ -103,6 +103,7 @@ SUBDIR+=	py-sot-core-v3
 SUBDIR+=	py-sot-dynamic-pinocchio-v3
 #SUBDIR+=	py-sot-dyninv-v3
 SUBDIR+=	py-sot-pattern-generator-v3
+SUBDIR+=	py-sot-talos
 SUBDIR+=	py-sot-talos-balance
 SUBDIR+=	py-sot-tiago
 SUBDIR+=	py-sot-tools-v3
@@ -138,7 +139,6 @@ SUBDIR+=	soth
 SUBDIR+=	sot-hrp2
 SUBDIR+=	sot-hrp2-v3
 SUBDIR+=	sot-pattern-generator-v3
-SUBDIR+=	sot-talos
 SUBDIR+=	sot-talos-balance
 SUBDIR+=	sot-tools-v3
 SUBDIR+=	sot-torque-control

sot-talos/Makefile → py-sot-talos/Makefile

-# robotpkg Makefile for:	wip/sot-talos
+# robotpkg Makefile for:	wip/py-sot-talos
 # Created:			Olivier Stasse, on Tue. 9th May, 2017
 #
 
 ORG=			stack-of-tasks
 NAME=			sot-talos
-VERSION=		1.0.6
-
-PKGNAME=		${NAME}-${VERSION}
-DISTNAME=		${NAME}-${VERSION}
-DIST_SUBDIR=		${PKGBASE}
-
-HOMEPAGE=		${MASTER_SITE_GITHUB:=${ORG}/${NAME}}
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}
-CHECKOUT_VCS_OPTS+=	--recursive
+VERSION=		1.1.0
 
 CATEGORIES=		wip
 COMMENT=		This packages provides a generic Stack Of Tasks library for the humanoid robot Pyrene.
 LICENSE=		2-clause-bsd
 MAINTAINER=		ostasse@laas.fr
 
-DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
+USE_PYTHON=		true
 
+include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../wip/talos-data/depend.mk
 include ../../wip/py-sot-application-v3/depend.mk
 #include ../../wip/sot-dyninv-v3/depend.mk

sot-talos/PLIST → py-sot-talos/PLIST

@@ -10,7 +10,7 @@ ${PYTHON_SITELIB}/dynamic_graph/sot/pyrene/prologue.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/pyrene/robot.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/talos/__init__.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/talos/sot_talos_device/__init__.py
-${PYTHON_SITELIB}/dynamic_graph/sot/talos/sot_talos_device/wrap${PYTHON_EXT_SUFFIX}
+${PYTHON_SITELIB}/dynamic_graph/sot/talos/sot_talos_device/wrap.so
 ${PYTHON_SITELIB}/dynamic_graph/sot/talos/talos.py
 share/sot-talos/tests/appli.py
 share/sot-talos/tests/katana_holding.py

sot-talos/depend.mk → py-sot-talos/depend.mk

-# robotpkg depend.mk for:	wip/sot-talos
+# robotpkg depend.mk for:	wip/py-sot-talos
 # Created:			Olivier Stasse on Thu 10th May 2017
 #
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-SOT_TALOS_DEPEND_MK:=	${SOT_TALOS_DEPEND_MK}+
+PY_SOT_TALOS_DEPEND_MK:=	${PY_SOT_TALOS_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		sot-talos
+DEPEND_PKG+=		py-sot-talos
 endif
 
-ifeq (+,$(SOT_TALOS_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(PY_SOT_TALOS_DEPEND_MK)) # -------------------------------------------
 
-PREFER.sot-talos?=	robotpkg
+include ../../mk/sysdep/python.mk
 
-SYSTEM_SEARCH.sot-talos=\
+PREFER.py-sot-talos?=	robotpkg
+
+SYSTEM_SEARCH.py-sot-talos=\
 	include/sot-talos/config.hh				\
 	'lib/pkgconfig/sot-talos.pc:/Version/s/[^0-9.]//gp'
 
-DEPEND_USE+=		sot-talos
+DEPEND_USE+=		py-sot-talos
 
-DEPEND_ABI.sot-talos?=	sot-talos>=0.0.1
-DEPEND_DIR.sot-talos?=	../../wip/sot-talos
+DEPEND_ABI.py-sot-talos?=	${PKGTAG.python-}sot-talos>=1.1.0
+DEPEND_DIR.py-sot-talos?=	../../wip/py-sot-talos
 
-endif # SOT_TALOS_DEPEND_MK -------------------------------------------------
+endif # PY_SOT_TALOS_DEPEND_MK -------------------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}

py-sot-talos/distinfo

+SHA1 (sot-talos-1.1.0.tar.gz) = bf78a5bb2c076cba1575d1313fb19a2c69356640
+RMD160 (sot-talos-1.1.0.tar.gz) = c3c7a2f05fbb2438a9afd83c2d8a78da18976558
+Size (sot-talos-1.1.0.tar.gz) = 810645 bytes

sot-talos/distinfo

-SHA1 (sot-talos/sot-talos-1.0.6.tar.gz) = fdc39c672ee267e9b56af074ec2dd95909c2b0d6
-RMD160 (sot-talos/sot-talos-1.0.6.tar.gz) = 0a0dbc81b016b915ec62b3343c39b9d0090f2889
-Size (sot-talos/sot-talos-1.0.6.tar.gz) = 788940 bytes
-SHA1 (patch-aa) = 1916306cf3fd504c3aae9829106e076b2f1a41e4

sot-talos/patches/patch-aa

-include pinocchio before boost
-ref https://github.com/stack-of-tasks/pinocchio/issues/849
-
---- src/sot-talos-device.cpp.orig	2019-03-04 17:58:29.000000000 +0100
-+++ src/sot-talos-device.cpp	2019-09-17 23:51:50.015282049 +0200
-@@ -13,6 +13,7 @@
- 
- #include <fstream>
- #include <map>
-+#include <pinocchio/fwd.hpp>
- 
- #if DEBUG
- #define ODEBUG(x) std::cout << x << std::endl
---- src/sot-talos-controller.cpp.orig	2019-03-04 17:58:29.000000000 +0100
-+++ src/sot-talos-controller.cpp	2019-09-17 23:52:26.486976528 +0200
-@@ -11,6 +11,7 @@
-  *
-  */
- 
-+#include <pinocchio/fwd.hpp>
- #include <sot/core/debug.hh>
- #include <sot/core/exception-abstract.hh>
- #include <dynamic_graph_bridge/ros_init.hh>
---- src/sot-pyrene-controller.cpp.orig	2019-03-04 17:58:29.000000000 +0100
-+++ src/sot-pyrene-controller.cpp	2019-09-17 23:52:53.806747699 +0200
-@@ -10,6 +10,7 @@
-  *
-  */
- 
-+#include <pinocchio/fwd.hpp>
- #include <sot/core/debug.hh>
- 
- /* Pyrene is the first TALOS */

talos-dev/Makefile

@@ -11,6 +11,7 @@ COMMENT=	Talos dev Software
 META_PACKAGE=	yes
 
 include ../../interfaces/humanoid-nav-msgs/depend.mk
+include ../../wip/py-sot-talos/depend.mk
 include ../../wip/prf-gazebo-ros-pkgs/depend.mk
 include ../../wip/sot-talos/depend.mk
 include ../../wip/talos-metapkg-ros-control-sot/depend.mk