[wip/{py-,}sot-torque-control] Update to v1.5.2

Changes since v1.5.0:
- fix sot-dynamic-pinocchio python lib use
- fix python3 imports
- CMake: export project and use exports from dependencies
- CMake: keep minimal required instructions

Packaging changes:
- removed patch-aa, applied upstream

py-sot-torque-control/Makefile

@@ -2,18 +2,16 @@
 # Created:			Olivier Stasse on Wed Feb 21 18:07:40 CET 2018
 #
 
-ORG=				stack-of-tasks
-NAME=				sot-torque-control
-VERSION=			1.5.0
+ORG=			stack-of-tasks
+NAME=			sot-torque-control
+VERSION=		1.5.2
 
-CATEGORIES=			wip
-COMMENT=			Torque control for humanoids (python bindings)
-LICENSE=			2-clause-bsd
-MAINTAINER=			gepetto-soft@laas.fr
+CATEGORIES=		wip
+COMMENT=		Torque control for humanoids (python bindings)
 
-CMAKE_ARGS+=			-DqpOASES_PREFIX=${PREFIX.qpoases}
+CMAKE_ARGS+=		-DqpOASES_PREFIX=${PREFIX.qpoases}
 
-USE_PYTHON_ONLY=		true
+USE_PYTHON_ONLY=	true
 
 include ../../${CATEGORIES}/${NAME}/depend.mk
 include ../../devel/jrl-cmakemodules/Makefile.common

py-sot-torque-control/PLIST

@@ -11,6 +11,8 @@ ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/current_controller/__init__.p
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/current_controller/wrap.so
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/ddp_actuator_solver/__init__.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/ddp_actuator_solver/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/ddp_pyrene_actuator_solver/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/ddp_pyrene_actuator_solver/wrap.so
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/device_torque_ctrl/__init__.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/device_torque_ctrl/wrap.so
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/free_flyer_locator/__init__.py
@@ -33,6 +35,8 @@ ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/position_controller/__init__.
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/position_controller/wrap.so
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/se3_trajectory_generator/__init__.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/se3_trajectory_generator/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/simple_inverse_dyn/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/simple_inverse_dyn/wrap.so
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/tests/__init__.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/tests/robot_data_test.py
 ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/tests/test_balance_ctrl_openhrp.py

py-sot-torque-control/distinfo

-SHA1 (sot-torque-control-1.5.0.tar.gz) = 814e4b4804af6a983169c33d05ad5c195277940f
-RMD160 (sot-torque-control-1.5.0.tar.gz) = c24ad9e0b94b37a35feb847dc13fa5e2d86d8638
-Size (sot-torque-control-1.5.0.tar.gz) = 2000390 bytes
-SHA1 (patch-aa) = fdcf7a71bb3f0da8c9fb6ae79d2175057d084eca
+SHA1 (sot-torque-control-1.5.2.tar.gz) = d87430c8940ea34065abc620f9744c94779009c8
+RMD160 (sot-torque-control-1.5.2.tar.gz) = d487bd6a3389751bd80bd50bfe67a5d6e89f5efc
+Size (sot-torque-control-1.5.2.tar.gz) = 2304002 bytes

py-sot-torque-control/patches/patch-aa

---- cmake/find-external/qpOASES/FindqpOASES.cmake.orig	2019-11-25 14:33:39.000000000 +0100
-+++ cmake/find-external/qpOASES/FindqpOASES.cmake	2019-11-26 18:13:48.117466759 +0100
-@@ -27,11 +27,11 @@
- 
- FIND_PATH(qpOASES_INCLUDE_DIR
-   NAMES qpOASES.hpp
--  PATHS ${qpOASES_PREFIX}
-+  PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/include
-   )
- FIND_LIBRARY(qpOASES_LIBRARY
--  NAMES libqpOASES.so
--  PATHS ${qpOASES_PREFIX}
-+  NAMES qpOASES
-+  PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/lib
-   )
- 
- SET(qpOASES_LIBRARIES ${qpOASES_LIBRARY})

sot-torque-control/Makefile

@@ -2,14 +2,12 @@
 # Created:			Olivier Stasse on Wed Feb 21 18:07:40 CET 2018
 #
 
-ORG=				stack-of-tasks
-NAME=				sot-torque-control
-VERSION=			1.5.0
+ORG=			stack-of-tasks
+NAME=			sot-torque-control
+VERSION=		1.5.2
 
-CATEGORIES=			wip
-COMMENT=			Torque control for humanoids
-LICENSE=			2-clause-bsd
-MAINTAINER=			gepetto-soft@laas.fr
+CATEGORIES=		wip
+COMMENT=		Torque control for humanoids
 
 CMAKE_ARGS+=		-DBUILD_PYTHON_INTERFACE=OFF
 CMAKE_ARGS+=		-DqpOASES_PREFIX=${PREFIX.qpoases}

sot-torque-control/PLIST

@@ -25,38 +25,43 @@ include/sot/torque_control/utils/quad-estimator.hh
 include/sot/torque_control/utils/trajectory-generators.hh
 include/sot/torque_control/utils/vector-conversions.hh
 include/sot/torque_control/warning.hh
+lib/cmake/sot-torque-control/sot-torque-controlConfig.cmake
+lib/cmake/sot-torque-control/sot-torque-controlConfigVersion.cmake
+lib/cmake/sot-torque-control/sot-torque-controlTargets-release.cmake
+lib/cmake/sot-torque-control/sot-torque-controlTargets.cmake
+lib/dynamic-graph-plugins/libadmittance-controller.so
+lib/dynamic-graph-plugins/libadmittance-controller.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libbase-estimator.so
+lib/dynamic-graph-plugins/libbase-estimator.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libcontrol-manager.so
+lib/dynamic-graph-plugins/libcontrol-manager.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libcurrent-controller.so
+lib/dynamic-graph-plugins/libcurrent-controller.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libdevice-torque-ctrl.so
+lib/dynamic-graph-plugins/libdevice-torque-ctrl.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libfree-flyer-locator.so
+lib/dynamic-graph-plugins/libfree-flyer-locator.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libimu_offset_compensation.so
+lib/dynamic-graph-plugins/libimu_offset_compensation.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libinverse-dynamics-balance-controller.so
+lib/dynamic-graph-plugins/libinverse-dynamics-balance-controller.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libjoint-torque-controller.so
+lib/dynamic-graph-plugins/libjoint-torque-controller.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libjoint-trajectory-generator.so
+lib/dynamic-graph-plugins/libjoint-trajectory-generator.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libnumerical-difference.so
+lib/dynamic-graph-plugins/libnumerical-difference.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libposition-controller.so
+lib/dynamic-graph-plugins/libposition-controller.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libse3-trajectory-generator.so
+lib/dynamic-graph-plugins/libse3-trajectory-generator.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libsimple-inverse-dyn.so
+lib/dynamic-graph-plugins/libsimple-inverse-dyn.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libtorque-offset-estimator.so
+lib/dynamic-graph-plugins/libtorque-offset-estimator.so.${PKGVERSION}
+lib/dynamic-graph-plugins/libtrace-player.so
+lib/dynamic-graph-plugins/libtrace-player.so.${PKGVERSION}
 lib/libsot-torque-control.so
 lib/libsot-torque-control.so.${PKGVERSION}
 lib/pkgconfig/sot-torque-control.pc
-lib/plugin/admittance-controller.so
-lib/plugin/admittance-controller.so.${PKGVERSION}
-lib/plugin/base-estimator.so
-lib/plugin/base-estimator.so.${PKGVERSION}
-lib/plugin/control-manager.so
-lib/plugin/control-manager.so.${PKGVERSION}
-lib/plugin/current-controller.so
-lib/plugin/current-controller.so.${PKGVERSION}
-lib/plugin/ddp-actuator-solver.so
-lib/plugin/ddp-actuator-solver.so.${PKGVERSION}
-lib/plugin/device-torque-ctrl.so
-lib/plugin/device-torque-ctrl.so.${PKGVERSION}
-lib/plugin/free-flyer-locator.so
-lib/plugin/free-flyer-locator.so.${PKGVERSION}
-lib/plugin/imu_offset_compensation.so
-lib/plugin/imu_offset_compensation.so.${PKGVERSION}
-lib/plugin/inverse-dynamics-balance-controller.so
-lib/plugin/inverse-dynamics-balance-controller.so.${PKGVERSION}
-lib/plugin/joint-torque-controller.so
-lib/plugin/joint-torque-controller.so.${PKGVERSION}
-lib/plugin/joint-trajectory-generator.so
-lib/plugin/joint-trajectory-generator.so.${PKGVERSION}
-lib/plugin/numerical-difference.so
-lib/plugin/numerical-difference.so.${PKGVERSION}
-lib/plugin/position-controller.so
-lib/plugin/position-controller.so.${PKGVERSION}
-lib/plugin/se3-trajectory-generator.so
-lib/plugin/se3-trajectory-generator.so.${PKGVERSION}
-lib/plugin/torque-offset-estimator.so
-lib/plugin/torque-offset-estimator.so.${PKGVERSION}
-lib/plugin/trace-player.so
-lib/plugin/trace-player.so.${PKGVERSION}
+share/sot-torque-control/package.xml

sot-torque-control/distinfo

-SHA1 (sot-torque-control-1.5.0.tar.gz) = 814e4b4804af6a983169c33d05ad5c195277940f
-RMD160 (sot-torque-control-1.5.0.tar.gz) = c24ad9e0b94b37a35feb847dc13fa5e2d86d8638
-Size (sot-torque-control-1.5.0.tar.gz) = 2000390 bytes
-SHA1 (patch-aa) = fdcf7a71bb3f0da8c9fb6ae79d2175057d084eca
+SHA1 (sot-torque-control-1.5.2.tar.gz) = d87430c8940ea34065abc620f9744c94779009c8
+RMD160 (sot-torque-control-1.5.2.tar.gz) = d487bd6a3389751bd80bd50bfe67a5d6e89f5efc
+Size (sot-torque-control-1.5.2.tar.gz) = 2304002 bytes

sot-torque-control/patches/patch-aa

---- cmake/find-external/qpOASES/FindqpOASES.cmake.orig	2019-11-25 14:33:39.000000000 +0100
-+++ cmake/find-external/qpOASES/FindqpOASES.cmake	2019-11-26 18:13:48.117466759 +0100
-@@ -27,11 +27,11 @@
- 
- FIND_PATH(qpOASES_INCLUDE_DIR
-   NAMES qpOASES.hpp
--  PATHS ${qpOASES_PREFIX}
-+  PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/include
-   )
- FIND_LIBRARY(qpOASES_LIBRARY
--  NAMES libqpOASES.so
--  PATHS ${qpOASES_PREFIX}
-+  NAMES qpOASES
-+  PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/lib
-   )
- 
- SET(qpOASES_LIBRARIES ${qpOASES_LIBRARY})