<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/db2d5171db0a9fe4448f2d1ab90f156c4e20e4da">https://github.com/macports/macports-ports/commit/db2d5171db0a9fe4448f2d1ab90f156c4e20e4da</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new db2d5171db0 qt6-qtbase: Patch for building on MacOS 10.14 SDK (#21970)
</span>db2d5171db0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit db2d5171db0a9fe4448f2d1ab90f156c4e20e4da
</span>Author: Phil Krylov <phil@krylov.eu>
AuthorDate: Fri Dec 29 14:28:13 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> qt6-qtbase: Patch for building on MacOS 10.14 SDK (#21970)
</span>---
aqua/qt6/files/patch-qtbase-macos_10.14_sdk.diff | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-qtbase-macos_10.14_sdk.diff b/aqua/qt6/files/patch-qtbase-macos_10.14_sdk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 480b6bbce06..d7dff97cf3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/files/patch-qtbase-macos_10.14_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/files/patch-qtbase-macos_10.14_sdk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,16 +37,17 @@ Upstream-Status: Inappropriate [violates DRY]
</span> driverInfoStruct.deviceType = QRhiDriverInfo::ExternalDevice;
break;
default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -403,7 +403,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -403,7 +403,9 @@
</span> caps.maxTextureSize = 16384;
caps.baseVertexAndInstance = true;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
</span> if (@available(macOS 10.15, *))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- caps.isAppleGPU = [d->dev supportsFamily:MTLGPUFamilyApple7];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ caps.isAppleGPU = [d->dev supportsFamily:MTLGPUFamily(1007)]; // MTLGPUFamilyApple7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ caps.isAppleGPU = [d->dev supportsFamily:MTLGPUFamilyApple7];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span> caps.maxThreadGroupSize = 1024;
#elif defined(Q_OS_TVOS)
if ([d->dev supportsFeatureSet: MTLFeatureSet(30003)]) // MTLFeatureSet_tvOS_GPUFamily2_v1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2543,6 +2543,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2543,6 +2545,26 @@
</span> return srgb ? MTLPixelFormatASTC_12x10_sRGB : MTLPixelFormatASTC_12x10_LDR;
case QRhiTexture::ASTC_12x12:
return srgb ? MTLPixelFormatASTC_12x12_sRGB : MTLPixelFormatASTC_12x12_LDR;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,3 +96,17 @@ Upstream-Status: Inappropriate [violates DRY]
</span> #else
desc.storageMode = MTLStorageModeMemoryless;
d->format = MTLPixelFormatDepth32Float_Stencil8;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qcocoascreen.mm.orig 2023-02-14 09:26:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qcocoascreen.mm 2023-12-28 11:31:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -271,9 +271,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float refresh = CGDisplayModeGetRefreshRate(displayMode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_refreshRate = refresh > 0 ? refresh : 60.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.15, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_name = QString::fromNSString(nsScreen.localizedName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_name = displayName(m_displayId);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const bool didChangeGeometry = m_geometry != previousGeometry || m_availableGeometry != previousAvailableGeometry;
</span></pre><pre style='margin:0'>
</pre>