Merge branch 'main' into v1.0.0-rc.4-dev

rodlie · rodlie · commit 9a77c55b842d · 2026-06-28T19:25:21.000+02:00
diff --git a/src/scripts/build.sh b/src/scripts/build.sh
@@ -30,6 +30,6 @@ HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 REL=${REL:-0}
 DOWNLOAD_SDK=${DOWNLOAD_SDK:-1}
 SDK_VERSION=${SDK_VERSION:-"1.0.0"}
-SDK_REV=${SDK_REV:-"r11"}
+SDK_REV=${SDK_REV:-"r13"}
 
 SDK_VERSION=${SDK_VERSION} SDK_REV=${SDK_REV} DOWNLOAD_SDK=${DOWNLOAD_SDK} HEAD_REPO_URL=${HEAD_REPO_URL} LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} CUSTOM=${CUSTOM} ./src/scripts/run_docker.sh
diff --git a/src/scripts/build_mac_ci.sh b/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
diff --git a/src/scripts/build_mac_sdk.sh b/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
diff --git a/src/scripts/build_vfxplatform.sh b/src/scripts/build_vfxplatform.sh
@@ -35,7 +35,7 @@ TAR_VERSION=${TAR_VERSION:-""}
 HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 
 SDK_VERSION=${SDK_VERSION:-"1.0.0"}
-SDK_REV=${SDK_REV:-"r11"}
+SDK_REV=${SDK_REV:-"r13"}
 SDK_URL=${SDK_URL:-"https://github.com/friction2d/friction-sdk/releases/download/v${SDK_VERSION}"}
 SDK_FILE=${SDK_FILE:-"friction-sdk-${SDK_VERSION}${SDK_REV}-linux-x86_64.tar"}
 SDK_PATH="${DISTFILES}/sdk/${SDK_FILE}"
diff --git a/src/scripts/build_vfxplatform_sdk03.sh b/src/scripts/build_vfxplatform_sdk03.sh
@@ -36,9 +36,7 @@ LAME_V=3.100
 VPX_V=1.8.2
 OGG_V=1.3.5
 VORBIS_V=1.3.7
-THEORA_V=1.1.1
-XVID_V=1.3.4
-LSMASH_V=2.14.5
+OPUS_V=1.3.1
 X264_V=20180806-2245
 X265_V=3.5
 AOM_V=3.6.1
@@ -163,49 +161,20 @@ if [ ! -f "${SDK}/lib/libvorbis.so" ]; then
     make install
 fi # libvorbis
 
-# libtheora
-if [ ! -f "${SDK}/lib/libtheora.so" ]; then
+# opus
+if [ ! -f "${SDK}/lib/libopus.so" ]; then
     cd ${SRC}
-    THEORA_SRC=libtheora-${THEORA_V}
-    rm -rf ${THEORA_SRC} || true
-    tar xf ${DIST}/ffmpeg/${THEORA_SRC}.tar.gz
-    cd ${THEORA_SRC}
+    OPUS_SRC=opus-${OPUS_V}
+    rm -rf ${OPUS_SRC} || true
+    tar xf ${DIST}/ffmpeg/${OPUS_SRC}.tar.gz
+    cd ${OPUS_SRC}
     CFLAGS="${DEFAULT_CFLAGS}" \
     CXXFLAGS="${DEFAULT_CFLAGS}" \
     LDFLAGS="${DEFAULT_LDFLAGS}" \
-    ./configure ${DEFAULT_CONFIGURE} --disable-examples --disable-sdltest
+    ./configure ${DEFAULT_CONFIGURE} --disable-docs --disable-extra-programs
     make -j${MKJOBS}
     make install
-fi # libtheora
-
-# xvidcore
-if [ ! -f "${SDK}/lib/libxvidcore.so" ]; then
-    cd ${SRC}
-    rm -rf xvidcore || true
-    tar xf ${DIST}/ffmpeg/xvidcore-${XVID_V}.tar.gz
-    cd xvidcore/build/generic
-    CFLAGS="${DEFAULT_CFLAGS}" \
-    CXXFLAGS="${DEFAULT_CFLAGS}" \
-    LDFLAGS="${DEFAULT_LDFLAGS}" \
-    ./configure ${COMMON_CONFIGURE}
-    make -j${MKJOBS}
-    make install
-fi # xvidcore
-
-# liblsmash
-if [ ! -f "${SDK}/lib/liblsmash.so" ]; then
-    cd ${SRC}
-    LSMASH_SRC=l-smash-${LSMASH_V}
-    rm -rf ${LSMASH_SRC} || true
-    tar xf ${DIST}/ffmpeg/liblsmash-v${LSMASH_V}.tar.gz
-    cd ${LSMASH_SRC}
-    CFLAGS="${DEFAULT_CFLAGS}" \
-    CXXFLAGS="${DEFAULT_CFLAGS}" \
-    LDFLAGS="${DEFAULT_LDFLAGS}" \
-    ./configure ${DEFAULT_CONFIGURE}
-    make -j${MKJOBS}
-    make install
-fi # liblsmash
+fi # opus
 
 # x264
 if [ ! -f "${SDK}/lib/libx264.so" ]; then
@@ -283,38 +252,57 @@ if [ ! -f "${SDK}/lib/pkgconfig/libavcodec.pc" ]; then
     CXXFLAGS="${DEFAULT_CFLAGS}" \
     LDFLAGS="${DEFAULT_LDFLAGS}" \
     ./configure ${SHARED_CONFIGURE} \
+    --extra-version=friction \
+    --disable-network \
+    --disable-protocols \
+    --disable-devices \
+    --disable-hwaccels \
+    --disable-doc \
+    --disable-debug \
+    --disable-securetransport \
+    --disable-videotoolbox \
+    --disable-openssl \
+    --disable-gnutls \
+    --disable-sdl2 \
     --disable-xlib \
     --disable-libxcb \
     --disable-libv4l2 \
     --disable-alsa \
-    --disable-network \
-    --disable-programs \
-    --disable-debug \
-    --disable-doc \
-    --enable-avresample \
-    --enable-gpl \
-    --enable-version3 \
-    --extra-version=friction \
     --disable-avisynth \
-    --disable-gnutls \
     --disable-libass \
     --disable-libbluray \
     --disable-libbs2b \
     --disable-libcaca \
-    --enable-libmp3lame \
     --disable-libopencore-amrnb \
     --disable-libopencore-amrwb \
-    --disable-libopus \
     --disable-libspeex \
-    --enable-libtheora \
     --disable-libvidstab \
     --disable-libvo-amrwbenc \
-    --enable-libvorbis \
-    --enable-libvpx \
+    --disable-libtheora \
+    --disable-libxvid \
+    --disable-demuxers \
+    --disable-muxers \
+    --disable-decoders \
+    --disable-encoders \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-avresample \
+    --enable-protocol=file \
+    --enable-libopus \
     --enable-libx264 \
-    --enable-libaom \
     --enable-libx265 \
-    --enable-libxvid
+    --enable-libvpx \
+    --enable-libaom \
+    --enable-libmp3lame \
+    --enable-libvorbis \
+    --enable-demuxer=aac,avi,flac,gif,image2,matroska,mov,mp3,mp4,ogg,wav,webm \
+    --enable-muxer=aac,flac,gif,image2,matroska,mov,mp3,mp4,ogg,wav,webm \
+    --enable-decoder=libaom_av1,gif,h264,hevc,mjpeg,mpeg4,png,prores,prores_ks,rawvideo,tiff,vp8,vp9 \
+    --enable-decoder=aac,flac,mp3,opus,vorbis \
+    --enable-decoder=pcm_f32le,pcm_s16le,pcm_s24le \
+    --enable-encoder=libaom_av1,gif,libx264,libx264rgb,libx265,mjpeg,png,mpeg4,prores,prores_ks,rawvideo,tiff,libvpx_vp8,libvpx_vp9 \
+    --enable-encoder=aac,flac,libmp3lame,libopus,libvorbis \
+    --enable-encoder=pcm_f32le,pcm_s16le,pcm_s24le
      make -j${MKJOBS}
      make install
 fi # ffmpeg
diff --git a/src/scripts/patches/qtbase-macos-versions.diff b/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)
diff --git a/src/scripts/run_docker.sh b/src/scripts/run_docker.sh
@@ -30,7 +30,7 @@ ONLY_SDK=${ONLY_SDK:-0}
 LOCAL_BUILD=${LOCAL_BUILD:-0}
 DOWNLOAD_SDK=${DOWNLOAD_SDK:-1}
 SDK_VERSION=${SDK_VERSION:-"1.0.0"}
-SDK_REV=${SDK_REV:-"r11"}
+SDK_REV=${SDK_REV:-"r13"}
 TAR_VERSION=${TAR_VERSION:-""}
 HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 
