Skip to content

Commit 522ac7f

Browse files
committed
add support for ffmpeg on Ubuntu 24.04 arm64
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 <[email protected]> Reviewed-by: Artem Dyomin <[email protected]>
1 parent 4c5604e commit 522ac7f

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

coin/platform_configs/cmake_platforms.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Configurations:
4747
Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
4848
Environment variables: [
4949
'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
50-
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
50+
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
5151
]
5252
-
5353
Id: 'ubuntu-24.04-arm64'
@@ -58,7 +58,7 @@ Configurations:
5858
Environment variables: [
5959
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
6060
'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
61-
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
61+
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
6262
]
6363
# Test on Ubuntu 24.04 ARM64 offscreen
6464
-

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ installPackages+=(jq)
233233
installPackages+=(cmake)
234234
# extra linkers
235235
installPackages+=(lld)
236+
# Fix dependencies in shared ffmpeg libs
237+
installPackages+=(patchelf)
236238

237239
echo "Running update for apt"
238240
waitLoop
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"

0 commit comments

Comments
 (0)