Skip to content

Commit 570a9a4

Browse files
nim65snim65s
committed
[math/{py-,}pinocchio] Update to v3.3.1
 ## What's Changed ### Added - Add `pinocchio_python_parser` target (stack-of-tasks/pinocchio#2475) ### Fixed - Fix mjcf parsing of armature and of the default tag in models (stack-of-tasks/pinocchio#2477) - Fix undefined behavior when using the site attribute in mjcf (stack-of-tasks/pinocchio#2477) - Fix the type of image paths when loading textures in the meshcat visualizer (stack-of-tasks/pinocchio#2478) - Fix meshcat examples (stack-of-tasks/pinocchio#2503) - Fix `pinocchio-test-cpp-parallel-geometry` when built with Coal (stack-of-tasks/pinocchio#2502) - Fix scaling support for meshcat (stack-of-tasks/pinocchio#2511) ### Changed - On GNU/Linux and macOS, hide all symbols by default (stack-of-tasks/pinocchio#2469) **Full Changelog**: stack-of-tasks/pinocchio@v3.3.0...v3.3.1
1 parent ca11de8 commit 570a9a4

File tree

5 files changed

+38
-28
lines changed

5 files changed

+38
-28
lines changed

‎math/pinocchio/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
ORG= stack-of-tasks
66
NAME= pinocchio
7-
VERSION= 3.3.0
7+
VERSION= 3.3.1
88

99
CATEGORIES= math
1010
COMMENT= Efficient rigid body dynamics

‎math/pinocchio/distinfo

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SHA1 (pinocchio-3.3.0.tar.gz) = 77a89c217c29b3c015854915ef35abaadd4f8e3a
2-
RMD160 (pinocchio-3.3.0.tar.gz) = 1e5a8adcd3d1155f958d559b3d0c113fe82dfeea
3-
Size (pinocchio-3.3.0.tar.gz) = 100959520 bytes
1+
SHA1 (pinocchio-3.3.1.tar.gz) = 570f1175bd913a53ffa96f0bb5af7bb1d0409301
2+
RMD160 (pinocchio-3.3.1.tar.gz) = 55e6a5e92939662ddc85124554860bbe3d4ddc4f
3+
Size (pinocchio-3.3.1.tar.gz) = 100953407 bytes
44
SHA1 (patch-ao) = 82388cd763283a6d70581fdabcd1ae1035046ab8

‎math/py-pinocchio/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
ORG= stack-of-tasks
66
NAME= pinocchio
7-
VERSION= 3.3.0
7+
VERSION= 3.3.1
88

99
CATEGORIES= math
1010
COMMENT= Efficient rigid body dynamics (python bindings)

‎math/py-pinocchio/distinfo

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
SHA1 (pinocchio-3.3.0.tar.gz) = 77a89c217c29b3c015854915ef35abaadd4f8e3a
2-
RMD160 (pinocchio-3.3.0.tar.gz) = 1e5a8adcd3d1155f958d559b3d0c113fe82dfeea
3-
Size (pinocchio-3.3.0.tar.gz) = 100959520 bytes
4-
SHA1 (patch-ag) = 35b62ca6bd5676f51a5bef1d4a98c74113ca6a03
1+
SHA1 (pinocchio-3.3.1.tar.gz) = 570f1175bd913a53ffa96f0bb5af7bb1d0409301
2+
RMD160 (pinocchio-3.3.1.tar.gz) = 55e6a5e92939662ddc85124554860bbe3d4ddc4f
3+
Size (pinocchio-3.3.1.tar.gz) = 100953407 bytes
4+
SHA1 (patch-ag) = b8373c27d76d50c91283e034420f879a9ebfef96
55
SHA1 (patch-ah) = 365652d212fc8b2e82c7fee33818d08541491893
66
SHA1 (patch-ak) = 1b574fd9ee9107009a8d23b9ce9f94bac356bff4
77
SHA1 (patch-al) = 35d232f6e5f416848aa5f7444c882bb3ddddea04

‎math/py-pinocchio/patches/patch-ag

+29-19
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,73 @@
11
py-pinocchio needs pinocchio
22

3-
--- CMakeLists.txt.orig 2024-08-27 16:45:25.000000000 +0000
4-
+++ CMakeLists.txt 2024-08-29 13:19:21.747133530 +0000
5-
@@ -192,6 +192,7 @@
3+
--- CMakeLists.txt.orig 2024-12-13 15:26:59.000000000 +0100
4+
+++ CMakeLists.txt 2024-12-18 21:57:22.735116788 +0100
5+
@@ -211,6 +211,7 @@
66
# ----------------------------------------------------
77
set(CMAKE_MODULE_PATH "${JRL_CMAKE_MODULES}/find-external/CppAD/" ${CMAKE_MODULE_PATH})
88
add_project_dependency(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.5")
99
+add_project_dependency(${PROJECT_NAME} REQUIRED)
1010

1111
if(BUILD_WITH_URDF_SUPPORT)
1212
add_project_dependency(urdfdom_headers REQUIRED)
13-
--- bindings/python/CMakeLists.txt.orig 2024-08-27 18:45:25.000000000 +0200
14-
+++ bindings/python/CMakeLists.txt 2024-08-29 15:19:55.570423979 +0200
15-
@@ -75,7 +75,7 @@
13+
--- bindings/python/CMakeLists.txt.orig 2024-12-13 15:26:59.000000000 +0100
14+
+++ bindings/python/CMakeLists.txt 2024-12-18 21:58:36.608002007 +0100
15+
@@ -84,7 +84,7 @@
1616
${PYTHON_LIB_NAME}
1717
SCOPE PUBLIC
1818
TARGETS eigenpy::eigenpy)
1919
- target_link_libraries(${PYTHON_LIB_NAME} PUBLIC ${PROJECT_NAME})
20-
+ target_link_libraries(${PYTHON_LIB_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME})
20+
+ target_link_libraries(${PYTHON_LIB_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME})
2121

2222
if(BUILD_WITH_URDF_SUPPORT)
2323
# Link directly against console_bridge since we bind some enums and call
24-
--- unittest/CMakeLists.txt.orig 2024-08-27 18:45:25.000000000 +0200
25-
+++ unittest/CMakeLists.txt 2024-08-29 15:21:21.067157905 +0200
26-
@@ -71,26 +71,26 @@
24+
--- unittest/CMakeLists.txt.orig 2024-12-13 15:26:59.000000000 +0100
25+
+++ unittest/CMakeLists.txt 2024-12-18 22:00:33.727302710 +0100
26+
@@ -72,30 +72,30 @@
2727
target_include_directories(${TEST_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
2828

2929
if(NOT unit_test_HEADER_ONLY)
3030
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_default)
3131
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_default)
3232
endif()
3333

34-
if(unit_test_PARSERS OR (unit_test_PARSERS_OPTIONAL AND TARGET ${PROJECT_NAME}_parsers))
34+
- if(unit_test_PARSERS OR (unit_test_PARSERS_OPTIONAL AND TARGET ${PROJECT_NAME}_parsers))
3535
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_parsers)
36+
+ if(unit_test_PARSERS OR (unit_test_PARSERS_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_parsers))
3637
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_parsers)
3738
endif()
3839

39-
if(unit_test_PARALLEL OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
40+
- if(unit_test_PARALLEL OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
4041
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_parallel)
42+
+ if(unit_test_PARALLEL OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_parallel))
4143
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_parallel)
4244
endif()
4345

44-
if(unit_test_COLLISION OR (unit_test_COLLISION_OPTIONAL AND TARGET ${PROJECT_NAME}_collision))
46+
- if(unit_test_COLLISION OR (unit_test_COLLISION_OPTIONAL AND TARGET ${PROJECT_NAME}_collision))
4547
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_collision)
46-
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision)
47-
if(unit_test_PARALLE OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
48+
- if(unit_test_PARALLE OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
4849
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_collision_parallel)
50+
+ if(unit_test_COLLISION OR (unit_test_COLLISION_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_collision))
51+
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision)
52+
+ if(unit_test_PARALLE OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_parallel))
4953
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision_parallel)
5054
endif()
5155
endif()
5256

53-
if(unit_test_EXTRA OR (unit_test_EXTRA_OPTIONAL AND TARGET ${PROJECT_NAME}_extra))
57+
- if(unit_test_EXTRA OR (unit_test_EXTRA_OPTIONAL AND TARGET ${PROJECT_NAME}_extra))
5458
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_extra)
59+
+ if(unit_test_EXTRA OR (unit_test_EXTRA_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_extra))
5560
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_extra)
5661
endif()
5762

58-
modernize_target_link_libraries(
59-
--- examples/CMakeLists.txt.orig 2024-08-27 18:45:25.000000000 +0200
60-
+++ examples/CMakeLists.txt 2024-08-29 15:22:20.099674281 +0200
63+
if(unit_test_PYTHON_PARSER)
64+
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_python_parser)
65+
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_python_parser)
66+
add_windows_dll_path_to_test(${TEST_NAME})
67+
get_test_property(${TEST_NAME} ENVIRONMENT ENV_VARIABLES)
68+
compute_pythonpath(PYTHON_ENV_VARIABLES "bindings/python")
69+
--- examples/CMakeLists.txt.orig 2024-12-13 15:26:59.000000000 +0100
70+
+++ examples/CMakeLists.txt 2024-12-18 22:01:17.227045938 +0100
6171
@@ -14,22 +14,22 @@
6272
get_filename_component(EXAMPLE_NAME ${EXAMPLE} NAME)
6373
set(EXAMPLE_NAME "${PROJECT_NAME}-example-cpp-${EXAMPLE_NAME}")

0 commit comments

Comments
 (0)