From 91b56cddab440c5ede779c2dbd07ba3a939489bc Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Tue, 16 Jul 2024 12:11:07 +0200
Subject: [PATCH] Reapply "CI Linux: use Vulkan directy from repo"

with the ppa:savoury1/ffmpeg4 (previous commit) no longer needed

This reverts commit 8922476204cf03f7275ce31755ce340541942149.
---
 .github/scripts/Linux/install_others.sh | 18 +-----------------
 .github/scripts/Linux/prepare.sh        |  1 +
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/scripts/Linux/install_others.sh b/.github/scripts/Linux/install_others.sh
index dd5dc6fa0..5527025c7 100755
--- a/.github/scripts/Linux/install_others.sh
+++ b/.github/scripts/Linux/install_others.sh
@@ -71,29 +71,13 @@ install_rav1e() {(
                 /usr/local/lib/pkgconfig/rav1e.pc
 )}
 
-# FFmpeg master needs at least v1.3.238 as for 23th Aug '23
-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 vulkan ximea
+        set -- gpujpeg ndi pipewire rav1e ximea
 fi
 
 if [ $show_help ]; then
diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh
index 8e7a5c704..a5e9d4708 100755
--- a/.github/scripts/Linux/prepare.sh
+++ b/.github/scripts/Linux/prepare.sh
@@ -30,6 +30,7 @@ sudo apt install libopencv-core-dev libopencv-imgproc-dev
 sudo apt install libcurl4-nss-dev
 sudo apt install i965-va-driver-shaders # instead of i965-va-driver
 sudo apt install uuid-dev # Cineform
+sudo apt install libvulkan-dev
 
 (
         . /etc/os-release