aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-26 13:12:03 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-06 10:28:27 +0000
commitc0c484278d63ec97355f4bd03a3f5a3383072e3f (patch)
treefe809235977f91ec2c14f41988ae795b69d4a1d8
parente3e388d76cf397282e2934705a681852b6e528ff (diff)
Add qtwebengine dependencies to provisioning
Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3f551fedd6d4553dc9187b2aaaaf8fb10a15f03a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh13
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh5
4 files changed, 18 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
index ae1b1346..2c0b251b 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
@@ -86,6 +86,7 @@ installPackages+=(gperf)
installPackages+=(alsa-lib-devel)
installPackages+=(pulseaudio-libs-devel)
installPackages+=(libXtst-devel)
+installPackages+=(libxshmfence-devel)
installPackages+=(nspr-devel)
installPackages+=(nss-devel)
# For Android builds
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
index 5eeca980..4606f8eb 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
@@ -80,9 +80,9 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev
sudo zypper -nq install libicu-devel libicu60_2
# qtwebengine
-sudo zypper -nq install alsa-devel dbus-1-devel \
+sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
- mozilla-nspr-devel mozilla-nss-devel
+ mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel
# qtwebkit
sudo zypper -nq install libxml2-devel libxslt-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 bed92aab..62274e0d 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
@@ -86,6 +86,9 @@ installPackages+=(libdbus-1-dev)
installPackages+=(libudev-dev)
installPackages+=(libegl1-mesa-dev)
installPackages+=(libfontconfig1-dev)
+installPackages+=(libgbm-dev)
+installPackages+=(libxkbfile-dev)
+installPackages+=(libxshmfence-dev)
installPackages+=(libxss-dev)
installPackages+=(nodejs)
# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
@@ -114,6 +117,10 @@ installPackages+=(libgstreamer1.0-dev)
installPackages+=(libgstreamer-plugins-base1.0-dev)
installPackages+=(libgstreamer-plugins-good1.0-dev)
installPackages+=(libgstreamer-plugins-bad1.0-dev)
+installPackages+=(libgstreamer-gl1.0-0)
+installPackages+=(gir1.2-gst-plugins-base-1.0)
+installPackages+=(gir1.2-gst-plugins-bad-1.0)
+
# Support for cross-building to x86 (needed by WebEngine boot2qt builds)
installPackages+=(g++-multilib)
# python3 development package
@@ -129,6 +136,11 @@ installPackages+=(mesa-common-dev)
installPackages+=(libgl1-mesa-glx)
installPackages+=(libgl1-mesa-dev)
installPackages+=(libegl1-mesa-dev)
+installPackages+=(libegl1)
+installPackages+=(libegl-mesa0)
+installPackages+=(libegl-dev)
+installPackages+=(libglvnd-dev)
+installPackages+=(libgles2-mesa-dev)
installPackages+=(curl)
installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
@@ -142,7 +154,6 @@ installPackages+=(libxcomposite-dev)
installPackages+=(libxdamage-dev)
installPackages+=(libxrandr-dev)
installPackages+=(libfontconfig1-dev)
-installPackages+=(libxss-dev)
installPackages+=(libsrtp2-dev)
installPackages+=(libwebp-dev)
installPackages+=(libjsoncpp-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 0687d63c..0fcab74d 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
@@ -35,9 +35,10 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev
sudo zypper -nq install libicu-devel
# qtwebengine
-sudo zypper -nq install alsa-devel dbus-1-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 nodejs10 nodejs10-devel glproto-devel
+ mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel \
+ libxshmfence-devel libXdamage-devel
# qtwebkit
sudo zypper -nq install libxml2-devel libxslt-devel