Use Qt 5.15 on Linux

friction2d · Jan 25, 2024 · bc8fead · bc8fead
1 parent 5ac7a59
commit bc8fead
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/scripts/Dockerfile.vfxplatform b/src/scripts/Dockerfile.vfxplatform
@@ -4,7 +4,7 @@ FROM centos:centos7.9.2009
 RUN yum -y update
 RUN yum -y install centos-release-scl
 RUN yum -y group install "Development Tools"
-RUN yum -y install pulseaudio-libs-devel wget rpmdevtools git yasm python3 fontconfig-devel zlib-devel autoconf automake xz devtoolset-7 llvm-toolset-7.0 tree curl libICE-devel libSM-devel libX11-devel libXau-devel libXdamage-devel libXext-devel libXfixes-devel libXi-devel libXxf86vm-devel libdrm-devel libxcb-devel mesa-libGL-devel xorg-x11-proto-devel
+RUN yum -y install pulseaudio-libs-devel wget rpmdevtools git yasm python3 fontconfig-devel zlib-devel autoconf automake xz devtoolset-7 llvm-toolset-7.0 tree curl libICE-devel libSM-devel libX11-devel libXau-devel libXdamage-devel libXext-devel libXfixes-devel libXi-devel libXxf86vm-devel libdrm-devel libxcb-devel mesa-libGL-devel xorg-x11-proto-devel xcb-proto libxcb-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel
 RUN ln -sf /usr/bin/python3 /usr/bin/python
 RUN rm -f /usr/lib64/pkgconfig/libpng.pc
 RUN rm -f /usr/lib64/pkgconfig/libpng15.pc

diff --git a/src/scripts/build_vfxplatform.sh b/src/scripts/build_vfxplatform.sh
@@ -35,7 +35,9 @@ SDK_TAR="${DISTFILES}/friction-vfxplatform-sdk-${SDK_VERSION}.tar"
 
 # Build SDK
 if [ ! -d "${SDK}" ]; then
-    mkdir -p ${SDK}
+    mkdir -p "${SDK}/lib"
+    mkdir -p "${SDK}/bin"
+    (cd "${SDK}"; ln -sf lib lib64)
 fi
 if [ -f "${SDK_TAR}.xz" ]; then
 (cd ${SDK}/.. ; tar xf ${SDK_TAR}.xz )

diff --git a/src/scripts/build_vfxplatform_sdk02.sh b/src/scripts/build_vfxplatform_sdk02.sh
@@ -29,7 +29,7 @@ DIST=${DIST:-"/mnt"}
 JOBS=${JOBS:-4}
 
 XKBCOMMON_V=0.7.1
-QT_V=5.12.12
+QT_V=5.15.12 #5.12.12
 QSCINTILLA_V=2.14.1
 PELF_V=0.17.0
 CMAKE_V=3.26.3
@@ -101,13 +101,14 @@ fi # libxkbcommon
 if [ ! -f "${QMAKE_BIN}" ]; then
     cd ${SRC}
     QT_SRC="qt-everywhere-src-${QT_V}"
+    QT_TAR_SRC="qt-everywhere-opensource-src-${QT_V}"
     rm -rf ${QT_SRC} || true
-    tar xf ${DIST}/${QT_SRC}.tar.xz
+    tar xf ${DIST}/${QT_TAR_SRC}.tar.xz
     cd ${QT_SRC}
-    (cd qtbase ; patch -p1 < ${DIST}/hidpi.patch)
+    #(cd qtbase ; patch -p1 < ${DIST}/hidpi.patch)
     ./configure \
     -prefix ${SDK} \
-    -c++std c++11 \
+    -c++std c++17 \
     -qtlibinfix Friction \
     -opengl desktop \
     -release \
@@ -121,7 +122,11 @@ if [ ! -f "${QMAKE_BIN}" ]; then
     -system-freetype \
     -qt-pcre \
     -qt-zlib \
-    -qt-xcb \
+    -xkbcommon \
+    -xcb \
+    -xcb-xlib \
+    -qpa xcb \
+    -bundled-xcb-xinput \
     -qt-libpng \
     -no-mtdev \
     -no-syslog \
@@ -166,8 +171,10 @@ if [ ! -f "${QMAKE_BIN}" ]; then
     -skip qtgamepad \
     -skip qtgraphicaleffects \
     -skip qtlocation \
+    -skip qtlottie \
     -skip qtnetworkauth \
     -skip qtpurchasing \
+    -skip qtquick3d \
     -skip qtquickcontrols \
     -skip qtquickcontrols2 \
     -skip qtremoteobjects \

diff --git a/src/scripts/run_vfxplatform.sh b/src/scripts/run_vfxplatform.sh
@@ -9,7 +9,7 @@ TAG=${TAG:-""}
 MKJOBS=${JOBS:-4}
 ONLY_SDK=${ONLY_SDK:-0}
 
-SDK_VERSION="20240119"
+SDK_VERSION="20240123"
 
 DOCKER="docker run"
 DOCKER="${DOCKER} -e REL=${REL} -e MKJOBS=${JOBS} -e SDK_VERSION=${SDK_VERSION} -e ONLY_SDK=${ONLY_SDK} -e BRANCH=${BRANCH} -e COMMIT=${COMMIT} -e TAG=${TAG}"