Update Linux/macOS SDK

Author: rodlie

src/scripts/build.sh

@@ -31,7 +31,7 @@ APPIMG=20240401
 SDK=1.0.0
 URL=https://github.com/friction2d/friction-sdk/releases/download/v${SDK}
 APPIMAGE_TAR=friction-appimage-tools-${APPIMG}.tar.xz
-SDK_TAR=friction-sdk-${SDK}r7-linux-x86_64.tar.xz
+SDK_TAR=friction-sdk-${SDK}r8-linux-x86_64.tar.xz
 
 mkdir -p distfiles/sdk || true
 

src/scripts/build_mac_sdk.sh

@@ -58,6 +58,7 @@ CWD=`pwd`
 SDK=${SDK:-"${CWD}/sdk/${CPU}"}
 SRC=${SDK}/src
 DIST=${DIST:-"${CWD}/distfiles"}
+PATCHES=${DIST}/patches
 MKJOBS=${MKJOBS:-10}
 SRC_SUFFIX=tar.xz
 
@@ -123,7 +124,7 @@ if [ ! -f "${CMAKE_BIN}" ]; then
     rm -rf ${CMAKE_SRC} || true
     tar xf ${DIST}/ffmpeg/${CMAKE_SRC}.tar.gz
     cd ${CMAKE_SRC}
-    patch -p0 < ${DIST}/patches/cmake-zlib-macos154.diff
+    patch -p0 < ${PATCHES}/cmake-zlib-macos154.diff
     ./configure ${COMMON_CONFIGURE} --no-system-libs --parallel=${MKJOBS} -- -DCMAKE_USE_OPENSSL=OFF
     make -j${MKJOBS}
     make install
@@ -188,8 +189,8 @@ if [ ! -f "${QMAKE_BIN}" ]; then
         tar xf ${DIST}/qt/${QT_SRC}.${SRC_SUFFIX}
     fi
     cd ${QT_SRC}
-    patch -p0 < ${DIST}/patches/qtbase-macos-versions.diff
-    patch -p0 < ${DIST}/patches/qversion.diff
+    patch -p0 < ${PATCHES}/qtbase-macos-versions.diff
+    patch -p0 < ${PATCHES}/qtbase-qversion.diff
     CXXFLAGS="${DEFAULT_CPPFLAGS}" CFLAGS="${DEFAULT_CFLAGS}" \
     ./configure \
     -prefix ${SDK} \
@@ -295,7 +296,7 @@ if [ ! -f "${SDK}/lib/libmp3lame.dylib" ]; then
     rm -rf ${LAME_SRC} || true
     tar xf ${DIST}/ffmpeg/${LAME_SRC}.tar.gz
     cd ${LAME_SRC}
-    patch -p0 < ${DIST}/patches/lame-avoid_undefined_symbols_error.diff
+    patch -p0 < ${PATCHES}/lame-avoid_undefined_symbols_error.diff
     CFLAGS="${DEFAULT_CFLAGS}" \
     CXXFLAGS="${DEFAULT_CPPFLAGS}" \
     LDFLAGS="${DEFAULT_LDFLAGS}" \
@@ -311,8 +312,8 @@ if [ ! -f "${SDK}/lib/libvpx.a" ]; then
     rm -rf ${VPX_SRC} || true
     tar xf ${DIST}/ffmpeg/libvpx-${VPX_V}.tar.gz
     cd ${VPX_SRC}
-    patch -p0 < ${DIST}/patches/vpx-Makefile.diff
-    patch -p0 < ${DIST}/patches/vpx-configure.diff
+    patch -p0 < ${PATCHES}/vpx-Makefile.diff
+    patch -p0 < ${PATCHES}/vpx-configure.diff
     CFLAGS="${DEFAULT_CFLAGS}" \
     CXXFLAGS="${DEFAULT_CPPFLAGS}" \
     LDFLAGS="${DEFAULT_LDFLAGS}" \
@@ -358,7 +359,7 @@ if [ ! -f "${SDK}/lib/libvorbis.dylib" ]; then
     rm -rf ${VORBIS_SRC} || true
     tar xf ${DIST}/ffmpeg/${VORBIS_SRC}.tar.gz
     cd ${VORBIS_SRC}
-    patch -p0 < ${DIST}/patches/vorbis-configure.diff
+    patch -p0 < ${PATCHES}/vorbis-configure.diff
     CFLAGS="${DEFAULT_CFLAGS}" \
     CXXFLAGS="${DEFAULT_CPPFLAGS}" \
     LDFLAGS="${DEFAULT_LDFLAGS}" \
@@ -481,7 +482,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/libavcodec.pc" ]; then
     rm -rf ${FFMPEG_SRC} || true
     tar xf ${DIST}/ffmpeg/${FFMPEG_SRC}.tar.xz
     cd ${FFMPEG_SRC}
-    patch -p0 < ${DIST}/patches/ffmpeg-tiff-assocalpha.diff
+    patch -p0 < ${PATCHES}/ffmpeg-tiff-assocalpha.diff
     export MACOSX_DEPLOYMENT_TARGET=${OSX}
     CFLAGS="${DEFAULT_CFLAGS}" \
     CXXFLAGS="${DEFAULT_CPPFLAGS}" \

src/scripts/build_vfxplatform.sh

@@ -32,7 +32,7 @@ CUSTOM=${CUSTOM:-""}
 MKJOBS=${MKJOBS:-32}
 SDK_VERSION=${SDK_VERSION:-""}
 ONLY_SDK=${ONLY_SDK:-0}
-SDK_TAR="${DISTFILES}/sdk/friction-sdk-${SDK_VERSION}r7-linux-x86_64.tar"
+SDK_TAR="${DISTFILES}/sdk/friction-sdk-${SDK_VERSION}r8-linux-x86_64.tar"
 TAR_VERSION=${TAR_VERSION:-""}
 
 # Build SDK

src/scripts/build_vfxplatform_sdk02.sh

@@ -26,7 +26,8 @@ gcc -v
 SDK=${SDK:-"/opt/friction"}
 SRC=${SDK}/src
 DIST=${DIST:-"/mnt"}
-MKJOBS=${MKJOBS:-32}
+PATCHES=${DIST}/patches
+MKJOBS=${MKJOBS:-4}
 SRC_SUFFIX=tar.xz
 
 QT_V=5.15.17_20250607_0825fcb1
@@ -233,7 +234,8 @@ if [ ! -f "${QMAKE_BIN}" ]; then
     rm -rf ${QT_SRC} || true
     tar xf ${DIST}/qt/${QT_SRC}.${SRC_SUFFIX}
     cd ${QT_SRC}
-    (cd qtbase ; xzcat ${DIST}/qt/qtbase-use-wayland-on-gnome.patch.xz | patch -p1)
+    patch -p1 < ${PATCHES}/qtbase-use-wayland-on-gnome.patch
+    patch -p0 < ${PATCHES}/qtbase-qversion.diff
     ./configure \
     -prefix ${SDK} \
     -c++std c++14 \

src/scripts/build_vfxplatform_sdk03.sh

@@ -26,7 +26,8 @@ gcc -v
 SDK=${SDK:-"/opt/friction"}
 SRC=${SDK}/src
 DIST=${DIST:-"/mnt"}
-MKJOBS=${MKJOBS:-32}
+PATCHES=${DIST}/patches
+MKJOBS=${MKJOBS:-4}
 
 # Keep in sync with https://github.com/friction2d/mxe
 ZLIB_V=1.2.13
@@ -278,7 +279,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/libavcodec.pc" ]; then
     rm -rf ${FFMPEG_SRC} || true
     tar xf ${DIST}/ffmpeg/${FFMPEG_SRC}.tar.xz
     cd ${FFMPEG_SRC}
-    patch -p0 < ${DIST}/ffmpeg/ffmpeg-tiff-assocalpha.diff
+    patch -p0 < ${PATCHES}/ffmpeg-tiff-assocalpha.diff
     CFLAGS="${DEFAULT_CFLAGS}" \
     CXXFLAGS="${DEFAULT_CFLAGS}" \
     LDFLAGS="${DEFAULT_LDFLAGS}" \
@@ -294,6 +295,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/libavcodec.pc" ]; then
     --enable-avresample \
     --enable-gpl \
     --enable-version3 \
+    --extra-version=friction \
     --disable-avisynth \
     --disable-gnutls \
     --disable-libass \