From 223f2b95a12d9cc40dbc662de02e7f30f576151d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 6 Mar 2025 16:08:00 +0100 Subject: [PATCH] Revert "Reapply "CI Linux: use Vulkan directy from repo"" This reverts commit 91b56cddab440c5ede779c2dbd07ba3a939489bc. The ppa:savoury1/ffmpeg4 repo is no longer used with ubuntu-22.04 runner but FFmpeg currently needs Vulkan v1.3.277 ibut the distro has only 1.3.204. --- .github/scripts/Linux/install_others.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/scripts/Linux/install_others.sh b/.github/scripts/Linux/install_others.sh index 4e4d22d64..0ceb3df07 100755 --- a/.github/scripts/Linux/install_others.sh +++ b/.github/scripts/Linux/install_others.sh @@ -68,13 +68,29 @@ install_rav1e() {( /usr/local/lib/pkgconfig/rav1e.pc )} +# FFmpeg master needs at least v1.3.277 as for 6th Mar '25 +install_vulkan() {( + git clone --depth 1 https://github.com/KhronosGroup/Vulkan-Headers + mkdir Vulkan-Headers/build + cd Vulkan-Headers/build + cmake .. + sudo make install + cd ../.. + git clone --depth 1 https://github.com/KhronosGroup/Vulkan-Loader + mkdir Vulkan-Loader/build + cd Vulkan-Loader/build + cmake .. + cmake --build . --parallel "$(nproc)" + sudo make install +)} + show_help= if [ $# -eq 1 ] && { [ "$1" = -h ] || [ "$1" = --help ] || [ "$1" = help ]; }; then show_help=1 fi if [ $# -eq 0 ] || [ $show_help ]; then - set -- gpujpeg ndi pipewire rav1e ximea + set -- gpujpeg ndi pipewire rav1e vulkan ximea fi if [ $show_help ]; then