From fc7f26c777b59ff1795e99dcddbdf3a5b14fcf2d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 25 Jun 2020 16:23:30 +0200 Subject: [PATCH] Revert "GitHub CI: request at least C++11 for GPUJPEG [Lin]" This reverts commit 914d980f9d366d3a53aa8d37a51ccbe3d9c4e52c. No longer needed, GPUJPEG now enforces C++11 by itself. --- .github/scripts/Linux/prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index 4d175248e..5fd7f4799 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -26,7 +26,7 @@ sudo apt install portaudio19-dev libjack-jackd2-dev libasound-dev libv4l-dev sudo apt install libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libva-dev libvdpau-dev sudo apt install libopencv-dev sudo apt install libglib2.0-dev libcurl4-nss-dev -( mkdir gpujpeg/build && cd gpujpeg/build && cmake -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD_REQUIRED=YES -DCMAKE_C_COMPILER=$CUDA_HOST_COMPILER .. && make && sudo make install && sudo ldconfig ) +( mkdir gpujpeg/build && cd gpujpeg/build && CC=$CUDA_HOST_COMPILER cmake .. && make && sudo make install && sudo ldconfig ) ( sudo apt install uuid-dev && cd cineform-sdk/ && cmake -DBUILD_TOOLS=OFF . && make CFHDCodecStatic ) sudo apt install qtbase5-dev sudo chmod 777 /usr/local