From 49ad465adb07f86ec2ef23c4a4366c11f7491ae3 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 11 May 2023 20:09:03 +0300 Subject: [PATCH] update urdfdom (#31335) --- ports/urdfdom/0006-pc_file_for_windows.patch | 17 +++++++++++++++++ ports/urdfdom/portfile.cmake | 5 +++-- ports/urdfdom/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/urdfdom.json | 5 +++++ 5 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 ports/urdfdom/0006-pc_file_for_windows.patch diff --git a/ports/urdfdom/0006-pc_file_for_windows.patch b/ports/urdfdom/0006-pc_file_for_windows.patch new file mode 100644 index 0000000000..83471eedfb --- /dev/null +++ b/ports/urdfdom/0006-pc_file_for_windows.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,11 +89,11 @@ + # Make the package config file +-if (NOT MSVC) ++ + set(PKG_DESC "Unified Robot Description Format") + set(PKG_DEPENDS "urdfdom_headers console_bridge") # make the list separated by spaces instead of ; + set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world") + set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig) +-endif() ++ + diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index 5a2e8a0aef..fdafe4f62d 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom - REF 99ec1f99f2d175f07cc26e63082502ee62982dac # 3.1.0 - SHA512 64bd96c6b56c300b92e2bd6a875c4bc3c4c5d2ee332a75a8d98099aee0db3e9c33fa7d75fdc4d013e7b6ac47296f524ef713639b06e66035135dfc2a8cca0276 + REF ${VERSION} + SHA512 6386954bc7883e82d9db7c785ae074b47ca31efb7cc2686101e7813768824bed5b46a774a1296453c39ff76673a9dc77305bb2ac96b86ecf93fab22062ef2258 HEAD_REF master PATCHES 0001_use_math_defines.patch 0005-fix-config-and-install.patch + 0006-pc_file_for_windows.patch ) vcpkg_cmake_configure( diff --git a/ports/urdfdom/vcpkg.json b/ports/urdfdom/vcpkg.json index 97764859ed..f9ef20c91b 100644 --- a/ports/urdfdom/vcpkg.json +++ b/ports/urdfdom/vcpkg.json @@ -1,6 +1,6 @@ { "name": "urdfdom", - "version": "3.1.0", + "version": "3.1.1", "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.", "homepage": "https://github.com/ros/urdfdom", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index da9d754ef3..ea145d95b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8185,7 +8185,7 @@ "port-version": 0 }, "urdfdom": { - "baseline": "3.1.0", + "baseline": "3.1.1", "port-version": 0 }, "urdfdom-headers": { diff --git a/versions/u-/urdfdom.json b/versions/u-/urdfdom.json index 391d13c438..d31d83fab7 100644 --- a/versions/u-/urdfdom.json +++ b/versions/u-/urdfdom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb1c1a30329b850ac4450d3b1a72166697058bb8", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "35eed492633e8ac2b137093a51d13ad325d9e7c5", "version": "3.1.0",