From 32318a227b059a2decb6623a06d066c651141381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20=C3=9E=C3=B3r=20Gunnarsson?= <55136070+CCPNobody@users.noreply.github.com> Date: Wed, 11 Nov 2026 14:21:38 +0000 Subject: [PATCH 1/3] Updating things that fix macos 27.2 development carbon-core 3.0.0 -> 3.2.0 openssl: 1.1.1k#8 -> 3.6.5#2 vcpkg repository updates googletest includes if build_testing is enabled --- trinity/CMakeLists.txt | 1 + trinityal/metal/Tr2VideoAdapterInfoALMetal.mm | 4 ++-- vcpkg-configuration.json | 6 +++--- vcpkg.json | 19 ++++++++++++++----- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 749f5c35c..ddd0f955f 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -2139,6 +2139,7 @@ endif() if(BUILD_TESTING) find_package(GTest CONFIG REQUIRED) + include(GoogleTest) find_package(Python3 COMPONENTS Interpreter REQUIRED) # Find exefile tool, which is used to run the tests diff --git a/trinityal/metal/Tr2VideoAdapterInfoALMetal.mm b/trinityal/metal/Tr2VideoAdapterInfoALMetal.mm index 9ddc26bca..f7f33c7c0 100644 --- a/trinityal/metal/Tr2VideoAdapterInfoALMetal.mm +++ b/trinityal/metal/Tr2VideoAdapterInfoALMetal.mm @@ -114,7 +114,7 @@ io_service_t IOServicePortFromCGDisplayID( CGDirectDisplayID displayID ) io_service_t serv, servicePort = 0; CFMutableDictionaryRef matching = IOServiceMatching( "IODisplayConnect" ); - if( IOServiceGetMatchingServices( kIOMasterPortDefault, matching, &iter ) ) + if( IOServiceGetMatchingServices( MACH_PORT_NULL, matching, &iter ) ) { return 0; } @@ -181,7 +181,7 @@ void RefreshDisplays() if( uint64_t regID = [device respondsToSelector:@selector( registryID )] ? device.registryID : 0 ) { if( io_registry_entry_t entry = - IOServiceGetMatchingService( kIOMasterPortDefault, IORegistryEntryIDMatching( regID ) ) ) + IOServiceGetMatchingService( MACH_PORT_NULL, IORegistryEntryIDMatching( regID ) ) ) { io_registry_entry_t parent; if( IORegistryEntryGetParentEntry( entry, kIOServicePlane, &parent ) == kIOReturnSuccess ) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 99f324bb1..160781f00 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,14 +1,14 @@ { "default-registry": { "kind": "git", - "baseline": "242ac6932a9cd2607332969129e9572516f28d65", + "baseline": "2ec0f1747d8186a5c9babe276e2ad57cd2b12d2a", "repository": "https://github.com/microsoft/vcpkg.git" }, "registries": [ { "kind": "git", + "baseline": "a53c59e7ac0b014a735e4bd945c9078032d53eef", "repository": "https://github.com/carbonengine/vcpkg-registry.git", - "baseline": "a83134805f3fa07da6a6add87c4b250d9778bfd1", "packages": [ "python3", "carbon-*", @@ -31,4 +31,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/vcpkg.json b/vcpkg.json index 952265d73..0d1e19173 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,7 @@ }, { "name": "carbon-core", - "version>=": "3.0.0" + "version>=": "3.2.0" }, { "name": "carbon-destiny", @@ -111,7 +111,7 @@ }, "dx11": { "description": "Create DirectX 11 targets", - "supports": "windows & x64", + "supports": "windows & x64", "dependencies": [ { "name": "directx-dxc", @@ -132,7 +132,11 @@ { "name": "nvidia-streamline", "version>=": "2.8.0", - "features":["dlss-fg","dlss-sr","nis" ] + "features": [ + "dlss-fg", + "dlss-sr", + "nis" + ] } ] }, @@ -163,7 +167,12 @@ { "name": "nvidia-streamline", "version>=": "2.8.0", - "features":["dlss-fg","dlss-sr","nis","reflex" ] + "features": [ + "dlss-fg", + "dlss-sr", + "nis", + "reflex" + ] }, { "name": "intel-xess", @@ -194,7 +203,7 @@ "overrides": [ { "name": "openssl", - "version": "1.1.1k#8" + "version": "3.6.5#2" }, { "name": "libpng", From 9537ed3c33d8e5cc505014c4dedfd502d0b432ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20=C3=9E=C3=B3r=20Gunnarsson?= Date: Thu, 12 Nov 2026 13:57:47 +0000 Subject: [PATCH 2/3] fixes post merge issues --- trinity/CMakeLists.txt | 1 - vcpkg-configuration.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 544cbcf70..48e193da5 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -2139,7 +2139,6 @@ endif() if(BUILD_TESTING) find_package(GTest CONFIG REQUIRED) - include(GoogleTest) find_package(Python3 COMPONENTS Interpreter REQUIRED) include(GoogleTest) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index d23acfc84..4581a7949 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -32,4 +32,4 @@ ] } ] -} +} \ No newline at end of file From 3abe079b671397a92fb2b5dabefba7474a0a7481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20=C3=9E=C3=B3r=20Gunnarsson?= Date: Fri, 13 Nov 2026 12:52:35 +0000 Subject: [PATCH 3/3] Update vcpkg.json reverting the changes made in this branch, as they will get the correct versions now from carbon-blue --- vcpkg.json | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 349eebfa4..4906001b2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,7 @@ }, { "name": "carbon-core", - "version>=": "3.2.0" + "version>=": "3.0.0" }, { "name": "carbon-destiny", @@ -111,7 +111,7 @@ }, "dx11": { "description": "Create DirectX 11 targets", - "supports": "windows & x64", + "supports": "windows & x64", "dependencies": [ { "name": "directx-dxc", @@ -132,11 +132,7 @@ { "name": "nvidia-streamline", "version>=": "2.8.0", - "features": [ - "dlss-fg", - "dlss-sr", - "nis" - ] + "features":["dlss-fg","dlss-sr","nis" ] } ] }, @@ -167,12 +163,7 @@ { "name": "nvidia-streamline", "version>=": "2.8.0", - "features": [ - "dlss-fg", - "dlss-sr", - "nis", - "reflex" - ] + "features":["dlss-fg","dlss-sr","nis","reflex" ] }, { "name": "intel-xess", @@ -201,10 +192,6 @@ } }, "overrides": [ - { - "name": "openssl", - "version": "3.6.5#2" - }, { "name": "imgui", "version": "1.91.9"