From 354db953e6363571b368f8e7065b3087aacee56f Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Fri, 22 Oct 2021 01:56:47 +0200
Subject: [PATCH] Qt: add QtMultimedia to ci

---
 .ci/install-freebsd.sh | 2 +-
 .ci/setup-windows.sh   | 2 ++
 .cirrus.yml            | 2 +-
 azure-pipelines.yml    | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh
index 55ed346a97..3f608d8a96 100755
--- a/.ci/install-freebsd.sh
+++ b/.ci/install-freebsd.sh
@@ -12,7 +12,7 @@ pkg info # debug
 pkg install llvm12
 
 # Mandatory dependencies (qt5-dbus and qt5-gui are pulled via qt5-widgets)
-pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent glew openal-soft ffmpeg
+pkg install git ccache cmake ninja qt5-qmake qt5-buildtools qt5-widgets qt5-concurrent qt5-multimedia glew openal-soft ffmpeg
 
 # Optional dependencies (libevdev is pulled by qt5-gui)
 pkg install pkgconf alsa-lib pulseaudio sdl2 evdev-proto vulkan-headers vulkan-loader
diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh
index 71377a5be1..2513451f6e 100755
--- a/.ci/setup-windows.sh
+++ b/.ci/setup-windows.sh
@@ -17,6 +17,7 @@ QT_BASE_URL="${QT_HOST}${QT_PREFIX}qtbase${QT_SUFFIX}"
 QT_WINE_URL="${QT_HOST}${QT_PREFIX}qtwinextras${QT_SUFFIX}"
 QT_DECL_URL="${QT_HOST}${QT_PREFIX}qtdeclarative${QT_SUFFIX}"
 QT_TOOL_URL="${QT_HOST}${QT_PREFIX}qttools${QT_SUFFIX}"
+QT_MM_URL="${QT_HOST}${QT_PREFIX}qtmultimedia${QT_SUFFIX}"
 LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z'
 GLSLANG_URL='https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z'
 VULKAN_SDK_URL="https://www.dropbox.com/s/fjlh97hrz0crqxv/VulkanSDK-1.2.182.0-Installer.exe"
@@ -26,6 +27,7 @@ DEP_URLS="         \
     $QT_WINE_URL   \
     $QT_DECL_URL   \
     $QT_TOOL_URL   \
+    $QT_MM_URL     \
     $LLVMLIBS_URL  \
     $GLSLANG_URL   \
     $VULKAN_SDK_URL"
diff --git a/.cirrus.yml b/.cirrus.yml
index efdf6364e7..ab765f3fc7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -60,7 +60,7 @@ windows_task:
 
 linux_task:
   container:
-    image: rpcs3/rpcs3-ci-bionic:1.1
+    image: rpcs3/rpcs3-ci-bionic:1.3
     cpu: 4
     memory: 16G
   env:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 604e8bec8e..00c55d15e2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,13 +35,13 @@ jobs:
     displayName: ccache
 
   - bash: |
-      docker pull --quiet rpcs3/rpcs3-ci-bionic:1.1
+      docker pull --quiet rpcs3/rpcs3-ci-bionic:1.3
       docker run                      \
         -v $(pwd):/rpcs3              \
         --env-file .ci/docker.env \
         -v $CCACHE_DIR:/root/.ccache  \
         -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
-        rpcs3/rpcs3-ci-bionic:1.1 \
+        rpcs3/rpcs3-ci-bionic:1.3 \
         /rpcs3/.ci/build-linux.sh
     displayName: Docker setup and build