diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2023-08-02 14:20:05 +0200 |
---|---|---|
committer | Artem Dyomin <artem.dyomin@qt.io> | 2023-08-12 15:58:25 +0000 |
commit | 76f4cebd210b1d5fe01cb2a122df4980f382c149 (patch) | |
tree | d3a466145d96212ae03ca55863cb475e36e33e77 /coin/provisioning | |
parent | 2f8168436d68a569f66d020540084f2804d8d0b6 (diff) |
Add libvaapi to the ffmpeg build on Linux x86_64
We need to provide hw acceleration in qtmultimedia linux packages,
vaapi interface is already integrated to the module.
To be described in QtMM documentation.
Pick-to: 6.6 6.5
Change-Id: I60fcc0b43e5800b7dc5621bfb835c72237fd9b02
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'coin/provisioning')
11 files changed, 26 insertions, 8 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 8ab75e44..34f6b114 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 @@ -41,8 +41,9 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# yasm for QtMultimedia +# for QtMultimedia, ffmpeg installPackages+=(yasm) +installPackages+=(libva-devel) # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb 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 adb9b297..a968ea50 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 @@ -42,8 +42,9 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# yasm for QtMultimedia +# for QtMultimedia, ffmpeg installPackages+=(yasm) +installPackages+=(libva-devel) # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh index 6e3049ee..9cfc083b 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh @@ -56,8 +56,9 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# yasm for QtMultimedia +# for QtMultimedia, ffmpeg installPackages+=(yasm) +installPackages+=(libva-devel) # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 98153836..dd2c6ea1 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -56,8 +56,9 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# yasm for QtMultimedia +# for QtMultimedia, ffmpeg installPackages+=(yasm) +installPackages+=(libva-devel) # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb 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 136e9228..a23ea8c6 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 @@ -44,8 +44,9 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# yasm for QtMultimedia +# QtMultimedia, ffmpeg installPackages+=(yasm) +installPackages+=(libva-devel) # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh index 3de6516d..4fefb1af 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh @@ -56,7 +56,10 @@ sudo zypper -nq install --force-resolution libxcb-cursor0 xcb-util-cursor-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 glproto-devel libxshmfence-devel \ - libgbm-devel libva-devel Mesa-dri-devel + libgbm-devel Mesa-dri-devel + +# qtwebengine, qtmultimedia+ffmpeg +sudo zypper -nq install libva-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 3f091e42..6bfc77a6 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -81,6 +81,8 @@ installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(yasm) +installPackages+=(libva-dev) + # Support for cross-building to x86 (needed by WebEngine boot2qt builds) installPackages+=(g++-multilib) # python3 development package 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 c48eda70..bc4386c5 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 @@ -100,6 +100,7 @@ installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) installPackages+=(yasm) +installPackages+=(libva-dev) # Support for cross-building to x86 (needed by WebEngine boot2qt builds) installPackages+=(g++-multilib) 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 623ad0c9..e7382093 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 @@ -101,6 +101,7 @@ installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) installPackages+=(yasm) +installPackages+=(libva-dev) # Support for cross-building to x86 (needed by WebEngine boot2qt builds) installPackages+=(g++-multilib) 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 bec0d63b..b90ba102 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,10 @@ 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 libdrm-devel libgbm-devel libva-devel + libxshmfence-devel libXdamage-devel libdrm-devel libgbm-devel + +# qtwebengine, qtmultimedia+ffmpeg +sudo zypper -nq install 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 ccba7839..7308f316 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 @@ -39,7 +39,10 @@ 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 libdrm-devel libgbm-devel libva-devel + libxshmfence-devel libXdamage-devel libdrm-devel libgbm-devel + +# qtwebengine, qtmultimedia+ffmpeg +sudo zypper -nq install libva-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel |