Alexandre Julliard : gitlab: Install the gstreamer packages from deb-multimedia.org.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ac6a2f2c19caa2aa07e524ffd529c5c66c0754d1
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ac6a2f2c19caa2aa07e524ffd529c5c...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Jul 12 19:00:22 2023 +0200

gitlab: Install the gstreamer packages from deb-multimedia.org.

The standard bookworm packages don't support multilib.

---

 tools/gitlab/image.docker | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker
index c7f9bcd1c08..50607d13872 100644
--- a/tools/gitlab/image.docker
+++ b/tools/gitlab/image.docker
@@ -23,7 +23,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
                        libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \
                        libgnutls28-dev:amd64 libgnutls28-dev:i386 \
                        libgphoto2-dev:amd64 libgphoto2-dev:i386 \
-                       libgstreamer-plugins-base1.0-dev:i386 \
                        libice-dev:amd64 libice-dev:i386 \
                        libkrb5-dev:amd64 libkrb5-dev:i386 \
                        libosmesa6-dev:amd64 libosmesa6-dev:i386 \
@@ -52,8 +51,15 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
                        unixodbc-dev:amd64 unixodbc-dev:i386 \
                        x11proto-dev && \
     apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \
-                       winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio libasound2-plugins:amd64 libasound2-plugins:i386 \
-                       libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \
+                       winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio && \
+    curl -O https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multim... && \
+    dpkg -i deb-multimedia-keyring_2016.8.1_all.deb && \
+    echo 'deb https://www.deb-multimedia.org bookworm main' >> /etc/apt/sources.list && \
+    apt-get update && \
+    apt-get install -y libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \
+                       libasound2-plugins:amd64 libasound2-plugins:i386 \
+                       libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 \
+                       gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \
                        gstreamer1.0-plugins-base:amd64 gstreamer1.0-plugins-good:amd64 gstreamer1.0-plugins-bad:amd64 gstreamer1.0-plugins-ugly:amd64 \
                        gstreamer1.0-plugins-base:i386 gstreamer1.0-plugins-good:i386 gstreamer1.0-plugins-bad:i386 gstreamer1.0-plugins-ugly:i386 && \
     apt-get clean && \