From c1ff411456ce0f098e6a3f8c17c37833e9f9ef26 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 3 Apr 2025 07:18:56 +0300 Subject: [PATCH] [sdformat] Remove ruby dep (#44790) --- ports/sdformat/portfile.cmake | 4 ---- ports/sdformat/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdformat.json | 5 +++++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/sdformat/portfile.cmake b/ports/sdformat/portfile.cmake index 29d541b4dd..5635b124e8 100644 --- a/ports/sdformat/portfile.cmake +++ b/ports/sdformat/portfile.cmake @@ -11,9 +11,6 @@ vcpkg_from_github( cmake-config.patch ) -# Ruby is required by the sdformat build process -vcpkg_find_acquire_program(RUBY) - # Python is required to generate the EmbeddedSdf.cc file, which contains all the supported SDF # descriptions in a map of strings. The parser.cc file uses EmbeddedSdf.hh. vcpkg_find_acquire_program(PYTHON3) @@ -23,7 +20,6 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "-DRUBY=${RUBY}" -DBUILD_TESTING=OFF -DSKIP_PYBIND11=ON -DUSE_INTERNAL_URDF=OFF diff --git a/ports/sdformat/vcpkg.json b/ports/sdformat/vcpkg.json index b50607e666..9381904b61 100644 --- a/ports/sdformat/vcpkg.json +++ b/ports/sdformat/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdformat", "version": "15.1.1", + "port-version": 1, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 62ceef6c47..02b3a7a7be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8378,7 +8378,7 @@ }, "sdformat": { "baseline": "15.1.1", - "port-version": 0 + "port-version": 1 }, "sdformat13": { "baseline": "13.6.0", diff --git a/versions/s-/sdformat.json b/versions/s-/sdformat.json index 4dc3fd3122..9146dabbff 100644 --- a/versions/s-/sdformat.json +++ b/versions/s-/sdformat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c2bdc4566609875e621f6c4426dcbf06643be25", + "version": "15.1.1", + "port-version": 1 + }, { "git-tree": "0e0f487e837716d50dec32e21e8a8c33a7269eb1", "version": "15.1.1",