From cf6cca6e8154d2a9b8ca713ae05001fb7ef0323f Mon Sep 17 00:00:00 2001
From: toge <toge.mail@gmail.com>
Date: Tue, 10 Jun 2025 08:07:36 +0900
Subject: [PATCH] [box2d] update to 3.1.1 (#45874)

---
 ports/box2d/crt-linkage.diff | 13 -------------
 ports/box2d/portfile.cmake   | 11 ++---------
 ports/box2d/vcpkg.json       |  3 +--
 versions/b-/box2d.json       |  5 +++++
 versions/baseline.json       |  4 ++--
 5 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 ports/box2d/crt-linkage.diff

diff --git a/ports/box2d/crt-linkage.diff b/ports/box2d/crt-linkage.diff
deleted file mode 100644
index 6a708fdf71..0000000000
--- a/ports/box2d/crt-linkage.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b4b62d3..f0ed3f6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,8 +18,6 @@ message(STATUS "CMake C++ compiler: ${CMAKE_CXX_COMPILER_ID}")
- message(STATUS "CMake system name: ${CMAKE_SYSTEM_NAME}")
- message(STATUS "CMake host system processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
- 
--# static link
--set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
- 
- if (MSVC OR APPLE)
- 	option(BOX2D_SANITIZE "Enable sanitizers for some builds" OFF)
diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake
index bb0f16c3e8..88187eacc7 100644
--- a/ports/box2d/portfile.cmake
+++ b/ports/box2d/portfile.cmake
@@ -1,18 +1,11 @@
-vcpkg_download_distfile(
-    werror_patch
-    URLS https://github.com/erincatto/Box2D/commit/0f2b0246f39594e93fcc8dde0fe0bb1b20b403f9.patch?full_index=1
-    SHA512 debe1bae799909ad51a1a69d79843e1d4bfcd86257057de1c09c79479bd5e4714b9ae78e593f854868af568b459a24de29a369d04e6f280fcb233398e486bac3
-    FILENAME erincatto-Box2D-0f2b024.diff
-)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO erincatto/Box2D
     REF v${VERSION}
-    SHA512 85d67a0de92aecc61692d7a6f1a8c7e878cdd2a6457470f1a9be075dfc27fdcefb951ac689d95bb78a7b791d6586f794720af8417f55d7f66782b4c3c179210a
+    SHA512 7367640e7f2ff395b8ca48766c71f57c96e08c298627c996eba76899a149ee28b0e3ecacfa4a224fdb5d160c7e25c6069bb8414fd1575787727d796097aa347b
     HEAD_REF main
     PATCHES
-        ${werror_patch}
-        crt-linkage.diff
         libm.diff
 )
 
diff --git a/ports/box2d/vcpkg.json b/ports/box2d/vcpkg.json
index 2b9472fd6f..854a051ca3 100644
--- a/ports/box2d/vcpkg.json
+++ b/ports/box2d/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "box2d",
-  "version-semver": "3.1.0",
-  "port-version": 1,
+  "version-semver": "3.1.1",
   "description": "An open source C++ engine for simulating rigid bodies in 2D",
   "homepage": "https://box2d.org",
   "supports": "!uwp",
diff --git a/versions/b-/box2d.json b/versions/b-/box2d.json
index 2d7b412f43..9b462649c3 100644
--- a/versions/b-/box2d.json
+++ b/versions/b-/box2d.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "81f894b99ba686f428b3d80e7769ee04f8bf548e",
+      "version-semver": "3.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "ea3872a71bce39d614f49e382dd66eb091387217",
       "version-semver": "3.1.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3b5f24d071..73f6fe1508 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1413,8 +1413,8 @@
       "port-version": 0
     },
     "box2d": {
-      "baseline": "3.1.0",
-      "port-version": 1
+      "baseline": "3.1.1",
+      "port-version": 0
     },
     "braft": {
       "baseline": "2021-26-04",