diff --git a/devel/ros-urdfdom/Makefile b/devel/ros-urdfdom/Makefile index 75b440ffc339..796d16d7b131 100644 --- a/devel/ros-urdfdom/Makefile +++ b/devel/ros-urdfdom/Makefile @@ -1,29 +1,28 @@ PORTNAME= ros-urdfdom -DISTVERSION= 1.0.4 -PORTREVISION= 1 +DISTVERSION= 3.0.2 CATEGORIES= devel MAINTAINER= trueos@norwegianrockcat.com COMMENT= Unified Robot Description Format (URDF) parsers LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers +BUILD_DEPENDS= ros-urdfdom_headers>=1.0.6:devel/ros-urdfdom_headers LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libconsole_bridge.so:devel/ros-console_bridge -RUN_DEPENDS= ros-urdfdom_headers>0:devel/ros-urdfdom_headers +RUN_DEPENDS= ros-urdfdom_headers>=1.0.6:devel/ros-urdfdom_headers USES= cmake compiler:c++11-lang USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= ros GH_PROJECT= ${PORTNAME:S/ros-//} do-test: # some tests are known to fail: https://github.com/ros/urdfdom/issues/118 @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/devel/ros-urdfdom/distinfo b/devel/ros-urdfdom/distinfo index e160b6dd3d9a..04055c5c5b31 100644 --- a/devel/ros-urdfdom/distinfo +++ b/devel/ros-urdfdom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579889824 -SHA256 (ros-urdfdom-1.0.4_GH0.tar.gz) = 8f3d56b0cbc4b84436d8baf4c8346cd2ee7ffb257bba5ddd9892c41bf516edc4 -SIZE (ros-urdfdom-1.0.4_GH0.tar.gz) = 276958 +TIMESTAMP = 1649418618 +SHA256 (ros-urdfdom-3.0.2_GH0.tar.gz) = 1072b2a304295eb299ed70d99914eb2fbf8843c3257e5e51defc5dd457ee6211 +SIZE (ros-urdfdom-3.0.2_GH0.tar.gz) = 286595 diff --git a/devel/ros-urdfdom/files/patch-CMakeLists.txt b/devel/ros-urdfdom/files/patch-CMakeLists.txt index cdc192da8982..da2ddda5605b 100644 --- a/devel/ros-urdfdom/files/patch-CMakeLists.txt +++ b/devel/ros-urdfdom/files/patch-CMakeLists.txt @@ -1,22 +1,13 @@ ---- CMakeLists.txt.orig 2020-01-17 18:30:42 UTC +--- CMakeLists.txt.orig 2022-03-28 23:52:17 UTC +++ CMakeLists.txt -@@ -41,7 +41,7 @@ if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --find_package(console_bridge 0.3 REQUIRED) -+find_package(console_bridge REQUIRED) - include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) - link_directories(${console_bridge_LIBRARY_DIRS}) - -@@ -56,7 +56,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR +@@ -64,7 +64,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") -enable_testing() +if (BUILD_TESTING) + enable_testing() +endif() - add_subdirectory(urdf_parser) - + if(WIN32 AND NOT CYGWIN) + set(CMAKE_CONFIG_INSTALL_DIR CMake) diff --git a/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt b/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt index d53215f61936..8ebd5278b7e3 100644 --- a/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt +++ b/devel/ros-urdfdom/files/patch-urdf__parser_CMakeLists.txt @@ -1,26 +1,27 @@ ---- urdf_parser/CMakeLists.txt.orig 2018-11-14 01:51:13 UTC +--- urdf_parser/CMakeLists.txt.orig 2022-03-28 23:52:17 UTC +++ urdf_parser/CMakeLists.txt -@@ -25,17 +25,19 @@ add_executable(urdf_to_graphiz src/urdf_ - target_link_libraries(urdf_to_graphiz urdfdom_model) +@@ -93,13 +93,15 @@ target_include_directories(urdf_to_graphviz PUBLIC inc + target_link_libraries(urdf_to_graphviz urdfdom_model) # urdf_mem_test is a binary for testing, not a unit test --add_executable(urdf_mem_test test/memtest.cpp) --target_link_libraries(urdf_mem_test urdfdom_model) +if (BUILD_TESTING) -+ add_executable(urdf_mem_test test/memtest.cpp) -+ target_link_libraries(urdf_mem_test urdfdom_model) + add_executable(urdf_mem_test test/memtest.cpp) + target_include_directories(urdf_mem_test PUBLIC include) + target_link_libraries(urdf_mem_test urdfdom_model) +endif() -include(CTest) if(BUILD_TESTING) + # TODO: check Shane's comment https://github.com/ros/urdfdom/pull/157/files#r664960227 + include(CTest) add_subdirectory(test) endif() - INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) - INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test -+INSTALL(TARGETS check_urdf urdf_to_graphiz - DESTINATION ${CMAKE_INSTALL_BINDIR}) - INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) - INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -108,7 +110,6 @@ INSTALL( + check_urdf + urdf_to_graphiz + urdf_to_graphviz +- urdf_mem_test + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/devel/ros-urdfdom/pkg-plist b/devel/ros-urdfdom/pkg-plist index 828c0207755b..f1c90a1bb5d3 100644 --- a/devel/ros-urdfdom/pkg-plist +++ b/devel/ros-urdfdom/pkg-plist @@ -1,14 +1,19 @@ bin/check_urdf +bin/urdf_to_graphviz bin/urdf_to_graphiz -include/urdf_parser/exportdecl.h -include/urdf_parser/urdf_parser.h +include/urdfdom/urdf_parser/exportdecl.h +include/urdfdom/urdf_parser/urdf_parser.h lib/liburdfdom_model.so -lib/liburdfdom_model.so.1.0 +lib/liburdfdom_model.so.3.0 lib/liburdfdom_model_state.so -lib/liburdfdom_model_state.so.1.0 +lib/liburdfdom_model_state.so.3.0 lib/liburdfdom_sensor.so -lib/liburdfdom_sensor.so.1.0 +lib/liburdfdom_sensor.so.3.0 lib/liburdfdom_world.so -lib/liburdfdom_world.so.1.0 +lib/liburdfdom_world.so.3.0 +lib/urdfdom/cmake/urdfdomExport.cmake lib/urdfdom/cmake/urdfdom-config.cmake +lib/urdfdom/cmake/urdfdomExport-%%CMAKE_BUILD_TYPE%%.cmake libdata/pkgconfig/urdfdom.pc +share/urdfdom/package.xml +