File tree Expand file tree Collapse file tree 3 files changed +7
-2
lines changed
provisioning/qtci-linux-Ubuntu-24.04-aarch64 Expand file tree Collapse file tree 3 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ Configurations:
47
47
Configure arguments : ' -make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
48
48
Environment variables : [
49
49
' 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 '
51
51
]
52
52
-
53
53
Id : ' ubuntu-24.04-arm64'
@@ -58,7 +58,7 @@ Configurations:
58
58
Environment variables : [
59
59
' CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' ,
60
60
' 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'
62
62
]
63
63
# Test on Ubuntu 24.04 ARM64 offscreen
64
64
-
Original file line number Diff line number Diff line change @@ -233,6 +233,8 @@ installPackages+=(jq)
233
233
installPackages+=(cmake)
234
234
# extra linkers
235
235
installPackages+=(lld)
236
+ # Fix dependencies in shared ffmpeg libs
237
+ installPackages+=(patchelf)
236
238
237
239
echo " Running update for apt"
238
240
waitLoop
Original file line number Diff line number Diff line change
1
+ #! /usr/bin/env bash
2
+
3
+ source " ${BASH_SOURCE%/* } /../common/unix/install-ffmpeg.sh" " linux"
You can’t perform that action at this time.
0 commit comments