Skip to content

Commit

Permalink
add support for ffmpeg on Ubuntu 24.04 arm64
Browse files Browse the repository at this point in the history
This follows
* 5a79cf9 adding 90-install-ffmpeg.sh
* 83adc86 patchelf and -DQT_DEPLOY_FFMPEG=TRUE

Task-number: QTBUG-126289
Pick-to: 6.8
Change-Id: I15300c5be750a784490d1e6cce935aeb423609ab
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
  • Loading branch information
liangqi committed Sep 20, 2024
1 parent 4c5604e commit 522ac7f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions coin/platform_configs/cmake_platforms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Configurations:
Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
Environment variables: [
'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'
Expand All @@ -58,7 +58,7 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'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
-
Expand Down
2 changes: 2 additions & 0 deletions coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ installPackages+=(jq)
installPackages+=(cmake)
# extra linkers
installPackages+=(lld)
# Fix dependencies in shared ffmpeg libs
installPackages+=(patchelf)

echo "Running update for apt"
waitLoop
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"

0 comments on commit 522ac7f

Please sign in to comment.