diff options
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 7 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/install-ffmpeg.sh | 7 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index c7393e42..87ccc164 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -51,6 +51,7 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}', 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64'] - Template: 'qtci-windows-11_21H2-x86_64-51' @@ -59,6 +60,7 @@ Configurations: Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -136,7 +138,8 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc' + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] - Id: 'ios-universal' @@ -161,7 +164,7 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw' ] diff --git a/coin/provisioning/common/linux/install-ffmpeg.sh b/coin/provisioning/common/linux/install-ffmpeg.sh index 0dbf86ae..d6b452e3 100755 --- a/coin/provisioning/common/linux/install-ffmpeg.sh +++ b/coin/provisioning/common/linux/install-ffmpeg.sh @@ -49,7 +49,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") -sudo apt install yasm +if [ -f /etc/redhat-release ] +then + sudo sudo yum -y install yasm +else + sudo apt install yasm +fi version="n5.0" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh new file mode 100644 index 00000000..6d8981c4 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-ffmpeg.sh" + |