Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update macOS for January 2025 #43509

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ports/angelscript/avoid-atomic-deprecation-macos-15.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/angelscript/source/as_atomic.cpp b/angelscript/source/as_atomic.cpp
index c74cd4d..65ca563 100644
--- a/angelscript/source/as_atomic.cpp
+++ b/angelscript/source/as_atomic.cpp
@@ -157,6 +157,8 @@ END_AS_NAMESPACE
#include <libkern/OSAtomic.h>
BEGIN_AS_NAMESPACE

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
int asAtomicInc(int &value)
{
return OSAtomicIncrement32((int32_t*)&value);
@@ -166,6 +168,7 @@ int asAtomicDec(int &value)
{
return OSAtomicDecrement32((int32_t*)&value);
}
+#pragma clang diagnostic pop

#else

1 change: 1 addition & 0 deletions ports/angelscript/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_extract_source_archive(
PATCHES
mark-threads-private.patch
fix-dependency.patch
avoid-atomic-deprecation-macos-15.diff
)

vcpkg_cmake_configure(
Expand Down
1 change: 1 addition & 0 deletions ports/angelscript/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "angelscript",
"version": "2.37.0",
"port-version": 1,
"description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.",
"homepage": "https://angelcode.com/angelscript",
"license": "Zlib",
Expand Down
44 changes: 44 additions & 0 deletions ports/awlib/fix-macos-15-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
diff --git a/io/include/aw/io/mmap_file.h b/io/include/aw/io/mmap_file.h
index 9846973..65e82aa 100644
--- a/io/include/aw/io/mmap_file.h
+++ b/io/include/aw/io/mmap_file.h
@@ -83,18 +83,18 @@ using win32::file_mapping;
inline file_mode get_file_mode(map_perms perms)
{
using mp = map_perms;
- switch (perms) {
- case mp::none:
- case mp::none|mp::exec:
+ switch (static_cast<unsigned>(perms)) {
+ case static_cast<unsigned>(mp::none):
+ case static_cast<unsigned>(mp::none|mp::exec):
return file_mode::none;
- case mp::read:
- case mp::read|mp::exec:
+ case static_cast<unsigned>(mp::read):
+ case static_cast<unsigned>(mp::read|mp::exec):
return file_mode::read;
- case mp::write:
+ case static_cast<unsigned>(mp::write):
return file_mode::write;
- case mp::write|mp::exec:
- case mp::rdwr:
- case mp::rdwr|mp::exec:
+ case static_cast<unsigned>(mp::write|mp::exec):
+ case static_cast<unsigned>(mp::rdwr):
+ case static_cast<unsigned>(mp::rdwr|mp::exec):
return file_mode::read|file_mode::write;
}

diff --git a/types/include/aw/types/byte_buffer.h b/types/include/aw/types/byte_buffer.h
index 82f4693..b38c46a 100644
--- a/types/include/aw/types/byte_buffer.h
+++ b/types/include/aw/types/byte_buffer.h
@@ -8,6 +8,7 @@
*/
#ifndef aw_types_byte_buffer_h
#define aw_types_byte_buffer_h
+#include <cstdlib>
#include <memory>
namespace aw {
/**
4 changes: 3 additions & 1 deletion ports/awlib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF ${VERSION}
SHA512 bfb4668abc3db176744bb674a20bf770c6406db522a14191069b8d833414285ca784f042c3ad50404f7f8bc76afe69627dfcf540080e12316abbbfe420955526
HEAD_REF master
PATCHES
fix-macos-15-build.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand All @@ -20,7 +22,7 @@ vcpkg_cmake_configure(

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH lib/cmake/${PORT})
vcpkg_cmake_config_fixup(PACKAGE_NAME "${PORT}" CONFIG_PATH "lib/cmake/${PORT}")

vcpkg_fixup_pkgconfig()

Expand Down
1 change: 1 addition & 0 deletions ports/awlib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "awlib",
"version-date": "2024-04-06",
"port-version": 1,
"description": "Cross-platform utility library",
"homepage": "https://github.com/absurdworlds/awlib",
"license": "LGPL-3.0-or-later",
Expand Down
20 changes: 20 additions & 0 deletions ports/juce/avoid-macos-15-deprecations.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/modules/juce_gui_basics/native/juce_PerScreenDisplayLinks_mac.h b/modules/juce_gui_basics/native/juce_PerScreenDisplayLinks_mac.h
index 4562abf..8b1883b 100644
--- a/modules/juce_gui_basics/native/juce_PerScreenDisplayLinks_mac.h
+++ b/modules/juce_gui_basics/native/juce_PerScreenDisplayLinks_mac.h
@@ -23,6 +23,9 @@
==============================================================================
*/

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
namespace juce
{

@@ -302,3 +305,5 @@ private:
};

} // namespace juce
+
+#pragma clang diagnostic pop
1 change: 1 addition & 0 deletions ports/juce/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ vcpkg_from_github(
missing-modules.diff
prefer-cmake.diff
vcpkg-compile-definitions.diff
avoid-macos-15-deprecations.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/modules/juce_audio_devices/native/oboe")

Expand Down
2 changes: 1 addition & 1 deletion ports/juce/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "juce",
"version": "8.0.4",
"port-version": 1,
"port-version": 2,
"description": "Open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, AAX and LV2 audio plug-ins and plug-in hosts",
"homepage": "https://juce.com",
"license": null,
Expand Down
69 changes: 69 additions & 0 deletions ports/msquic/avoid-w-invalid-unevaluated-string.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
diff --git a/src/core/mtu_discovery.c b/src/core/mtu_discovery.c
index a40c05c..8891efc 100644
--- a/src/core/mtu_discovery.c
+++ b/src/core/mtu_discovery.c
@@ -34,8 +34,8 @@ Abstract:
#include "mtu_discovery.c.clog.h"
#endif

-CXPLAT_STATIC_ASSERT(CXPLAT_MAX_MTU >= QUIC_DPLPMTUD_DEFAULT_MAX_MTU, L"Default max must not be more than max");
-CXPLAT_STATIC_ASSERT(QUIC_DPLPMTUD_MIN_MTU <= QUIC_DPLPMTUD_DEFAULT_MIN_MTU, L"Default min must not be less than min");
+CXPLAT_STATIC_ASSERT(CXPLAT_MAX_MTU >= QUIC_DPLPMTUD_DEFAULT_MAX_MTU, "Default max must not be more than max");
+CXPLAT_STATIC_ASSERT(QUIC_DPLPMTUD_MIN_MTU <= QUIC_DPLPMTUD_DEFAULT_MIN_MTU, "Default min must not be less than min");

_IRQL_requires_max_(PASSIVE_LEVEL)
static
diff --git a/src/core/packet_builder.h b/src/core/packet_builder.h
index 97d6079..912ce89 100644
--- a/src/core/packet_builder.h
+++ b/src/core/packet_builder.h
@@ -158,7 +158,7 @@ typedef struct QUIC_PACKET_BUILDER {

CXPLAT_STATIC_ASSERT(
sizeof(QUIC_PACKET_BUILDER) < 1024,
- L"Packet builder should be small enough to fit on the stack.");
+ "Packet builder should be small enough to fit on the stack.");

//
// Initializes the packet builder for general use.
diff --git a/src/core/quicdef.h b/src/core/quicdef.h
index 219ef33..07956b5 100644
--- a/src/core/quicdef.h
+++ b/src/core/quicdef.h
@@ -240,10 +240,10 @@ typedef struct QUIC_RX_PACKET QUIC_RX_PACKET;
#define QUIC_MAX_RANGE_ACK_PACKETS 0x800 // 2048
#define QUIC_MAX_RANGE_DECODE_ACKS 0x1000 // 4096

-CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_ALLOC_SIZE), L"Must be power of two");
-CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_DUPLICATE_PACKETS), L"Must be power of two");
-CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_ACK_PACKETS), L"Must be power of two");
-CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_DECODE_ACKS), L"Must be power of two");
+CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_ALLOC_SIZE), "Must be power of two");
+CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_DUPLICATE_PACKETS), "Must be power of two");
+CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_ACK_PACKETS), "Must be power of two");
+CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(QUIC_MAX_RANGE_DECODE_ACKS), "Must be power of two");

//
// Minimum MTU allowed to be configured. Must be able to fit a
@@ -300,7 +300,7 @@ CXPLAT_STATIC_ASSERT(QUIC_INITIAL_PACKET_LENGTH >= QUIC_MIN_INITIAL_PACKET_LENGT

CXPLAT_STATIC_ASSERT(
QUIC_DEFAULT_DISCONNECT_TIMEOUT <= QUIC_MAX_DISCONNECT_TIMEOUT,
- L"Default disconnect timeout should always be less than max");
+ "Default disconnect timeout should always be less than max");

//
// The default connection idle timeout (in milliseconds).
diff --git a/src/core/range.h b/src/core/range.h
index b6d2cc0..ca6d3cd 100644
--- a/src/core/range.h
+++ b/src/core/range.h
@@ -21,7 +21,7 @@ typedef struct QUIC_SUBRANGE {

} QUIC_SUBRANGE;

-CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(sizeof(QUIC_SUBRANGE)), L"Must be power of two");
+CXPLAT_STATIC_ASSERT(IS_POWER_OF_TWO(sizeof(QUIC_SUBRANGE)), "Must be power of two");

typedef struct QUIC_RANGE_SEARCH_KEY {

1 change: 1 addition & 0 deletions ports/msquic/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ vcpkg_from_github(
uwp-link-libs.diff
exports-for-msh3.diff
no-werror.patch
avoid-w-invalid-unevaluated-string.patch
)

set(QUIC_TLS "schannel")
Expand Down
2 changes: 1 addition & 1 deletion ports/msquic/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "msquic",
"version": "2.4.7",
"port-version": 2,
"port-version": 3,
"description": "Cross-platform, C implementation of the IETF QUIC protocol",
"homepage": "https://github.com/microsoft/msquic",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ jobs:
- template: osx/azure-pipelines.yml
parameters:
jobName: x64_osx
poolName: 'PrOsx-2024-07-12'
poolName: 'PrOsx-2025-01-24'
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
tripletPattern: ${{ parameters.tripletPattern }}

- template: osx/azure-pipelines.yml
parameters:
jobName: arm64_osx
poolName: 'PrOsx-2024-07-12-arm64'
poolName: 'PrOsx-2025-01-24-arm64'
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
tripletPattern: ${{ parameters.tripletPattern }}

Expand Down
Loading
Loading