Update macOS SDK/CI

- Upgraded to Qt 5.16.19 + patches
- Made the CI script more modular

Author: rodlie

src/scripts/build_mac_ci.sh

@@ -25,35 +25,61 @@ REL=${REL:-"OFF"}
 BRANCH=${BRANCH:-`git rev-parse --abbrev-ref HEAD`}
 COMMIT=${COMMIT:-`git rev-parse --short=8 HEAD`}
 CUSTOM=${CUSTOM:-"CI"}
+BUILD_ARM=${BUILD_ARM:-1}
+BUILD_INTEL=${BUILD_INTEL:-1}
+BUILD_UNIVERSAL=${BUILD_UNIVERSAL:-1}
 
-SDK=1.0.0
-SDK_REV=r5
-SDK_URL=https://github.com/friction2d/friction-sdk/releases/download/v${SDK}
-SDK_TAR=friction-sdk-${SDK}${SDK_REV}-macOS.tar.xz
-SDK_SHA256=36a30cb68862d3cd0fe39f9c283f1a9fb9cf2ea01a9dfc65c85024b0c2171d2d
-
-if [ ! -d "${CWD}/sdk" ]; then
-    curl -OL ${SDK_URL}/${SDK_TAR}
-    echo "${SDK_SHA256}  ${SDK_TAR}" | shasum -a 256 --check
-    tar xf ${SDK_TAR}
+if [ "${BUILD_UNIVERSAL}" = 1 ]; then
+    BUILD_ARM=1
+    BUILD_INTEL=1
 fi
 
-git submodule update --init --recursive
+SDK_PATH=${CWD}/sdk
+SDK_VERSION=1.0.0
+SDK_REV=r6
+SDK_URL=https://github.com/friction2d/friction-sdk/releases/download/v${SDK_VERSION}
+SDK_BASE=friction-sdk-${SDK_VERSION}${SDK_REV}-macOS
+SDK_ARM_TAR=${SDK_BASE}-arm64.tar.xz
+SDK_INTEL_TAR=${SDK_BASE}-x86_64.tar.xz
+SDK_ARM_SHA256=46a6e44b5d55f681f9dbddaa321635bfbc18cd080a649e48029d6b28cb41ad85
+SDK_INTEL_SHA256=c25c2a220a6f801edde67b2ce6aca3564ff7a0f7e0c00e35bac7878f1632d560
 
-export CUSTOM=CI
-export REL=$REL
+if [ ! -d "${SDK_PATH}" ]; then
+    mkdir -p "${SDK_PATH}"
+    if [ "${BUILD_ARM}" = 1 ]; then
+        curl -OL ${SDK_URL}/${SDK_ARM_TAR}
+        echo "${SDK_ARM_SHA256}  ${SDK_ARM_TAR}" | shasum -a 256 --check
+        (cd "${SDK_PATH}" ; tar xf ${CWD}/${SDK_ARM_TAR} )
+    fi
+    if [ "${BUILD_INTEL}" = 1 ]; then
+        curl -OL ${SDK_URL}/${SDK_INTEL_TAR}
+        echo "${SDK_INTEL_SHA256}  ${SDK_INTEL_TAR}" | shasum -a 256 --check
+        (cd "${SDK_PATH}" ; tar xf ${CWD}/${SDK_INTEL_TAR} )
+    fi
+fi
 
-cd ${CWD}
-arch -x86_64 ./src/scripts/build_mac.sh
+git submodule update --init --recursive
 
-cd ${CWD}
-./src/scripts/build_mac.sh
+export CUSTOM=${CUSTOM}
+export REL=${REL}
+export BRANCH=${BRANCH}
+export COMMIT=${COMMIT}
 
-cd ${CWD}
+if [ "${BUILD_INTEL}" = 1 ]; then
+    cd "${CWD}"
+    arch -x86_64 ./src/scripts/build_mac.sh
+fi
 
-VERSION=`cat build-release-arm64/version.txt`
-if [ "${REL}" != "ON" ]; then
-    VERSION="${VERSION}-${COMMIT}"
+if [ "${BUILD_ARM}" = 1 ]; then
+    cd "${CWD}"
+    ./src/scripts/build_mac.sh
 fi
 
-VERSION=${VERSION} ./src/scripts/build_mac_universal.sh
+if [ "${BUILD_UNIVERSAL}" = 1 ]; then
+    cd "${CWD}"
+    VERSION=`cat build-release-arm64/version.txt`
+    if [ "${REL}" != "ON" ]; then
+        VERSION="${VERSION}-${COMMIT}"
+    fi
+    VERSION=${VERSION} ./src/scripts/build_mac_universal.sh
+fi

src/scripts/build_mac_sdk.sh

@@ -30,7 +30,7 @@ NASM_V=2.14.02
 YASM_V=1.3.0
 PKGCONF_V=1.1.0
 
-QT_V=5.15.18_20251101_d8220074
+QT_V=5.15.19_20260520_aa749695
 QSCINTILLA_V=2.14.1
 
 LAME_V=3.100

src/scripts/patches/qtbase-macos-versions.diff

@@ -1,9 +1,11 @@
---- qtbase/src/corelib/global/qglobal.cpp.orig	2025-06-11 18:07:02
-+++ qtbase/src/corelib/global/qglobal.cpp	2025-06-11 18:09:20
-@@ -2137,6 +2137,12 @@
+--- qtbase/src/corelib/global/qglobal.cpp.orig	2026-06-25 19:19:06
++++ qtbase/src/corelib/global/qglobal.cpp	2026-06-25 19:23:11
+@@ -2137,6 +2137,14 @@
  static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSystemVersion::current())
  {
  #ifdef Q_OS_MACOS
++    if (version.majorVersion() == 17 || version.majorVersion() == 27)
++        return "Golden Gate";
 +    if (version.majorVersion() == 16 || version.majorVersion() == 26)
 +        return "Tahoe";
 +    if (version.majorVersion() == 15)