From 8cb7e7e7791c42306c748fc814dbd703af492e61 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 5 Apr 2023 08:25:49 +0200 Subject: [PATCH] CI Linux: use Vulkan directy from repo --- .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 5d65ecd38..545b13983 100755 --- a/.github/scripts/Linux/install_others.sh +++ b/.github/scripts/Linux/install_others.sh @@ -53,29 +53,13 @@ install_ndi() {( sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' < 'NDI SDK for Linux/Version.txt' | sudo tee /usr/local/include/ndi_version.h )} -# TODO: needed only for U18.04, remove after upgrading to U20.04 -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 - 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 -- aja gpujpeg live555 ndi vulkan ximea + set -- aja gpujpeg live555 ndi ximea fi if [ $show_help ]; then diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index 886e12ead..887166a49 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -26,6 +26,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 get_build_deps_excl() { # $2 - pattern to exclude apt-cache showsrc "$1" | sed -n '/^Build-Depends:/{s/Build-Depends://;p;q}' | tr ',' '\n' | cut -f 2 -d\ | grep -v "$2"