From bb1fda74e615e0b5578a1c4d0a2ae539651ab09d Mon Sep 17 00:00:00 2001
From: Lily Wang <494550702@qq.com>
Date: Mon, 24 Oct 2022 20:55:44 -0700
Subject: [PATCH 1/3] [ode] Fix error C3861

---
 ports/ode/fix-error-C3861.patch | 20 ++++++++++++++++++++
 ports/ode/portfile.cmake        |  1 +
 ports/ode/vcpkg.json            |  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 ports/ode/fix-error-C3861.patch

diff --git a/ports/ode/fix-error-C3861.patch b/ports/ode/fix-error-C3861.patch
new file mode 100644
index 00000000000000..1b85cb3f32b60e
--- /dev/null
+++ b/ports/ode/fix-error-C3861.patch
@@ -0,0 +1,20 @@
+diff --git a/ou/include/ou/atomic.h b/ou/include/ou/atomic.h
+index 2f90a70..33e0ab9 100644
+--- a/ou/include/ou/atomic.h
++++ b/ou/include/ou/atomic.h
+@@ -397,6 +397,7 @@ END_NAMESPACE_OU();
+ 
+ #include <windows.h>
+ #include <stddef.h>
++#include <intrin.h>
+ 
+ 
+ BEGIN_NAMESPACE_OU();
+@@ -574,7 +575,6 @@ static _OU_ALWAYSINLINE bool _OU_CONVENTION_API
+ 
+ #define __OU_ATOMIC_READREORDERBARRIER_FUNCTION_DEFINED
+ 
+-#include <intrin.h>
+ 
+ static _OU_ALWAYSINLINE void _OU_CONVENTION_API 
+ /*void */AtomicReadReorderBarrier()
diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake
index 9b68b29f711b33..e27605559c6a75 100644
--- a/ports/ode/portfile.cmake
+++ b/ports/ode/portfile.cmake
@@ -4,6 +4,7 @@ vcpkg_from_bitbucket(
     REF 0.16.1
     SHA512 04429cae1b8fc703e53880c5de78293cee46fe4855c96ca7006bd5848255a0df004b75716a6b30ff5176df004e2bec29b2a31d4af8e7ac59da18f0af2eed8396
     HEAD_REF master
+    PATCHES fix-error-C3861.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json
index 32f3365c613d06..1db73af130754b 100644
--- a/ports/ode/vcpkg.json
+++ b/ports/ode/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "ode",
   "version": "0.16.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Open Dynamics Engine",
   "homepage": "https://bitbucket.org/odedevs/ode/src/default/",
+  "license": "BSD-3-Clause OR LGPL-2.1-or-later",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

From f434d33c8f82bf2ed88fa34ff350bcbe772fc45e Mon Sep 17 00:00:00 2001
From: Lily Wang <494550702@qq.com>
Date: Mon, 24 Oct 2022 21:15:20 -0700
Subject: [PATCH 2/3] x-add-version

---
 versions/baseline.json | 2 +-
 versions/o-/ode.json   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 8a1fb05dc71f8c..d58b15b60cffb4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5314,7 +5314,7 @@
     },
     "ode": {
       "baseline": "0.16.1",
-      "port-version": 3
+      "port-version": 4
     },
     "offscale-libetcd-cpp": {
       "baseline": "2019-07-10",
diff --git a/versions/o-/ode.json b/versions/o-/ode.json
index e7cbcc62ea0de6..f4aec95d3225cd 100644
--- a/versions/o-/ode.json
+++ b/versions/o-/ode.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f78f16bb5953f1d0b796d678797123a79ad31bab",
+      "version": "0.16.1",
+      "port-version": 4
+    },
     {
       "git-tree": "8bc51447289df2b0693e433dace17ac0facbeba9",
       "version": "0.16.1",

From c6c9569bbc4a330e0e65368159091055196e267d Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Tue, 25 Oct 2022 21:05:36 -0700
Subject: [PATCH 3/3] Fix broken homepage link and add tests.

---
 ports/ode/portfile.cmake | 7 +++++--
 ports/ode/vcpkg.json     | 2 +-
 versions/o-/ode.json     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake
index e27605559c6a75..893150565d437d 100644
--- a/ports/ode/portfile.cmake
+++ b/ports/ode/portfile.cmake
@@ -4,12 +4,15 @@ vcpkg_from_bitbucket(
     REF 0.16.1
     SHA512 04429cae1b8fc703e53880c5de78293cee46fe4855c96ca7006bd5848255a0df004b75716a6b30ff5176df004e2bec29b2a31d4af8e7ac59da18f0af2eed8396
     HEAD_REF master
-    PATCHES fix-error-C3861.patch
+    PATCHES
+        fix-error-C3861.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS -DODE_WITH_DEMOS=0 -DODE_WITH_TESTS=0
+    OPTIONS
+        -DODE_WITH_DEMOS=0
+        -DODE_WITH_TESTS=0
 )
 
 vcpkg_cmake_install()
diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json
index 1db73af130754b..ed14b02b044bbe 100644
--- a/ports/ode/vcpkg.json
+++ b/ports/ode/vcpkg.json
@@ -3,7 +3,7 @@
   "version": "0.16.1",
   "port-version": 4,
   "description": "Open Dynamics Engine",
-  "homepage": "https://bitbucket.org/odedevs/ode/src/default/",
+  "homepage": "https://bitbucket.org/odedevs/ode/src/master/",
   "license": "BSD-3-Clause OR LGPL-2.1-or-later",
   "dependencies": [
     {
diff --git a/versions/o-/ode.json b/versions/o-/ode.json
index f4aec95d3225cd..33fd9101642393 100644
--- a/versions/o-/ode.json
+++ b/versions/o-/ode.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f78f16bb5953f1d0b796d678797123a79ad31bab",
+      "git-tree": "205b8fbadd2afe4fb17b6f161ead18ec7dd0e735",
       "version": "0.16.1",
       "port-version": 4
     },