diff --git a/coin/provisioning/common/linux/ffmpeg_required_opensuse_packages.txt b/coin/provisioning/common/linux/ffmpeg_required_opensuse_packages.txt new file mode 100644 index 00000000..013c6248 --- /dev/null +++ b/coin/provisioning/common/linux/ffmpeg_required_opensuse_packages.txt @@ -0,0 +1,3 @@ +diffutils +make +yasm diff --git a/coin/provisioning/common/linux/ffmpeg_required_rhel_packages.txt b/coin/provisioning/common/linux/ffmpeg_required_rhel_packages.txt new file mode 100644 index 00000000..154c017f --- /dev/null +++ b/coin/provisioning/common/linux/ffmpeg_required_rhel_packages.txt @@ -0,0 +1,4 @@ +diffutils +libva-devel +make +yasm diff --git a/coin/provisioning/common/linux/ffmpeg_required_sles_packages.txt b/coin/provisioning/common/linux/ffmpeg_required_sles_packages.txt new file mode 100644 index 00000000..013c6248 --- /dev/null +++ b/coin/provisioning/common/linux/ffmpeg_required_sles_packages.txt @@ -0,0 +1,3 @@ +diffutils +make +yasm diff --git a/coin/provisioning/common/linux/ffmpeg_required_ubuntu_packages.txt b/coin/provisioning/common/linux/ffmpeg_required_ubuntu_packages.txt new file mode 100644 index 00000000..8183c50d --- /dev/null +++ b/coin/provisioning/common/linux/ffmpeg_required_ubuntu_packages.txt @@ -0,0 +1,4 @@ +diffutils +libva-dev +make +yasm diff --git a/coin/provisioning/common/macos/ffmpeg_required_brew_packages.txt b/coin/provisioning/common/macos/ffmpeg_required_brew_packages.txt new file mode 100644 index 00000000..82964996 --- /dev/null +++ b/coin/provisioning/common/macos/ffmpeg_required_brew_packages.txt @@ -0,0 +1,2 @@ +diffutils +yasm diff --git a/coin/provisioning/common/macos/install-ffmpeg-macos.sh b/coin/provisioning/common/macos/install-ffmpeg-macos.sh index 65d7ed6b..8d3ad974 100755 --- a/coin/provisioning/common/macos/install-ffmpeg-macos.sh +++ b/coin/provisioning/common/macos/install-ffmpeg-macos.sh @@ -41,7 +41,11 @@ build_ffmpeg() { popd } -brew install yasm +# Install required packages through Brew +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../macos/ffmpeg_required_brew_packages.txt" +brew install "${required_ffmpeg_packages[@]}" + export MACOSX_DEPLOYMENT_TARGET=12 fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh" diff --git a/coin/provisioning/common/windows/ffmpeg_required_msys_packages.txt b/coin/provisioning/common/windows/ffmpeg_required_msys_packages.txt new file mode 100644 index 00000000..013c6248 --- /dev/null +++ b/coin/provisioning/common/windows/ffmpeg_required_msys_packages.txt @@ -0,0 +1,3 @@ +diffutils +make +yasm diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 6af8f6fe..ad4f2bbd 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -20,7 +20,8 @@ $url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package" $TargetLocation = "C:\Utils" -$required_packages = @("perl", "make", "yasm", "diffutils") +$required_packages = @("perl") +$required_packages += Get-Content "$PSScriptRoot\..\windows\ffmpeg_required_msys_packages.txt" if ((Test-Path $url_cache_prebuilt)) { $PackagePath = "C:\Windows\Temp\$package_prebuilt" diff --git a/coin/provisioning/qtci-linux-RHEL-10.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-10.0-x86_64/04-install-packages.sh index 5fe5e568..3513456e 100755 --- a/coin/provisioning/qtci-linux-RHEL-10.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-10.0-x86_64/04-install-packages.sh @@ -54,8 +54,10 @@ installPackages+=(gstreamer1-plugins-base-devel) #installPackages+=(gstreamer1-plugin-openh264) # pipewire for QtMultimedia installPackages+=(pipewire-devel) -# yasm for QtMultimedia -installPackages+=(yasm) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 95f96d7c..f10beeba 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -60,9 +60,10 @@ installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) # pipewire for QtMultimedia installPackages+=(pipewire-devel) -# for QtMultimedia, ffmpeg -installPackages+=(yasm) -installPackages+=(libva-devel) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb 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 cb04d9e0..1e9eab20 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 @@ -47,9 +47,10 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# for QtMultimedia, ffmpeg -installPackages+=(yasm) -installPackages+=(libva-devel) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # 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 0ba15834..7b6c4dcb 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 @@ -48,9 +48,10 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# for QtMultimedia, ffmpeg -installPackages+=(yasm) -installPackages+=(libva-devel) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # 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 d0e2b788..5e2bd8f0 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 @@ -60,9 +60,10 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# for QtMultimedia, ffmpeg -installPackages+=(yasm) -installPackages+=(libva-devel) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # 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 98524df9..a708c6f0 100755 --- 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 @@ -60,9 +60,10 @@ installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) # pipewire for QtMultimedia installPackages+=(pipewire-devel) -# for QtMultimedia, ffmpeg -installPackages+=(yasm) -installPackages+=(libva-devel) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # 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 8b02730b..28800f33 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 @@ -50,9 +50,10 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) -# QtMultimedia, ffmpeg -installPackages+=(yasm) -installPackages+=(libva-devel) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index 70671970..1e53e4ec 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -68,8 +68,10 @@ installPackages+=(gstreamer1-plugins-base-devel) installPackages+=(gstreamer1-plugin-openh264) # pipewire for QtMultimedia installPackages+=(pipewire-devel) -# yasm for QtMultimedia -installPackages+=(yasm) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh index a5c1621d..6aff3c0d 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -68,8 +68,10 @@ installPackages+=(gstreamer1-plugins-base-devel) installPackages+=(gstreamer1-plugin-openh264) # pipewire for QtMultimedia installPackages+=(pipewire-devel) -# yasm for QtMultimedia -installPackages+=(yasm) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb diff --git a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh index 7a49b2ba..e2f240b0 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh @@ -68,8 +68,10 @@ installPackages+=(gstreamer1-plugins-base-devel) installPackages+=(gstreamer1-plugin-openh264) # pipewire for QtMultimedia installPackages+=(pipewire-devel) -# yasm for QtMultimedia -installPackages+=(yasm) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_rhel_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # 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 5dde6e95..147536db 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 @@ -65,8 +65,10 @@ sudo zypper -nq install libva-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_sles_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh index a52316da..39150971 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh @@ -63,8 +63,10 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \ # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_sles_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel \ diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh index 5cc0037b..b8e67193 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh @@ -66,8 +66,10 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \ # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_sles_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-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 58f9e978..0a823887 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 @@ -91,6 +91,10 @@ installPackages+=(libva-dev) # for QtMultimedia streaming tests installPackages+=(vlc-bin) installPackages+=(vlc-plugin-base) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_ubuntu_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # Support for cross-building to x86 (needed by WebEngine boot2qt builds) installPackages+=(g++-multilib) 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 03b70fe7..456cb07d 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 @@ -109,6 +109,10 @@ installPackages+=(libva-dev) # for QtMultimedia streaming tests installPackages+=(vlc-bin) installPackages+=(vlc-plugin-base) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_ubuntu_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # 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 3ee1f860..c08f7f5d 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 @@ -114,6 +114,10 @@ installPackages+=(libva-dev) # for QtMultimedia streaming tests installPackages+=(vlc-bin) installPackages+=(vlc-plugin-base) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_ubuntu_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # Support for cross-building to x86 (needed by WebEngine boot2qt builds) installPackages+=(g++-multilib) diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index f415031c..1da986be 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -116,6 +116,10 @@ installPackages+=(libva-dev) # for QtMultimedia streaming tests installPackages+=(vlc-bin) installPackages+=(vlc-plugin-base) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_ubuntu_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # for tst_qfloat16format, see also QTQAINFRA-6390 installPackages+=(locales-all) diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index f5cde64f..db6cd6df 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -115,6 +115,10 @@ installPackages+=(libva-dev) # for QtMultimedia streaming tests installPackages+=(vlc-bin) installPackages+=(vlc-plugin-base) +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_ubuntu_packages.txt" +installPackages+=("${required_ffmpeg_packages[@]}") # for tst_qfloat16format, see also QTQAINFRA-6390 installPackages+=(locales-all) 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 6bd815e9..00fd3f5c 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 @@ -48,12 +48,14 @@ sudo zypper -nq install libva-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm - # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_opensuse_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" + # cups sudo zypper -nq install cups-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 67670659..b0c4bbd9 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 @@ -48,12 +48,14 @@ sudo zypper -nq install libva-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm - # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_opensuse_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" + # cups sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index 9707063c..fed5e676 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -51,13 +51,15 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \ # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm - # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel \ gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_opensuse_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" + # cups sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh index a344dd74..61c5875d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh @@ -49,12 +49,14 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \ # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm - # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel gstreamer-plugin-openh264 +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_opensuse_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" + # cups sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh index b36e9081..e3aa3546 100755 --- a/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/04-zypperpackages.sh @@ -52,12 +52,14 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \ # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel -# yasm (for ffmpeg in multimedia) -sudo zypper -nq install yasm - # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel # gstreamer-plugin-openh264 not available +# Required FFmpeg packages +required_ffmpeg_packages=() +while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../common/linux/ffmpeg_required_opensuse_packages.txt" +sudo zypper -nq install "${required_ffmpeg_packages[@]}" + # cups sudo zypper -nq install cups-devel