lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-27 07:06:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

add support for ffmpeg on Ubuntu 24.04 arm64

Browse Source 
This follows
* 5a79cf9168 adding 90-install-ffmpeg.sh
* 83adc86c53 patchelf and -DQT_DEPLOY_FFMPEG=TRUE

Task-number: QTBUG-126289
Change-Id: I15300c5be750a784490d1e6cce935aeb423609ab
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 522ac7fd76)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Liang Qi
2024-06-13 11:08:26 +02:00
committed by Qt Cherry-pick Bot
parent 40d9225f48
commit 587e21bf17
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/cmake_platforms.yaml
View File

@@ -47,7 +47,7 @@ Configurations:
Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
Environment variables: [ Environment variables: [
'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
] ]
- -
Id: 'ubuntu-24.04-arm64' Id: 'ubuntu-24.04-arm64'
@@ -58,7 +58,7 @@ Configurations:
Environment variables: [ Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
] ]
# Test on Ubuntu 24.04 ARM64 offscreen # Test on Ubuntu 24.04 ARM64 offscreen
- -

2
coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh
View File

@@ -231,6 +231,8 @@ installPackages+=(jq)
installPackages+=(cmake) installPackages+=(cmake)
# extra linkers # extra linkers
installPackages+=(lld) installPackages+=(lld)
# Fix dependencies in shared ffmpeg libs
installPackages+=(patchelf)
echo "Running update for apt" echo "Running update for apt"
waitLoop waitLoop

3
coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"