diff --git a/.github/workflows/linux_build_qt.yml b/.github/workflows/linux_build_qt.yml index 9babb1f98d..e060b58617 100644 --- a/.github/workflows/linux_build_qt.yml +++ b/.github/workflows/linux_build_qt.yml @@ -104,13 +104,13 @@ jobs: sudo tools/retry.sh apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main' sudo tools/retry.sh apt-get update sudo tools/retry.sh apt-get -y install \ - build-essential ccache clang-17 cmake curl extra-cmake-modules git libasound2-dev libaio-dev libavcodec-dev libavformat-dev libavutil-dev \ + build-essential ccache clang-17 cmake curl extra-cmake-modules git libasound2-dev libaio-dev \ libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfreetype-dev libfuse2 libgtk-3-dev libgudev-1.0-dev \ - libharfbuzz-dev libinput-dev libopengl-dev libpcap-dev libpipewire-0.3-dev libpulse-dev libssl-dev libswresample-dev libswscale-dev libudev-dev \ - libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev \ + libharfbuzz-dev libinput-dev libopengl-dev libopus-dev libpcap-dev libpipewire-0.3-dev libpulse-dev libssl-dev libudev-dev libva-dev libvpl2 libvpl-dev \ + libwayland-dev libx11-dev libx11-xcb-dev libx264-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev \ libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev \ libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev \ - lld-17 llvm-17 ninja-build patchelf pkg-config zlib1g-dev + lld-17 llvm-17 nasm ninja-build patchelf pkg-config zlib1g-dev - name: Cache Dependencies id: cache-deps @@ -121,7 +121,7 @@ jobs: - name: Build Dependencies if: steps.cache-deps.outputs.cache-hit != 'true' - run: .github/workflows/scripts/linux/build-dependencies-qt.sh "$HOME/deps" + run: BUILD_FFMPEG=1 .github/workflows/scripts/linux/build-dependencies-qt.sh "$HOME/deps" - name: Download patches run: | diff --git a/.github/workflows/scripts/linux/build-dependencies-qt.sh b/.github/workflows/scripts/linux/build-dependencies-qt.sh index a2444c1ea5..3ea801b9ba 100755 --- a/.github/workflows/scripts/linux/build-dependencies-qt.sh +++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh @@ -7,6 +7,10 @@ if [ "$#" -ne 1 ]; then exit 1 fi +# The bundled ffmpeg has a lot of things disabled to reduce code size. +# Users may want to use system ffmpeg for additional features +: ${BUILD_FFMPEG:=0} + SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}")) NPROCS="$(getconf _NPROCESSORS_ONLN)" INSTALLDIR="$1" @@ -14,16 +18,19 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then INSTALLDIR="$PWD/$INSTALLDIR" fi +FFMPEG=8.0 FREETYPE=2.14.1 HARFBUZZ=12.0.0 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075 LIBJPEGTURBO=3.1.2 LIBPNG=1.6.50 LIBWEBP=1.6.0 +NVENC=11.1.5.3 SDL=SDL3-3.2.26 QT=6.10.1 QTAPNG=1.3.0 LZ4=1.10.0 +VULKAN=1.4.328.1 ZSTD=1.5.7 KDDOCKWIDGETS=2.4.0 PLUTOVG=1.3.1 @@ -40,6 +47,7 @@ cd deps-build export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH" cat > SHASUMS <