diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-01-20 14:58:01 +0100 |
|---|---|---|
| committer | Artem Dyomin <artem.dyomin@qt.io> | 2023-01-24 09:22:06 +0000 |
| commit | e5cf7b2d584560f70ba143aac6a40ba80aea7bb6 (patch) | |
| tree | dee6cf0a10cf6070d0f424197ea6cc555e7fd5f3 /coin/provisioning/qtci-linux-CentOS-8.3-x86_64 | |
| parent | 015b6a7c7671bfd41686a1b8f2e76c4a21a5762e (diff) | |
Fix missing ffmpeg for desktop Linux CI platforms
What's done:
- ffmpeg build added to OpenSuse platforms
- installing of yasm moved to packages install file in
order to get rid of OS checkings
Pick-to: 6.5
Change-Id: I256f19a03e7f01d27923b083b63d9a6b6a5f29b4
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'coin/provisioning/qtci-linux-CentOS-8.3-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-install-ffmpeg.sh | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh index 6560e102..a41bc957 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh @@ -78,6 +78,8 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) +# yasm for QtMultimedia +installPackages+=(yasm) # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-install-ffmpeg.sh new file mode 100644 index 00000000..61da9b7b --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" |