diff --git a/.gitignore b/.gitignore index aad418408..18946b202 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ ffmpeg distfiles backup CHANGES.md +friction-distfiles diff --git a/src/core/appsupport.cpp b/src/core/appsupport.cpp index 5dee4bb0a..8a199e782 100644 --- a/src/core/appsupport.cpp +++ b/src/core/appsupport.cpp @@ -181,9 +181,9 @@ const QString AppSupport::getAppBuildInfo(bool html) branch); } else { return QString("%1 %2 %3 %4.") - .arg(tr("Built from"), + .arg(tr("Built from commit"), commit, - tr("on"), + tr("on branch"), branch, getAppCommitUrl(), getAppBranchUrl()); diff --git a/src/scripts/build_qt5.bat b/src/scripts/build_qt5.bat index bb885284e..c8416e012 100644 --- a/src/scripts/build_qt5.bat +++ b/src/scripts/build_qt5.bat @@ -7,9 +7,9 @@ REM # GPLv3+ set CWD=%cd% set SRC_DIR=%CWD%\src set QT_DIR=%SRC_DIR%\qt -set QT_V=5.15.12 +set QT_V=5.15.13 -set PATH=%ProgramFiles%\Python311;%ProgramFiles%\CMake\bin;%PATH% +set PATH=C:\Python;%ProgramFiles%\CMake\bin;%PATH% cd "%SRC_DIR%\qt-everywhere-src-%QT_V%" nmake diff --git a/src/scripts/build_vfxplatform.sh b/src/scripts/build_vfxplatform.sh index a9e34d548..2e4a5279b 100755 --- a/src/scripts/build_vfxplatform.sh +++ b/src/scripts/build_vfxplatform.sh @@ -28,7 +28,7 @@ REL=${REL:-1} BRANCH=${BRANCH:-""} COMMIT=${COMMIT:-""} TAG=${TAG:-""} -MKJOBS=${MKJOBS:-4} +MKJOBS=${MKJOBS:-32} SDK_VERSION=${SDK_VERSION:-""} ONLY_SDK=${ONLY_SDK:-0} SDK_TAR="${DISTFILES}/friction-vfxplatform-sdk-${SDK_VERSION}.tar" diff --git a/src/scripts/build_vfxplatform_sdk01.sh b/src/scripts/build_vfxplatform_sdk01.sh index 839f7181e..f0c081a84 100755 --- a/src/scripts/build_vfxplatform_sdk01.sh +++ b/src/scripts/build_vfxplatform_sdk01.sh @@ -26,7 +26,7 @@ clang -v SDK=${SDK:-"/opt/friction"} SRC=${SDK}/src DIST=${DIST:-"/mnt"} -JOBS=${JOBS:-4} +MKJOBS=${MKJOBS:-32} NINJA_V=1.11.1 #GN_V=82d673ac @@ -98,7 +98,7 @@ fi # ninja # mv ${SKIA_SRC} ${SKIA_DIR} # cd ${SKIA_DIR} # ${GN_BIN} gen out/build --args='is_official_build=true is_debug=false cc="clang" cxx="clang++" extra_cflags=["-Wno-error"] target_os="linux" target_cpu="x64" skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false skia_use_system_icu=false skia_use_system_harfbuzz=false skia_use_dng_sdk=false' -# ${NINJA_BIN} -C out/build -j${JOBS} skia +# ${NINJA_BIN} -C out/build -j${MKJOBS} skia # fi # skia # libunwind @@ -109,7 +109,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/libunwind.pc" ]; then tar xf ${DIST}/${UNWIND_SRC}.tar.gz cd ${UNWIND_SRC} CC=clang CXX=clang++ ./configure ${DEFAULT_CONFIGURE} --disable-minidebuginfo --disable-tests - make -j${JOBS} + make -j${MKJOBS} make install fi # libunwind @@ -128,7 +128,7 @@ fi # libunwind # CXXFLAGS="${DEFAULT_CFLAGS}" \ # LDFLAGS="${DEFAULT_LDFLAGS} -lunwind" \ # ./configure ${STATIC_CONFIGURE} --enable-libunwind -# make -j${JOBS} +# make -j${MKJOBS} # fi # gperftools echo "SDK PART 1 DONE" diff --git a/src/scripts/build_vfxplatform_sdk02.sh b/src/scripts/build_vfxplatform_sdk02.sh index f1ba8955f..f30abec97 100755 --- a/src/scripts/build_vfxplatform_sdk02.sh +++ b/src/scripts/build_vfxplatform_sdk02.sh @@ -26,10 +26,10 @@ gcc -v SDK=${SDK:-"/opt/friction"} SRC=${SDK}/src DIST=${DIST:-"/mnt"} -JOBS=${JOBS:-4} +MKJOBS=${MKJOBS:-32} XKBCOMMON_V=0.7.1 -QT_V=5.15.12 #5.12.12 +QT_V=5.15.13 QSCINTILLA_V=2.14.1 PELF_V=0.17.0 CMAKE_V=3.26.3 @@ -69,7 +69,7 @@ if [ ! -f "${PELF_BIN}" ]; then tar xf ${DIST}/${PELF_SRC}.tar.bz2 cd ${PELF_SRC} ./configure ${COMMON_CONFIGURE} - make -j${JOBS} + make -j${MKJOBS} make install fi # patchelf @@ -81,7 +81,7 @@ if [ ! -f "${CMAKE_BIN}" ]; then tar xf ${DIST}/mxe/pkg/${CMAKE_SRC}.tar.gz cd ${CMAKE_SRC} ./configure ${COMMON_CONFIGURE} -- -DCMAKE_USE_OPENSSL=OFF - make -j${JOBS} + make -j${MKJOBS} make install fi # cmake @@ -93,7 +93,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/xkbcommon.pc" ]; then tar xf ${DIST}/${XKB_SRC}.tar.xz cd ${XKB_SRC} ./configure ${DEFAULT_CONFIGURE} --disable-docs - make -j${JOBS} + make -j${MKJOBS} make install fi # libxkbcommon @@ -194,7 +194,7 @@ if [ ! -f "${QMAKE_BIN}" ]; then -skip qtx11extras \ -skip qtxmlpatterns \ -skip qttools - make -j${JOBS} + make -j${MKJOBS} make install fi # qt @@ -207,7 +207,7 @@ if [ ! -f "${SDK}/lib/libqscintilla2_friction_qt5.so" ]; then cd ${QSC_SRC}/src sed -i 's/qscintilla2_qt/qscintilla2_friction_qt/g' qscintilla.pro ${SDK}/bin/qmake CONFIG+=release - make -j${JOBS} + make -j${MKJOBS} cp -a libqscintilla2_friction_qt5* ${SDK}/lib/ cp -a Qsci ${SDK}/include/ fi # qscintilla diff --git a/src/scripts/build_vfxplatform_sdk03.sh b/src/scripts/build_vfxplatform_sdk03.sh index ab14c26f2..6b67c755c 100755 --- a/src/scripts/build_vfxplatform_sdk03.sh +++ b/src/scripts/build_vfxplatform_sdk03.sh @@ -26,7 +26,7 @@ gcc -v SDK=${SDK:-"/opt/friction"} SRC=${SDK}/src DIST=${DIST:-"/mnt/mxe/pkg"} -JOBS=${JOBS:-4} +MKJOBS=${MKJOBS:-32} # Keep in sync with https://github.com/friction2d/mxe ZLIB_V=1.2.13 @@ -74,7 +74,7 @@ if [ ! -f "${SDK}/bin/nasm" ]; then tar xf ${DIST}/${NASM_SRC}.tar.xz cd ${NASM_SRC} ./configure ${COMMON_CONFIGURE} - make -j${JOBS} + make -j${MKJOBS} make install fi # nasm @@ -99,7 +99,7 @@ if [ ! -f "${SDK}/lib/libz.so" ]; then tar xf ${DIST}/${ZLIB_SRC}.tar.xz cd ${ZLIB_SRC} ./configure ${COMMON_CONFIGURE} - make -j${JOBS} + make -j${MKJOBS} make install fi # zlib @@ -114,7 +114,7 @@ if [ ! -f "${SDK}/lib/libmp3lame.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${DEFAULT_CONFIGURE} --disable-frontend --disable-gtktest --with-fileio=lame --enable-nasm - make -j${JOBS} + make -j${MKJOBS} make install fi # lame @@ -129,7 +129,7 @@ if [ ! -f "${SDK}/lib/libvpx.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${DEFAULT_CONFIGURE} --disable-examples --disable-install-docs - make -j${JOBS} + make -j${MKJOBS} make install fi # libvpx @@ -144,7 +144,7 @@ if [ ! -f "${SDK}/lib/libogg.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${DEFAULT_CONFIGURE} - make -j${JOBS} + make -j${MKJOBS} make install fi # libogg @@ -159,7 +159,7 @@ if [ ! -f "${SDK}/lib/libvorbis.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${DEFAULT_CONFIGURE} - make -j${JOBS} + make -j${MKJOBS} make install fi # libvorbis @@ -174,7 +174,7 @@ if [ ! -f "${SDK}/lib/libtheora.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${DEFAULT_CONFIGURE} --disable-examples --disable-sdltest - make -j${JOBS} + make -j${MKJOBS} make install fi # libtheora @@ -188,7 +188,7 @@ if [ ! -f "${SDK}/lib/libxvidcore.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${COMMON_CONFIGURE} - make -j${JOBS} + make -j${MKJOBS} make install fi # xvidcore @@ -203,7 +203,7 @@ if [ ! -f "${SDK}/lib/liblsmash.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${DEFAULT_CONFIGURE} - make -j${JOBS} + make -j${MKJOBS} make install fi # liblsmash @@ -218,7 +218,7 @@ if [ ! -f "${SDK}/lib/libx264.so" ]; then CXXFLAGS="${DEFAULT_CFLAGS}" \ LDFLAGS="${DEFAULT_LDFLAGS}" \ ./configure ${COMMON_CONFIGURE} --enable-shared --disable-lavf --disable-swscale --disable-opencl --disable-cli - make -j${JOBS} + make -j${MKJOBS} make install fi # x264 @@ -238,7 +238,7 @@ if [ ! -f "${SDK}/lib/libx265.so" ]; then -DCMAKE_BUILD_TYPE=Release \ -DENABLE_SHARED=ON \ -DENABLE_CLI=OFF .. - make -j${JOBS} + make -j${MKJOBS} make install rm ${SDK}/lib/libx265.a fi # x265 @@ -266,7 +266,7 @@ if [ ! -f "${SDK}/lib/libaom.so" ]; then -DCONFIG_AV1_HIGHBITDEPTH=0 \ -DCONFIG_WEBM_IO=0 \ -DBUILD_SHARED_LIBS=ON .. - make -j${JOBS} + make -j${MKJOBS} make install rm ${SDK}/lib/libaom.a fi # aom @@ -313,7 +313,7 @@ if [ ! -f "${SDK}/lib/pkgconfig/libavcodec.pc" ]; then --enable-libaom \ --enable-libx265 \ --enable-libxvid - make -j${JOBS} + make -j${MKJOBS} make install fi # ffmpeg diff --git a/src/scripts/configure_qt5.bat b/src/scripts/configure_qt5.bat index c2cf25869..b98bdcd82 100644 --- a/src/scripts/configure_qt5.bat +++ b/src/scripts/configure_qt5.bat @@ -7,9 +7,9 @@ REM # GPLv3+ set CWD=%cd% set SRC_DIR=%CWD%\src set QT_DIR=%SRC_DIR%\qt -set QT_V=5.15.12 +set QT_V=5.15.13 -set PATH=%ProgramFiles%\Python311;%ProgramFiles%\CMake\bin;%PATH% +set PATH=C:\Python;%ProgramFiles%\CMake\bin;%PATH% cd "%SRC_DIR%\qt-everywhere-src-%QT_V%" -configure.bat -release -prefix "%QT_DIR%" -mp -platform win32-msvc -opensource -confirm-license -nomake examples -nomake tests -opengl desktop -optimize-size -no-pch -no-glib -no-dbus -no-avx2 -no-avx512 -strip -no-openssl -no-gif -no-ico -schannel -skip qt3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtlocation -skip qtlottie -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtvirtualkeyboard -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -skip qttools +configure.bat -release -prefix "%QT_DIR%" -mp -platform win32-msvc -opensource -confirm-license -nomake examples -nomake tests -opengl desktop -optimize-size -no-pch -no-glib -no-dbus -no-avx2 -no-avx512 -strip -no-openssl -no-gif -no-wmf -no-ico -schannel -skip qt3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtlocation -skip qtlottie -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtvirtualkeyboard -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -skip qttools diff --git a/src/scripts/run_vfxplatform.sh b/src/scripts/run_vfxplatform.sh index 812f98bcd..023305043 100755 --- a/src/scripts/run_vfxplatform.sh +++ b/src/scripts/run_vfxplatform.sh @@ -25,10 +25,10 @@ REL=${REL:-0} BRANCH=${BRANCH:-""} COMMIT=${COMMIT:-""} TAG=${TAG:-""} -MKJOBS=${JOBS:-4} +MKJOBS=${MKJOBS:-32} ONLY_SDK=${ONLY_SDK:-0} DOWNLOAD_SDK=${DOWNLOAD_SDK:-0} -SDK_VERSION="20240123" +SDK_VERSION="20240424" TAR_VERSION=${TAR_VERSION:-""} DOCKER="docker run"