[sdformat13] Update to 13.6.0 (#37814)

This commit is contained in:
MonicaLiu 2024-03-29 17:21:28 -07:00 committed by GitHub
parent 81fdedc662
commit dc2a506555
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 11 deletions

View File

@ -9,11 +9,11 @@ index d1b3db53..9a9ce91d 100644
-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}"
diff --git a/src/SDF.cc b/src/SDF.cc
index 20dcd4c6..802cbde3 100644
index 07056d7..57e8a2c 100644
--- a/src/SDF.cc
+++ b/src/SDF.cc
@@ -97,22 +97,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath,
filename = filename.substr(idx + sep.length());
@@ -108,24 +108,8 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath,
}
}
- // Next check the install path.
@ -32,7 +32,9 @@ index 20dcd4c6..802cbde3 100644
- return path;
- }
-
// Next check to see if the given file exists.
- path = filename;
+ std::string path = filename;
// Finally check to see if the given file exists.
- path = filename;
+ std::string path = filename;
if (sdf::filesystem::exists(path))
{
return path;

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gazebosim/sdformat
REF "sdformat13_${VERSION}"
SHA512 adc555527aadaede84d6fde11555bf4872028d9e895fc47c89f4077452fde9a52b233d60d0cbff5a098e261c7810aa2dc38a6275ec9f37ba4d0161af98e2aade
SHA512 10c56fab3957fff759c3ff7db401e162c5d353221e3895617182031be41e10a5234607fb7d1afb0ec453f3e1f20ddcc36b8488ed3d1cc2d1d0e915fc3a74ddbd
HEAD_REF sdf13
PATCHES
no-absolute.patch

View File

@ -1,7 +1,6 @@
{
"name": "sdformat13",
"version": "13.5.0",
"port-version": 1,
"version": "13.6.0",
"description": "Simulation Description Format (SDF) parser and description files.",
"homepage": "http://sdformat.org/",
"license": "Apache-2.0",

View File

@ -7885,8 +7885,8 @@
"port-version": 4
},
"sdformat13": {
"baseline": "13.5.0",
"port-version": 1
"baseline": "13.6.0",
"port-version": 0
},
"sdformat6": {
"baseline": "6.2.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9fd5b67f5e6c73b950fcb1b9e3bb6d9fd369dee4",
"version": "13.6.0",
"port-version": 0
},
{
"git-tree": "88424090fdd3b2122094e75be5c68b3f2f58cda5",
"version": "13.5.0",