[gz-sim] Update to 9.6.0 (#53553)

ports/gz-sim/cmake-project-include.cmake

@@ -1,13 +1,13 @@
-if(MSVC)
-    set(CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}")
-else()
-    include(CheckLinkerFlag)
-    check_linker_flag(CXX "LINKER:--no-keep-memory" HAVE_NO_KEEP_MEMORY)
-    if(HAVE_NO_KEEP_MEMORY)
-        add_link_options("$<$<LINK_LANGUAGE:CXX>:LINKER:--no-keep-memory>")
-    endif()
-    check_linker_flag(CXX "LINKER:-Bsymbolic" HAVE_BSYMBOLIC)
-    if(HAVE_BSYMBOLIC)
-        add_link_options("$<$<LINK_LANGUAGE:CXX>:LINKER:-Bsymbolic>")
-    endif()
-endif()
+if(MSVC)
+    set(CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}")
+else()
+    include(CheckLinkerFlag)
+    check_linker_flag(CXX "LINKER:--no-keep-memory" HAVE_NO_KEEP_MEMORY)
+    if(HAVE_NO_KEEP_MEMORY)
+        add_link_options("$<$<LINK_LANGUAGE:CXX>:LINKER:--no-keep-memory>")
+    endif()
+    check_linker_flag(CXX "LINKER:-Bsymbolic" HAVE_BSYMBOLIC)
+    if(HAVE_BSYMBOLIC)
+        add_link_options("$<$<LINK_LANGUAGE:CXX>:LINKER:-Bsymbolic>")
+    endif()
+endif()

ports/gz-sim/portfile.cmake

@@ -1,41 +1,41 @@
-# This port is not tested in vcpkg's curated registry due to excessive memory consumption
-# that cause reliability problems for other customers.
-# It must be checked manually after updates.
-string(REGEX MATCH "^[0-9]+" VERSION_MAJOR "${VERSION}")
-set(PACKAGE_NAME gazebo)
-
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-
-ignition_modular_library(
-   NAME "${PACKAGE_NAME}"
-   REF "${PORT}${VERSION_MAJOR}_${VERSION}"
-   VERSION "${VERSION}"
-   SHA512 45125f324d65114264bb57afb99b11f3dab6110f95dad673ec992735c1c958b8fff2daefe90465b3b731499adac8a7e8e790c2a8cbf1e1d73a75ad8362ea4d43
-   OPTIONS
-      -DSKIP_PYBIND11=ON
-      "-DPython3_EXECUTABLE=${PYTHON3}"
-      "-DCMAKE_PROJECT_INCLUDE=${CURRENT_PORT_DIR}/cmake-project-include.cmake"
-   PATCHES
-      dependencies.patch
-)
-
-IF(EXISTS "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/")
-   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/" "${CURRENT_PACKAGES_DIR}/plugins/${PORT}-${VERSION_MAJOR}/")
-endif()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/")
-   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins")
-   file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/" "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}-${VERSION_MAJOR}/")
-endif()
-
-if(VCPKG_TARGET_IS_WINDOWS)
-   file(GLOB BIN_DLLS "${CURRENT_PACKAGES_DIR}/lib/${PORT}${VERSION_MAJOR}-*.dll")
-   file(GLOB BIN_DEBUG_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}${VERSION_MAJOR}-*.dll")
-
-   file(COPY ${BIN_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/")
-   file(COPY ${BIN_DEBUG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/")
-
-   file(REMOVE_RECURSE ${BIN_DLLS} ${BIN_DEBUG_DLLS})
-endif()
+# This port is not tested in vcpkg's curated registry due to excessive memory consumption
+# that cause reliability problems for other customers.
+# It must be checked manually after updates.
+string(REGEX MATCH "^[0-9]+" VERSION_MAJOR "${VERSION}")
+set(PACKAGE_NAME gazebo)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+
+ignition_modular_library(
+   NAME "${PACKAGE_NAME}"
+   REF "${PORT}${VERSION_MAJOR}_${VERSION}"
+   VERSION "${VERSION}"
+   SHA512 81739e8ec0a954ce2470f3994502bafac8a288bf105d3108b955c7812b3788aa032b17d0e75bd6a2d524fcb0914de9449043af1ef24d21d69374f83b2ede55c6
+   OPTIONS
+      -DSKIP_PYBIND11=ON
+      "-DPython3_EXECUTABLE=${PYTHON3}"
+      "-DCMAKE_PROJECT_INCLUDE=${CURRENT_PORT_DIR}/cmake-project-include.cmake"
+   PATCHES
+      dependencies.patch
+)
+
+IF(EXISTS "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/")
+   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins")
+   file(RENAME "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/" "${CURRENT_PACKAGES_DIR}/plugins/${PORT}-${VERSION_MAJOR}/")
+endif()
+
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/")
+   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins")
+   file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/" "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}-${VERSION_MAJOR}/")
+endif()
+
+if(VCPKG_TARGET_IS_WINDOWS)
+   file(GLOB BIN_DLLS "${CURRENT_PACKAGES_DIR}/lib/${PORT}${VERSION_MAJOR}-*.dll")
+   file(GLOB BIN_DEBUG_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}${VERSION_MAJOR}-*.dll")
+
+   file(COPY ${BIN_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/")
+   file(COPY ${BIN_DEBUG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/")
+
+   file(REMOVE_RECURSE ${BIN_DLLS} ${BIN_DEBUG_DLLS})
+endif()

ports/gz-sim/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "gz-sim",
-  "version": "9.5.0",
-  "port-version": 2,
+  "version": "9.6.0",
   "description": "Gazebo Sim is an open source robotics simulator.",
   "homepage": "https://gazebosim.org/libs/sim",
   "license": "Apache-2.0",

versions/baseline.json

@@ -3729,8 +3729,8 @@
       "port-version": 1
     },
     "gz-sim": {
-      "baseline": "9.5.0",
-      "port-version": 2
+      "baseline": "9.6.0",
+      "port-version": 0
     },
     "gz-tools": {
       "baseline": "2.0.3",

versions/g-/gz-sim.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cf229d405a2c903c71f143ae2c0e8adf5e89419e",
+      "version": "9.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9920e012d9466909fa51e303ad117c5cbb0f8e53",
       "version": "9.5.0",