From 522ac7fd76d51bc024b4ba2fce3b515cb4a16d96 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 13 Jun 2024 11:08:26 +0200 Subject: [PATCH] add support for ffmpeg on Ubuntu 24.04 arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows * 5a79cf916821e0382dbdec3c544af1d280bbd618 adding 90-install-ffmpeg.sh * 83adc86c532f826565729cd963996222033e840c patchelf and -DQT_DEPLOY_FFMPEG=TRUE Task-number: QTBUG-126289 Pick-to: 6.8 Change-Id: I15300c5be750a784490d1e6cce935aeb423609ab Reviewed-by: Jøger Hansegård Reviewed-by: Artem Dyomin --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ .../qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 5ba7469e767..1c13f34f0f3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -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 - diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index 0c38274b872..b4c9d1491c4 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -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 diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh new file mode 100644 index 00000000000..61da9b7b3a4 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"