From dd9bbbcfe25155a4c9db3e9fa86142e4e99804c6 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Mon, 10 Aug 2020 02:46:25 +0200 Subject: [PATCH] cmake: Enable FFmpeg Encoders on Linux --- .github/workflows/main.yml | 3 ++- .github/workflows/validate.yml | 2 +- CMakeLists.txt | 13 +++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cfad218d..07e53da2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -127,7 +127,8 @@ jobs: cmake \ ninja-build \ git \ - qt5-default libqwt-qt5-dev libqt5svg5-dev + qt5-default libqwt-qt5-dev libqt5svg5-dev \ + libavcodec-dev libavutil-dev libswscale-dev ${{ matrix.extra_command }} - name: "Cache: Prerequisites" uses: actions/cache@v2 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 6f442b2f..e8402ce2 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -22,7 +22,7 @@ jobs: git submodule update --init --recursive sudo apt-get -qq update sudo apt-get purge libjpeg9-dev:amd64 libjpeg8-dev:amd64 libjpeg-turbo8-dev:amd64 - sudo apt-get install build-essential clang clang-format checkinstall pkg-config cmake ninja-build git qt5-default libqwt-qt5-dev libqt5svg5-dev + sudo apt-get install build-essential clang clang-format checkinstall pkg-config cmake ninja-build git qt5-default libqwt-qt5-dev libqt5svg5-dev libavcodec-dev libavutil-dev libswscale-dev - name: "Cache: Prerequisites" uses: actions/cache@v2 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 170708b9..34c7ae0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,6 +217,19 @@ if(WIN32) set(ENABLE_SOURCE_MIRROR TRUE) set(ENABLE_SOURCE_SHADER TRUE) set(ENABLE_TRANSITION_SHADER TRUE) +elseif(NOT APPLE) + set(ENABLE_ENCODER_FFMPEG TRUE) + set(ENABLE_FILTER_BLUR TRUE) + set(ENABLE_FILTER_COLOR_GRADE TRUE) + set(ENABLE_FILTER_DISPLACEMENT TRUE) + set(ENABLE_FILTER_DYNAMIC_MASK TRUE) + set(ENABLE_FILTER_NVIDIA_FACE_TRACKING FALSE) + set(ENABLE_FILTER_SDF_EFFECTS TRUE) + set(ENABLE_FILTER_SHADER TRUE) + set(ENABLE_FILTER_TRANSFORM TRUE) + set(ENABLE_SOURCE_MIRROR TRUE) + set(ENABLE_SOURCE_SHADER TRUE) + set(ENABLE_TRANSITION_SHADER TRUE) else() set(ENABLE_ENCODER_FFMPEG FALSE) set(ENABLE_FILTER_BLUR TRUE)