From 3a69f0d31bb5ff605437e55f4369fdebf602145a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 10 Feb 2023 17:15:08 +0100 Subject: [PATCH] Add libva-devel and gbm-devel packages for qtwebengine Will be needed in Qt 6.6 for VA-API Change-Id: I4389ee03eb85a05f9bce37a0eb4629d30e1aefd1 Reviewed-by: Alexandru Croitor (cherry picked from commit d1552c26a8f60fcd0e4bbc67f3f0755e7da8292e) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 2 ++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 2 ++ .../qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh | 2 +- 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index 8de9a630..3ba4147e 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -102,11 +102,14 @@ installPackages+=(gperftools-libs) installPackages+=(gperf) installPackages+=(alsa-lib-devel) installPackages+=(pulseaudio-libs-devel) +installPackages+=(libdrm-devel) +installPackages+=(libva-devel) installPackages+=(libXtst-devel) installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) installPackages+=(python3-html5lib) +installPackages+=(mesa-libgbm-devel) # For Android builds installPackages+=(java-11-openjdk-devel) # For receiving shasum diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index 751ac5d1..aa9ecda1 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -102,12 +102,15 @@ installPackages+=(gperftools-libs) installPackages+=(gperf) installPackages+=(alsa-lib-devel) installPackages+=(pulseaudio-libs-devel) +installPackages+=(libdrm-devel) +installPackages+=(libva-devel) installPackages+=(libuuid-devel) installPackages+=(libXtst-devel) installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) installPackages+=(python3-html5lib) +installPackages+=(mesa-libgbm-devel-21.3.4-2.el9) installPackages+=(libstdc++-static) # For Android builds installPackages+=(java-11-openjdk-devel) diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index a9e95902..13e49247 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -93,6 +93,7 @@ installPackages+=(libxi-dev) installPackages+=(libdbus-1-dev) # Needed libraries for WebEngine installPackages+=(libudev-dev) +installPackages+=(libdrm-dev) installPackages+=(libegl1-mesa-dev) installPackages+=(libfontconfig1-dev) installPackages+=(libgbm-dev) @@ -100,6 +101,7 @@ installPackages+=(liblcms2-dev) installPackages+=(libpci-dev) installPackages+=(libre2-dev) installPackages+=(libsnappy-dev) +installPackages+=(libva-dev) installPackages+=(libvpx-dev) installPackages+=(libxkbfile-dev) installPackages+=(libxshmfence-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index 8c105fd9..2cce98fc 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -94,6 +94,7 @@ installPackages+=(libdbus-1-dev) # Needed libraries for WebEngine installPackages+=(udev) installPackages+=(libudev-dev) +installPackages+=(libdrm-dev) installPackages+=(libegl1-mesa-dev) installPackages+=(libfontconfig1-dev) installPackages+=(libgbm-dev) @@ -101,6 +102,7 @@ installPackages+=(liblcms2-dev) installPackages+=(libpci-dev) installPackages+=(libre2-dev) installPackages+=(libsnappy-dev) +installPackages+=(libva-dev) installPackages+=(libvpx-dev) installPackages+=(libxkbfile-dev) installPackages+=(libxshmfence-dev) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh index a7c2b83e..bec0d63b 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh @@ -38,7 +38,7 @@ sudo zypper -nq install libicu-devel sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \ - libxshmfence-devel libXdamage-devel + libxshmfence-devel libXdamage-devel libdrm-devel libgbm-devel libva-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh index 487d4607..ebd90cfd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh @@ -70,7 +70,7 @@ sudo zypper -nq install libicu-devel sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \ - libxshmfence-devel libXdamage-devel + libxshmfence-devel libXdamage-devel libdrm-devel libgbm-devel libva-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel