From c0bd7126b3b701f48a44df64b59d09f9ac0aebcb Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Wed, 2 Aug 2023 14:20:05 +0200 Subject: [PATCH] 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. Change-Id: I60fcc0b43e5800b7dc5621bfb835c72237fd9b02 Reviewed-by: Lars Knoll (cherry picked from commit 76f4cebd210b1d5fe01cb2a122df4980f382c149) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh | 5 ++++- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 ++ coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 1 + .../qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh | 5 ++++- .../qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh | 5 ++++- 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 e9f436c6..3393efee 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 @@ -78,8 +78,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 23ffdf57..074f420f 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 @@ -79,8 +79,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 69e55a78..8f6bd425 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 f2358f3c..b44fc80a 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 7a93e6af..c9366ac2 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 @@ -81,8 +81,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 c6becca9..77813424 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 @@ -93,7 +93,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 0fe55a08..d0be5cdb 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 @@ -118,6 +118,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 40d853e3..7be75679 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 @@ -137,6 +137,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 a8121b61..3647c1bb 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 @@ -138,6 +138,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 ebd90cfd..e1dc5a01 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,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