mirror of
https://github.com/outbackdingo/UltraGrid.git
synced 2026-03-20 23:40:18 +00:00
Reapply "CI Linux: use Vulkan directy from repo"
with the ppa:savoury1/ffmpeg4 (previous commit) no longer needed
This reverts commit 8922476204.
This commit is contained in:
18
.github/scripts/Linux/install_others.sh
vendored
18
.github/scripts/Linux/install_others.sh
vendored
@@ -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
|
||||
|
||||
1
.github/scripts/Linux/prepare.sh
vendored
1
.github/scripts/Linux/prepare.sh
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user