Skip to content

Commit

Permalink
Reapply "CI Linux: use Vulkan directy from repo"
Browse files Browse the repository at this point in the history
with the ppa:savoury1/ffmpeg4 (previous commit) no longer needed

This reverts commit 8922476.
  • Loading branch information
MartinPulec committed Jul 16, 2024
1 parent 234821d commit 91b56cd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
18 changes: 1 addition & 17 deletions .github/scripts/Linux/install_others.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/scripts/Linux/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 91b56cd

Please sign in to comment.