Deps: Don't build qtdeclarative

See previous commit.
This commit is contained in:
Stenzek
2025-11-07 15:37:06 +10:00
parent 9ed5254293
commit d797ca4839
6 changed files with 1 additions and 154 deletions

View File

@@ -84,9 +84,7 @@ if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; t
-o "zlib-ng-$ZLIBNG.tar.gz" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$ZLIBNG.tar.gz" \
-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtdeclarative-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtshadertools-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
@@ -110,9 +108,7 @@ $LIBZIP_GZ_HASH libzip-$LIBZIP.tar.gz
$ZLIBNG_GZ_HASH zlib-ng-$ZLIBNG.tar.gz
$ZSTD_GZ_HASH zstd-$ZSTD.tar.gz
$QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz
$QTDECLARATIVE_XZ_HASH qtdeclarative-everywhere-src-$QT.tar.xz
$QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz
$QTSHADERTOOLS_XZ_HASH qtshadertools-everywhere-src-$QT.tar.xz
$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz
$QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz
$QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz
@@ -338,30 +334,6 @@ ninja install
cd ../../
rm -fr "qtwayland-everywhere-src-$QT"
echo "Building Qt Shader Tools..."
rm -fr "qtshadertools-everywhere-src-$QT"
tar xf "qtshadertools-everywhere-src-$QT.tar.xz"
cd "qtshadertools-everywhere-src-$QT"
mkdir build
cd build
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF
cmake --build . --parallel
ninja install
cd ../../
rm -fr "qtshadertools-everywhere-src-$QT"
echo "Building Qt Declarative..."
rm -fr "qtdeclarative-everywhere-src-$QT"
tar xf "qtdeclarative-everywhere-src-$QT.tar.xz"
cd "qtdeclarative-everywhere-src-$QT"
mkdir build
cd build
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF -DFEATURE_wayland_server=OFF
cmake --build . --parallel
ninja install
cd ../../
rm -fr "qtdeclarative-everywhere-src-$QT"
echo "Installing Qt Tools..."
rm -fr "qttools-everywhere-src-$QT"
tar xf "qttools-everywhere-src-$QT.tar.xz"

View File

@@ -53,9 +53,7 @@ if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; t
-o "zlib-ng-$ZLIBNG.tar.gz" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$ZLIBNG.tar.gz" \
-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtdeclarative-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtshadertools-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
@@ -79,7 +77,6 @@ $LIBZIP_GZ_HASH libzip-$LIBZIP.tar.gz
$ZLIBNG_GZ_HASH zlib-ng-$ZLIBNG.tar.gz
$ZSTD_GZ_HASH zstd-$ZSTD.tar.gz
$QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz
$QTDECLARATIVE_XZ_HASH qtdeclarative-everywhere-src-$QT.tar.xz
$QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz
$QTSHADERTOOLS_XZ_HASH qtshadertools-everywhere-src-$QT.tar.xz
$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz
@@ -274,30 +271,6 @@ ninja install
cd ../../
rm -fr "qtwayland-everywhere-src-$QT"
echo "Building Qt Shader Tools..."
rm -fr "qtshadertools-everywhere-src-$QT"
tar xf "qtshadertools-everywhere-src-$QT.tar.xz"
cd "qtshadertools-everywhere-src-$QT"
mkdir build
cd build
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF
cmake --build . --parallel
ninja install
cd ../../
rm -fr "qtshadertools-everywhere-src-$QT"
echo "Building Qt Declarative..."
rm -fr "qtdeclarative-everywhere-src-$QT"
tar xf "qtdeclarative-everywhere-src-$QT.tar.xz"
cd "qtdeclarative-everywhere-src-$QT"
mkdir build
cd build
"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DQT_GENERATE_SBOM=OFF
cmake --build . --parallel
ninja install
cd ../../
rm -fr "qtdeclarative-everywhere-src-$QT"
echo "Installing Qt Tools..."
rm -fr "qttools-everywhere-src-$QT"
tar xf "qttools-everywhere-src-$QT.tar.xz"

View File

@@ -75,9 +75,7 @@ $ZSTD_GZ_HASH zstd-$ZSTD.tar.gz
$FFMPEG_XZ_HASH ffmpeg-$FFMPEG_VERSION.tar.xz
f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e v$MOLTENVK.tar.gz
$QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz
$QTDECLARATIVE_XZ_HASH qtdeclarative-everywhere-src-$QT.tar.xz
$QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz
$QTSHADERTOOLS_XZ_HASH qtshadertools-everywhere-src-$QT.tar.xz
$QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz
$QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz
$QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz
@@ -100,9 +98,7 @@ curl -L \
-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.xz" \
-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtdeclarative-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtshadertools-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
@@ -335,30 +331,6 @@ make install
cd ../..
rm -fr "qtimageformats-everywhere-src-$QT"
echo "Installing Qt Shader Tools..."
rm -fr "qtshadertools-everywhere-src-$QT"
tar xf "qtshadertools-everywhere-src-$QT.tar.xz"
cd "qtshadertools-everywhere-src-$QT"
mkdir build
cd build
"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "${CMAKE_COMMON_QT[@]}"
make "-j$NPROCS"
make install
cd ../..
rm -fr "qtshadertools-everywhere-src-$QT"
echo "Installing Qt Declarative..."
rm -fr "qtdeclarative-everywhere-src-$QT"
tar xf "qtdeclarative-everywhere-src-$QT.tar.xz"
cd "qtdeclarative-everywhere-src-$QT"
mkdir build
cd build
"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "${CMAKE_COMMON_QT[@]}"
make "-j$NPROCS"
make install
cd ../..
rm -fr "qtdeclarative-everywhere-src-$QT"
echo "Installing Qt Tools..."
rm -fr "qttools-everywhere-src-$QT"
tar xf "qttools-everywhere-src-$QT.tar.xz"

View File

@@ -59,9 +59,7 @@ call :downloadfile "libpng-%LIBPNG%.tar.gz" "https://download.sourceforge.net/li
call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "%LIBJPEGTURBO_GZ_HASH%" || goto error
call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" "%SDL3_ZIP_HASH%" || goto error
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" "%QTBASE_ZIP_HASH%" || goto error
call :downloadfile "qtdeclarative-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtdeclarative-everywhere-src-%QT%.zip" "%QTDECLARATIVE_ZIP_HASH%" || goto error
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" "%QTIMAGEFORMATS_ZIP_HASH%" || goto error
call :downloadfile "qtshadertools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtshadertools-everywhere-src-%QT%.zip" "%QTSHADERTOOLS_ZIP_HASH%" || goto error
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" "%QTSVG_ZIP_HASH%" || goto error
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" "%QTTOOLS_ZIP_HASH%" || goto error
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" "%QTTRANSLATIONS_ZIP_HASH%" || goto error
@@ -232,37 +230,6 @@ ninja install || goto error
cd ..\.. || goto error
rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
echo Building Qt Shader Tools...
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
%SEVENZIP% x "qtshadertools-everywhere-src-%QT%.zip" || goto error
cd "qtshadertools-everywhere-src-%QT%" || goto error
mkdir build || goto error
cd build || goto error
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
cmake --build . --parallel || goto error
ninja install || goto error
cd ..\.. || goto error
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
rem This mess with the junction is to work around path length limits in cmake/MSVC.
echo Building Qt Declarative...
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
%SEVENZIP% x "qtdeclarative-everywhere-src-%QT%.zip" || goto error
cd "qtdeclarative-everywhere-src-%QT%" || goto error
set QTDECLARATIVEDIR=%CD%
mkdir build || goto error
pushd ..\..\..\.. || goto error
mklink /J b "%QTDECLARATIVEDIR%\build" || goto error
cd b || goto error
call "%INSTALLDIR%\bin\qt-configure-module.bat" %QTDECLARATIVEDIR% -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
cmake --build . --parallel || goto error
ninja install || goto error
cd .. || goto error
rmdir b || goto error
popd || goto error
cd .. || goto error
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
echo Building Qt Tools...
rmdir /S /Q "qttools-everywhere-src-%QT%"
%SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error

View File

@@ -57,9 +57,7 @@ call :downloadfile "libpng-%LIBPNG%.tar.gz" "https://download.sourceforge.net/li
call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "%LIBJPEGTURBO_GZ_HASH%" || goto error
call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" "%SDL3_ZIP_HASH%" || goto error
call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" "%QTBASE_ZIP_HASH%" || goto error
call :downloadfile "qtdeclarative-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtdeclarative-everywhere-src-%QT%.zip" "%QTDECLARATIVE_ZIP_HASH%" || goto error
call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" "%QTIMAGEFORMATS_ZIP_HASH%" || goto error
call :downloadfile "qtshadertools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtshadertools-everywhere-src-%QT%.zip" "%QTSHADERTOOLS_ZIP_HASH%" || goto error
call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" "%QTSVG_ZIP_HASH%" || goto error
call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" "%QTTOOLS_ZIP_HASH%" || goto error
call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" "%QTTRANSLATIONS_ZIP_HASH%" || goto error
@@ -232,37 +230,6 @@ ninja install || goto error
cd ..\.. || goto error
rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
echo Building Qt Shader Tools...
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
%SEVENZIP% x "qtshadertools-everywhere-src-%QT%.zip" || goto error
cd "qtshadertools-everywhere-src-%QT%" || goto error
mkdir build || goto error
cd build || goto error
call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
cmake --build . --parallel || goto error
ninja install || goto error
cd ..\.. || goto error
rmdir /S /Q "qtshadertools-everywhere-src-%QT%"
rem This mess with the junction is to work around path length limits in cmake/MSVC.
echo Building Qt Declarative...
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
%SEVENZIP% x "qtdeclarative-everywhere-src-%QT%.zip" || goto error
cd "qtdeclarative-everywhere-src-%QT%" || goto error
set QTDECLARATIVEDIR=%CD%
mkdir build || goto error
pushd ..\..\..\.. || goto error
mklink /J b "%QTDECLARATIVEDIR%\build" || goto error
cd b || goto error
call "%INSTALLDIR%\bin\qt-configure-module.bat" %QTDECLARATIVEDIR% -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DQT_GENERATE_SBOM=OFF || goto error
cmake --build . --parallel || goto error
ninja install || goto error
cd .. || goto error
rmdir b || goto error
popd || goto error
cd .. || goto error
rmdir /S /Q "qtdeclarative-everywhere-src-%QT%"
echo Building Qt Tools...
rmdir /S /Q "qttools-everywhere-src-%QT%"
%SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error

View File

@@ -40,12 +40,8 @@ QT=6.10.0
QTMINOR=6.10
QTBASE_XZ_HASH=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d
QTBASE_ZIP_HASH=d3b5379edcace266273d789249b6d68ae9495ec1b0b562ba6d039034cd315d8e
QTDECLARATIVE_XZ_HASH=6efd35520902395d865bc12e89f8442c3c228d0374f13af9a1888b844f56f6b0
QTDECLARATIVE_ZIP_HASH=4cddb45c058a4a917e7ed311ceb3af22f21d59d0d7fdfb8cd7cae0cbb1bf5dbd
QTIMAGEFORMATS_XZ_HASH=64450a52507c540de53616ed5e516df0e0905a99d3035ddfaa690f2b3f7c0cea
QTIMAGEFORMATS_ZIP_HASH=ac2fe34a9f1c1451b6785474e9b1b64eb59edef6553be3d630240f16a730456d
QTSHADERTOOLS_XZ_HASH=87ba478c3fd827862fc79f6d78d369dfec162c901b7f66ed988b3e1d6ffdfbf6
QTSHADERTOOLS_ZIP_HASH=8ce0e488be563db01bf16d09626a723392ae6feb618c17405e0504ca55409a74
QTSVG_XZ_HASH=5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533
QTSVG_ZIP_HASH=c12f8bfb617e4a03da104be36f6966ba7f64bee331f0095da1a649a1149796d2
QTTOOLS_XZ_HASH=d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a
@@ -76,4 +72,4 @@ DXCOMPILER_VERSION=1.8.2407.12
DXCOMPILER_ZIP_HASH=eb4f6a3bb6b08aaa62f435b3dbf26b180702ca52398d3650d0dd538f56742cdc
FFMPEG_VERSION=8.0
FFMPEG_XZ_HASH=b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e
FFMPEG_XZ_HASH=b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e