Skip to content

Commit

Permalink
[math/{py-,}pinocchio] Update to v3.3.1
Browse files Browse the repository at this point in the history
    ## 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
  • Loading branch information
nim65s committed Dec 19, 2024
1 parent ca11de8 commit 570a9a4
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 28 deletions.
2 changes: 1 addition & 1 deletion math/pinocchio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ORG= stack-of-tasks
NAME= pinocchio
VERSION= 3.3.0
VERSION= 3.3.1

CATEGORIES= math
COMMENT= Efficient rigid body dynamics
Expand Down
6 changes: 3 additions & 3 deletions math/pinocchio/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SHA1 (pinocchio-3.3.0.tar.gz) = 77a89c217c29b3c015854915ef35abaadd4f8e3a
RMD160 (pinocchio-3.3.0.tar.gz) = 1e5a8adcd3d1155f958d559b3d0c113fe82dfeea
Size (pinocchio-3.3.0.tar.gz) = 100959520 bytes
SHA1 (pinocchio-3.3.1.tar.gz) = 570f1175bd913a53ffa96f0bb5af7bb1d0409301
RMD160 (pinocchio-3.3.1.tar.gz) = 55e6a5e92939662ddc85124554860bbe3d4ddc4f
Size (pinocchio-3.3.1.tar.gz) = 100953407 bytes
SHA1 (patch-ao) = 82388cd763283a6d70581fdabcd1ae1035046ab8
2 changes: 1 addition & 1 deletion math/py-pinocchio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ORG= stack-of-tasks
NAME= pinocchio
VERSION= 3.3.0
VERSION= 3.3.1

CATEGORIES= math
COMMENT= Efficient rigid body dynamics (python bindings)
Expand Down
8 changes: 4 additions & 4 deletions math/py-pinocchio/distinfo
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SHA1 (pinocchio-3.3.0.tar.gz) = 77a89c217c29b3c015854915ef35abaadd4f8e3a
RMD160 (pinocchio-3.3.0.tar.gz) = 1e5a8adcd3d1155f958d559b3d0c113fe82dfeea
Size (pinocchio-3.3.0.tar.gz) = 100959520 bytes
SHA1 (patch-ag) = 35b62ca6bd5676f51a5bef1d4a98c74113ca6a03
SHA1 (pinocchio-3.3.1.tar.gz) = 570f1175bd913a53ffa96f0bb5af7bb1d0409301
RMD160 (pinocchio-3.3.1.tar.gz) = 55e6a5e92939662ddc85124554860bbe3d4ddc4f
Size (pinocchio-3.3.1.tar.gz) = 100953407 bytes
SHA1 (patch-ag) = b8373c27d76d50c91283e034420f879a9ebfef96
SHA1 (patch-ah) = 365652d212fc8b2e82c7fee33818d08541491893
SHA1 (patch-ak) = 1b574fd9ee9107009a8d23b9ce9f94bac356bff4
SHA1 (patch-al) = 35d232f6e5f416848aa5f7444c882bb3ddddea04
48 changes: 29 additions & 19 deletions math/py-pinocchio/patches/patch-ag
Original file line number Diff line number Diff line change
@@ -1,63 +1,73 @@
py-pinocchio needs pinocchio

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

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

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

if(NOT unit_test_HEADER_ONLY)
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_default)
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_default)
endif()

if(unit_test_PARSERS OR (unit_test_PARSERS_OPTIONAL AND TARGET ${PROJECT_NAME}_parsers))
- if(unit_test_PARSERS OR (unit_test_PARSERS_OPTIONAL AND TARGET ${PROJECT_NAME}_parsers))
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_parsers)
+ if(unit_test_PARSERS OR (unit_test_PARSERS_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_parsers))
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_parsers)
endif()

if(unit_test_PARALLEL OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
- if(unit_test_PARALLEL OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_parallel)
+ if(unit_test_PARALLEL OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_parallel))
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_parallel)
endif()

if(unit_test_COLLISION OR (unit_test_COLLISION_OPTIONAL AND TARGET ${PROJECT_NAME}_collision))
- if(unit_test_COLLISION OR (unit_test_COLLISION_OPTIONAL AND TARGET ${PROJECT_NAME}_collision))
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_collision)
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision)
if(unit_test_PARALLE OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
- if(unit_test_PARALLE OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel))
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_collision_parallel)
+ if(unit_test_COLLISION OR (unit_test_COLLISION_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_collision))
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision)
+ if(unit_test_PARALLE OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_parallel))
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision_parallel)
endif()
endif()

if(unit_test_EXTRA OR (unit_test_EXTRA_OPTIONAL AND TARGET ${PROJECT_NAME}_extra))
- if(unit_test_EXTRA OR (unit_test_EXTRA_OPTIONAL AND TARGET ${PROJECT_NAME}_extra))
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_extra)
+ if(unit_test_EXTRA OR (unit_test_EXTRA_OPTIONAL AND TARGET ${PROJECT_NAME}::${PROJECT_NAME}_extra))
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_extra)
endif()

modernize_target_link_libraries(
--- examples/CMakeLists.txt.orig 2024-08-27 18:45:25.000000000 +0200
+++ examples/CMakeLists.txt 2024-08-29 15:22:20.099674281 +0200
if(unit_test_PYTHON_PARSER)
- target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_python_parser)
+ target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_python_parser)
add_windows_dll_path_to_test(${TEST_NAME})
get_test_property(${TEST_NAME} ENVIRONMENT ENV_VARIABLES)
compute_pythonpath(PYTHON_ENV_VARIABLES "bindings/python")
--- examples/CMakeLists.txt.orig 2024-12-13 15:26:59.000000000 +0100
+++ examples/CMakeLists.txt 2024-12-18 22:01:17.227045938 +0100
@@ -14,22 +14,22 @@
get_filename_component(EXAMPLE_NAME ${EXAMPLE} NAME)
set(EXAMPLE_NAME "${PROJECT_NAME}-example-cpp-${EXAMPLE_NAME}")
Expand Down

0 comments on commit 570a9a4

Please sign in to comment.