diff options
| author | Simo Fält <simo.falt@qt.io> | 2022-06-13 12:04:05 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-01-05 07:51:26 +0000 |
| commit | fe8ff09deca2633d73e081133ce899f1d1d2fd76 (patch) | |
| tree | f43fbb07ac3998a149a65507d52b875225b1e26e | |
| parent | 965086f2bcf3fd312652b42c0154b5c7e9a4cebc (diff) | |
Enable QtMultimedia FFmpeg plugin build in packaging configs
Change-Id: I932baddbd940df945e07cdfcb298dc6095b45f69
Reviewed-by: Lars Knoll <lars.knoll@gmail.com>
(cherry picked from commit b794125ee9236b48304f29317c42df30ce642b11)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 7 | ||||
| -rwxr-xr-x | coin/provisioning/common/linux/install-ffmpeg.sh | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 3f257a76..83aeb02d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -49,6 +49,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_22H2-x86_64-50' @@ -57,6 +58,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_22H2-x86_64-50' @@ -134,7 +136,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' @@ -159,7 +162,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" |