From 15f8235edb8fcf41f92cdb6de901540181f7a4ef Mon Sep 17 00:00:00 2001
From: SunBlack <SunBlack@users.noreply.github.com>
Date: Sun, 30 Aug 2026 20:53:06 +0200
Subject: [PATCH] [gz-physics] Update to 8.4.0 (#53545)

---
 ports/gz-physics/portfile.cmake | 52 ++++++++++++++++-----------------
 ports/gz-physics/vcpkg.json     |  3 +-
 versions/baseline.json          |  4 +--
 versions/g-/gz-physics.json     |  5 ++++
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/ports/gz-physics/portfile.cmake b/ports/gz-physics/portfile.cmake
index 9431ff8913..97992997b7 100644
--- a/ports/gz-physics/portfile.cmake
+++ b/ports/gz-physics/portfile.cmake
@@ -1,26 +1,26 @@
-string(REGEX MATCH "^[0-9]+" VERSION_MAJOR "${VERSION}")
-string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE "${PORT}")
-set(PACKAGE_NAME "${CMAKE_MATCH_1}")
-
-ignition_modular_library(
-   NAME "${PACKAGE_NAME}"
-   REF "${PORT}${VERSION_MAJOR}_${VERSION}"
-   VERSION "${VERSION}"
-   SHA512 a3c8d28e552ae1f4d0fa1639638c862a09324dda484f95c9c6edf5a77eeb37528e84d53e22e59a6e27ab5229ea1fd94cf45ccfb6b53ac759aad12c40e4fe6bd9
-   PATCHES
-      dependencies.patch
-)
-
-if(VCPKG_TARGET_IS_WINDOWS)   
-   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
-   if (NOT plugins STREQUAL "")
-      file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
-      file(REMOVE ${plugins})
-   endif()
-
-   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
-   if (NOT plugins_debug STREQUAL "")
-      file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
-      file(REMOVE ${plugins_debug})
-   endif()
-endif()
+string(REGEX MATCH "^[0-9]+" VERSION_MAJOR "${VERSION}")
+string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE "${PORT}")
+set(PACKAGE_NAME "${CMAKE_MATCH_1}")
+
+ignition_modular_library(
+   NAME "${PACKAGE_NAME}"
+   REF "${PORT}${VERSION_MAJOR}_${VERSION}"
+   VERSION "${VERSION}"
+   SHA512 41192ce9dc3fef34ea94e4b969f662960e2b381f95e2b102efbbb368d6a49bf4f901a9cff6e5dcdfe54e109f9aae4917e69126463b5b14260a260811dc113a36
+   PATCHES
+      dependencies.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)   
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
+   if (NOT plugins STREQUAL "")
+      file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
+      file(REMOVE ${plugins})
+   endif()
+
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}-${VERSION_MAJOR}/engine-plugins/*.dll")
+   if (NOT plugins_debug STREQUAL "")
+      file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
+      file(REMOVE ${plugins_debug})
+   endif()
+endif()
diff --git a/ports/gz-physics/vcpkg.json b/ports/gz-physics/vcpkg.json
index 1b35d4e975..8702ae6b2a 100644
--- a/ports/gz-physics/vcpkg.json
+++ b/ports/gz-physics/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gz-physics",
-  "version": "8.3.0",
-  "port-version": 1,
+  "version": "8.4.0",
   "description": "component of Gazebo, provides an abstract physics interface designed to support simulation and rapid development of robot applications.",
   "homepage": "https://gazebosim.org/libs/physics",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5bf97fe1e3..44afb6f762 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3713,8 +3713,8 @@
       "port-version": 0
     },
     "gz-physics": {
-      "baseline": "8.3.0",
-      "port-version": 1
+      "baseline": "8.4.0",
+      "port-version": 0
     },
     "gz-plugin": {
       "baseline": "3.1.0",
diff --git a/versions/g-/gz-physics.json b/versions/g-/gz-physics.json
index 9f1b6caa18..820ee2d47a 100644
--- a/versions/g-/gz-physics.json
+++ b/versions/g-/gz-physics.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2a7e23c121652532afa26b2f120a62ffa1a87751",
+      "version": "8.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "180cfdbe9baa6a8e358c45f17529412f76f169c4",
       "version": "8.3.0",