Update Linux SDK: fix libxkbcommon

libxkbcommon was not built with correct paths, so accented input didn't work in Qt.

Ref: #254

src/scripts/build_vfxplatform.sh

@@ -35,13 +35,6 @@ SDK_TAR="${DISTFILES}/friction-vfxplatform-CY2021-sdk-${SDK_VERSION}.tar"
 DOWNLOAD_SDK=${DOWNLOAD_SDK:-0}
 TAR_VERSION=${TAR_VERSION:-""}
 
-# Download SDK
-if [ "${DOWNLOAD_SDK}" = 1 ] && [ ! -f "${SDK_TAR}.bz2" ]; then
-    (cd ${DISTFILES} ;
-        wget https://download.friction.graphics/distfiles/vfxplatform/friction-vfxplatform-CY2021-sdk-${SDK_VERSION}.tar.bz2
-    )
-fi
-
 # Build SDK
 if [ ! -d "${SDK}" ]; then
     mkdir -p "${SDK}/lib"

src/scripts/build_vfxplatform_sdk01.sh

@@ -70,7 +70,7 @@ if [ ! -f "${NINJA_BIN}" ]; then
     cd ${SRC}
     NINJA_SRC=ninja-${NINJA_V}
     rm -rf ${NINJA_SRC} || true
-    tar xf ${DIST}/${NINJA_SRC}.tar.gz
+    tar xf ${DIST}/tools/${NINJA_SRC}.tar.gz
     cd ${NINJA_SRC}
     ./configure.py --bootstrap
     cp -a ninja ${NINJA_BIN}

src/scripts/build_vfxplatform_sdk02.sh

@@ -180,7 +180,13 @@ if [ ! -f "${SDK}/lib/pkgconfig/xkbcommon.pc" ]; then
     rm -rf ${XKB_SRC} || true
     tar xf ${DIST}/x11/${XKB_SRC}.${SRC_SUFFIX}
     cd ${XKB_SRC}
-    ./configure ${DEFAULT_CONFIGURE} --disable-docs
+    ./configure ${DEFAULT_CONFIGURE} \
+    --disable-docs \
+    --with-xkb-config-root=/usr/share/X11/xkb \
+    --with-x-locale-root=/usr/share/X11/locale \
+    --with-default-rules=evdev \
+    --with-default-model=pc105 \
+    --with-default-layout=us
     make -j${MKJOBS}
     make install
 fi # libxkbcommon
@@ -190,7 +196,7 @@ if [ ! -f "${CMAKE_BIN}" ]; then
     cd ${SRC}
     CMAKE_SRC=cmake-${CMAKE_V}
     rm -rf ${CMAKE_SRC} || true
-    tar xf ${DIST}/mxe/pkg/${CMAKE_SRC}.tar.gz
+    tar xf ${DIST}/ffmpeg/${CMAKE_SRC}.tar.gz
     cd ${CMAKE_SRC}
     ./configure ${COMMON_CONFIGURE} --parallel=${MKJOBS} -- -DCMAKE_USE_OPENSSL=OFF
     make -j${MKJOBS}
@@ -203,7 +209,7 @@ if [ ! -f "${QMAKE_BIN}" ]; then
     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_TAR_SRC}.${SRC_SUFFIX}
+    tar xf ${DIST}/qt/${QT_TAR_SRC}.${SRC_SUFFIX}
     cd ${QT_SRC}
     ./configure \
     -prefix ${SDK} \
@@ -302,7 +308,7 @@ if [ ! -f "${SDK}/lib/libqscintilla2_friction_qt5.so" ]; then
     cd ${SRC}
     QSC_SRC="QScintilla_src-${QSCINTILLA_V}"
     rm -rf ${QSC_SRC}
-    tar xf ${DIST}/${QSC_SRC}.tar.gz
+    tar xf ${DIST}/qt/${QSC_SRC}.tar.gz
     cd ${QSC_SRC}/src
     sed -i 's/qscintilla2_qt/qscintilla2_friction_qt/g' qscintilla.pro
     ${SDK}/bin/qmake CONFIG+=release

src/scripts/build_vfxplatform_sdk03.sh

@@ -25,7 +25,7 @@ gcc -v
 
 SDK=${SDK:-"/opt/friction"}
 SRC=${SDK}/src
-DIST=${DIST:-"/mnt/mxe/pkg"}
+DIST=${DIST:-"/mnt/ffmpeg"}
 MKJOBS=${MKJOBS:-32}
 
 # Keep in sync with https://github.com/friction2d/mxe

src/scripts/run_vfxplatform.sh

@@ -28,17 +28,17 @@ TAG=${TAG:-""}
 MKJOBS=${MKJOBS:-32}
 ONLY_SDK=${ONLY_SDK:-0}
 DOWNLOAD_SDK=${DOWNLOAD_SDK:-0}
-SDK_VERSION="20240609"
+SDK_VERSION="20240609v2"
 TAR_VERSION=${TAR_VERSION:-""}
 
 DOCKER="docker run"
-DOCKER="${DOCKER} -e REL=${REL} -e MKJOBS=${JOBS} -e TAR_VERSION=${TAR_VERSION} -e SDK_VERSION=${SDK_VERSION} -e ONLY_SDK=${ONLY_SDK} -e DOWNLOAD_SDK=${DOWNLOAD_SDK} -e BRANCH=${BRANCH} -e COMMIT=${COMMIT} -e TAG=${TAG}"
+DOCKER="${DOCKER} -e REL=${REL} -e MKJOBS=${MKJOBS} -e TAR_VERSION=${TAR_VERSION} -e SDK_VERSION=${SDK_VERSION} -e ONLY_SDK=${ONLY_SDK} -e DOWNLOAD_SDK=${DOWNLOAD_SDK} -e BRANCH=${BRANCH} -e COMMIT=${COMMIT} -e TAG=${TAG}"
 DOCKER="${DOCKER} -t --mount type=bind,source=${CWD}/distfiles,target=/mnt"
 
 if [ ! -d "${CWD}/distfiles" ]; then
     mkdir -p ${CWD}/distfiles
 fi
 
-(cd src/scripts; docker build -t friction-vfxplatform -f Dockerfile.vfxplatform .)
+(cd src/scripts; docker build -t friction-09-vfxplatform -f Dockerfile.vfxplatform .)
 
-${DOCKER} friction-vfxplatform
+${DOCKER} friction-09-vfxplatform