[bullet3] Update to 3.22 (#23801)

* [bullet3]: Add zlib license to manifest file

* [bullet3] Update to 3.22

Remove both patches which have been merged.

ports/bullet3/portfile.cmake

@@ -3,13 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bulletphysics/bullet3
-    REF 3.17
-    SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
+    REF 3.22
+    SHA512 edacf643ca9621523812effe69a7499716bc65282c58c1f5b4eb4f17b2b1ab55a4f71b06a73483f57e57a5b032c234d09ba5fab9881321f2cbc3c27b43fdc95d
     HEAD_REF master
     PATCHES
         cmake-fix.patch
-        windows-arm64-sse-fix.patch
-        uwp-deltav-fix.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

ports/bullet3/uwp-deltav-fix.patch

@@ -1,26 +0,0 @@
-From 35264f81bb63c4d4e5cf195e3b9db7ea6b761396 Mon Sep 17 00:00:00 2001
-From: Sandy Carter <bwrsandman@gmail.com>
-Date: Sun, 20 Mar 2022 15:46:58 -0400
-Subject: [PATCH] UWP: Fix potentially uninitialized local pointer variable
- error
-
----
- src/BulletSoftBody/btSoftBody.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp
-index 933f3edc5..e91c1b9a4 100644
---- a/src/BulletSoftBody/btSoftBody.cpp
-+++ b/src/BulletSoftBody/btSoftBody.cpp
-@@ -3897,7 +3897,7 @@ void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti)
- 			btVector3 va(0, 0, 0);
- 			btRigidBody* rigidCol = 0;
- 			btMultiBodyLinkCollider* multibodyLinkCol = 0;
--			btScalar* deltaV;
-+			btScalar* deltaV = NULL;
- 
- 			if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY)
- 			{
--- 
-2.35.1
-

ports/bullet3/vcpkg.json

@@ -1,9 +1,9 @@
 {
   "name": "bullet3",
-  "version": "3.17",
-  "port-version": 5,
+  "version": "3.22",
   "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library",
   "homepage": "https://github.com/bulletphysics/bullet3",
+  "license": "Zlib",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

ports/bullet3/windows-arm64-sse-fix.patch

@@ -1,27 +0,0 @@
-From e4414c80232d66f8a250aa83f934594bcba3c605 Mon Sep 17 00:00:00 2001
-From: Sandy <bwrsandman@gmail.com>
-Date: Sun, 20 Mar 2022 15:41:07 -0400
-Subject: [PATCH] Fix compile on windows 64 bit arm architecture
-
-When building 64 bit arm with visual studio, btScalar will try to include SSE headers meant for x86 and x64 architectures.
-This gives the following error in many source files:
-```
-C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\emmintrin.h(20): fatal error C1189: #error:  This header is specific to X86 and X64 targets
-```
----
- src/LinearMath/btScalar.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
-index 28c03b2868..e47baadd6b 100644
---- a/src/LinearMath/btScalar.h
-+++ b/src/LinearMath/btScalar.h
-@@ -107,7 +107,7 @@ inline int btIsDoublePrecision()
-  			#define btFsel(a,b,c) __fsel((a),(b),(c))
- 		#else
- 
--#if defined (_M_ARM)
-+#if defined (_M_ARM) || defined (_M_ARM64)
-             //Do not turn SSE on for ARM (may want to turn on BT_USE_NEON however)
- #elif (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION))
- 

versions/b-/bullet3.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d196c1956b370bd43889ddf5279600092e1af718",
+      "version": "3.22",
+      "port-version": 0
+    },
     {
       "git-tree": "f526f9d9698251590883fcc52ac8bf0f7ef9c5a4",
       "version": "3.17",

versions/baseline.json

@@ -1173,8 +1173,8 @@
       "port-version": 1
     },
     "bullet3": {
-      "baseline": "3.17",
-      "port-version": 5
+      "baseline": "3.22",
+      "port-version": 0
     },
     "bustache": {
       "baseline": "1.1.0",