aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Dyomin <artem.dyomin@qt.io>2023-09-27 15:59:36 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-10-23 11:19:51 +0000
commit86255e754b5e926ca9af61079708ca6ff0b246ab (patch)
tree57c017a9e82efd2130b48fd37c1794eebb736bbf
parent3e07db554a16a320011c95d3104283d441b9e57b (diff)
Install vlc binaries on ubuntu and macos for QtMM streaming tests
Cross-platform VLC provides a cmd-line interface for creating media streams, we use it in QtMultimedia integration tests. In the future, vlc might be replaced with something more light-weight, but for now let's just start running the streaming tests at least on these platform. Pick-to: 6.5 Change-Id: I887a98a1ee8f4a9f0a08d16124303bd10fa5a6ba Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit aea9fc281c0fb60b2e687c9afd228f889317109f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh3
-rw-r--r--coin/provisioning/qtci-macos-12-arm/90-vlc.sh8
-rw-r--r--coin/provisioning/qtci-macos-12-x86_64/90-vlc.sh8
-rw-r--r--coin/provisioning/qtci-macos-13-arm/90-vlc.sh8
-rw-r--r--coin/provisioning/qtci-macos-13-x86_64/90-vlc.sh8
-rw-r--r--coin/provisioning/qtci-macos-14-arm/90-vlc.sh8
-rw-r--r--coin/provisioning/qtci-macos-14-x86_64/90-vlc.sh8
9 files changed, 57 insertions, 0 deletions
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 d0be5cdb..8ed40db2 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
@@ -119,6 +119,9 @@ installPackages+=(libgstreamer-plugins-good1.0-dev)
installPackages+=(libgstreamer-plugins-bad1.0-dev)
installPackages+=(yasm)
installPackages+=(libva-dev)
+# for QtMultimedia streaming tests
+installPackages+=(vlc-bin)
+installPackages+=(vlc-plugin-base)
# 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 7be75679..1c47f17a 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
@@ -138,6 +138,9 @@ installPackages+=(gir1.2-gst-plugins-base-1.0)
installPackages+=(gir1.2-gst-plugins-bad-1.0)
installPackages+=(yasm)
installPackages+=(libva-dev)
+# for QtMultimedia streaming tests
+installPackages+=(vlc-bin)
+installPackages+=(vlc-plugin-base)
# 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 b2fcdd3e..3111723a 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
@@ -139,6 +139,9 @@ installPackages+=(gir1.2-gst-plugins-base-1.0)
installPackages+=(gir1.2-gst-plugins-bad-1.0)
installPackages+=(yasm)
installPackages+=(libva-dev)
+# for QtMultimedia streaming tests
+installPackages+=(vlc-bin)
+installPackages+=(vlc-plugin-base)
# Support for cross-building to x86 (needed by WebEngine boot2qt builds)
installPackages+=(g++-multilib)
diff --git a/coin/provisioning/qtci-macos-12-arm/90-vlc.sh b/coin/provisioning/qtci-macos-12-arm/90-vlc.sh
new file mode 100644
index 00000000..4924fe5c
--- /dev/null
+++ b/coin/provisioning/qtci-macos-12-arm/90-vlc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# for QtMM streaming tests
+brew install --cask vlc
diff --git a/coin/provisioning/qtci-macos-12-x86_64/90-vlc.sh b/coin/provisioning/qtci-macos-12-x86_64/90-vlc.sh
new file mode 100644
index 00000000..4924fe5c
--- /dev/null
+++ b/coin/provisioning/qtci-macos-12-x86_64/90-vlc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# for QtMM streaming tests
+brew install --cask vlc
diff --git a/coin/provisioning/qtci-macos-13-arm/90-vlc.sh b/coin/provisioning/qtci-macos-13-arm/90-vlc.sh
new file mode 100644
index 00000000..4924fe5c
--- /dev/null
+++ b/coin/provisioning/qtci-macos-13-arm/90-vlc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# for QtMM streaming tests
+brew install --cask vlc
diff --git a/coin/provisioning/qtci-macos-13-x86_64/90-vlc.sh b/coin/provisioning/qtci-macos-13-x86_64/90-vlc.sh
new file mode 100644
index 00000000..4924fe5c
--- /dev/null
+++ b/coin/provisioning/qtci-macos-13-x86_64/90-vlc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# for QtMM streaming tests
+brew install --cask vlc
diff --git a/coin/provisioning/qtci-macos-14-arm/90-vlc.sh b/coin/provisioning/qtci-macos-14-arm/90-vlc.sh
new file mode 100644
index 00000000..4924fe5c
--- /dev/null
+++ b/coin/provisioning/qtci-macos-14-arm/90-vlc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# for QtMM streaming tests
+brew install --cask vlc
diff --git a/coin/provisioning/qtci-macos-14-x86_64/90-vlc.sh b/coin/provisioning/qtci-macos-14-x86_64/90-vlc.sh
new file mode 100644
index 00000000..4924fe5c
--- /dev/null
+++ b/coin/provisioning/qtci-macos-14-x86_64/90-vlc.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# for QtMM streaming tests
+brew install --cask vlc