mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
add support for ffmpeg on Ubuntu 24.04 arm64
This follows *5a79cf9168adding 90-install-ffmpeg.sh *83adc86c53patchelf 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>
This commit is contained in:
@@ -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'
|
||||
@@ -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
|
||||
-
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
|
||||
Reference in New Issue
Block a user