From d38410e13d21a94dbee13fab9706eaa656b8432d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 9 Aug 2022 14:24:11 +0200 Subject: [PATCH] GitHub CI Linux GPUJPEG: revert to cmake This reverts 2c90fee5 that is hopefully no longer needed. + use function for the build instead of a nasty one-liner + parallel build --- .github/scripts/Linux/prepare.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index 2ce0bc08c..3f1f500e0 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -51,13 +51,11 @@ sudo apt --no-install-recommends install asciidoc xmlto sudo apt install libopencv-dev sudo apt install libcurl4-nss-dev -sudo apt install libtool # gpujpeg sudo apt install i965-va-driver-shaders # instead of i965-va-driver # Install cross-platform deps $GITHUB_WORKSPACE/.github/scripts/install-common-deps.sh -( ./ext-deps/bootstrap_gpujpeg.sh -d && mkdir ext-deps/gpujpeg/build && cd ext-deps/gpujpeg/build && CUDA_FLAGS=-D_FORCE_INLINES CXXFLAGS=-std=c++11 CC=$CUDA_HOST_COMPILER ../autogen.sh && make && sudo make install && sudo ldconfig || exit 1 ) sudo apt install qtbase5-dev sudo chmod 777 /usr/local @@ -84,6 +82,18 @@ install_cineform() {( sudo cmake --install . )} + +install_gpujpeg() {( + cd $GITHUB_WORKSPACE + ./ext-deps/bootstrap_gpujpeg.sh -d + mkdir ext-deps/gpujpeg/build + cd ext-deps/gpujpeg/build + CC=$CUDA_HOST_COMPILER cmake .. + cmake --build . --parallel + sudo cmake --install . + sudo ldconfig +)} + # Install NDI install_ndi() { ( @@ -109,6 +119,7 @@ cd .. install_aja install_cineform +install_gpujpeg install_ndi install_ximea