From cf95c8a3c81b18c23f698133d37c3a7a3f2096f3 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Fri, 12 Jan 2024 23:31:14 -0800 Subject: [PATCH] Update to vcpkg tag 2024.01.12 This includes OpenSSL 3.2.0, so we can stop pinning an old 3.0.x version (because 3.1.x had bugs on macOS AArch64 that are solved in 3.2.0). --- vcpkg | 2 +- vcpkg.json | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/vcpkg b/vcpkg index a42af01b72..53bef8994c 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit a42af01b72c28a8e1d7b48107b33e4f286a55ef6 +Subproject commit 53bef8994c541b6561884a8395ea35715ece75db diff --git a/vcpkg.json b/vcpkg.json index ddfe06d95e..a6dcc14130 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -37,11 +37,6 @@ "zlib" ], "overrides": [ - { - "name": "openssl", - "version": "3.0.8#2", - "$comment": "OpenSSL 3.1.x has a bug on arm64 macOS that causes crashes in debug builds. Use 3.0.x for now." - }, { "name": "physx", "version": "4.1.2#6", @@ -59,7 +54,7 @@ ] } }, - "builtin-baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6", + "builtin-baseline": "53bef8994c541b6561884a8395ea35715ece75db", "vcpkg-configuration": { "overlay-ports": ["./Scripts/Ports"], "overlay-triplets": ["./Scripts/Triplets"]