From: Rémi Bernon rbernon@codeweavers.com
It's not normally possible to cross install gstreamer -dev packages on Debian, because of some conflicting gir files. We don't need these and we only care about headers and libraries. Extracting the packages contents manually instead works just fine. --- tools/gitlab/image-amd64.docker | 26 ++++++++++++++++++-------- tools/gitlab/image-arm64.docker | 12 +++++++++++- 2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/tools/gitlab/image-amd64.docker b/tools/gitlab/image-amd64.docker index 0145cf583f6..9e826a08e8f 100644 --- a/tools/gitlab/image-amd64.docker +++ b/tools/gitlab/image-amd64.docker @@ -26,13 +26,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ fvwm \ gettext \ git \ - gstreamer1.0-libav:i386 \ - gstreamer1.0-plugins-bad:i386 \ - gstreamer1.0-plugins-base:i386 \ - gstreamer1.0-plugins-good:i386 \ - gstreamer1.0-plugins-ugly:i386 \ + gstreamer1.0-libav:amd64 gstreamer1.0-libav:i386 \ + gstreamer1.0-plugins-bad:amd64 gstreamer1.0-plugins-bad:i386 \ + gstreamer1.0-plugins-base:amd64 gstreamer1.0-plugins-base:i386 \ + gstreamer1.0-plugins-good:amd64 gstreamer1.0-plugins-good:i386 \ + gstreamer1.0-plugins-ugly:amd64 gstreamer1.0-plugins-ugly:i386 \ libasound2-dev:amd64 libasound2-dev:i386 \ - libasound2-plugins:i386 \ + libasound2-plugins:amd64 libasound2-plugins:i386 \ libavcodec-dev:amd64 libavcodec-dev:i386 \ libavformat-dev:amd64 libavformat-dev:i386 \ libavutil-dev:amd64 libavutil-dev:i386 \ @@ -43,12 +43,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libfontconfig-dev:amd64 libfontconfig-dev:i386 \ libfreetype-dev:amd64 libfreetype-dev:i386 \ libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ + libglib2.0-dev:amd64 libglib2.0-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 \ - libmjpegutils-2.1-0:i386 \ + libmjpegutils-2.1-0:amd64 libmjpegutils-2.1-0:i386 \ + liborc-0.4-dev:amd64 liborc-0.4-dev:i386 \ libpcap-dev:amd64 libpcap-dev:i386 \ libpcsclite-dev:amd64 \ libpulse-dev:amd64 libpulse-dev:i386 \ @@ -81,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ ocl-icd-opencl-dev:amd64 ocl-icd-opencl-dev:i386 \ perl \ pulseaudio \ + rsync \ samba-dev:amd64 \ unixodbc-dev:amd64 unixodbc-dev:i386 \ unzip \ @@ -91,6 +93,14 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ xserver-xorg \ xserver-xorg-video-dummy \ && \ + apt-get download -y \ + libgstreamer-plugins-base1.0-dev:amd64 libgstreamer-plugins-base1.0-dev:i386 \ + libgstreamer1.0-dev:amd64 libgstreamer1.0-dev:i386 \ + && \ + (for deb in *.deb; do dpkg-deb -x $deb /dpkg; done) && \ + rsync -arxv /dpkg/usr/include/ /usr/include/ && \ + rsync -arxv /dpkg/usr/lib/ /usr/lib/ && \ + rm -rf /dpkg && \ apt-get clean && \ curl -L -o /usr/local/bin/sarif-converter https://gitlab.com/ignis-build/sarif-converter/-/releases/permalink/latest/d... && \ chmod +x /usr/local/bin/sarif-converter && \ diff --git a/tools/gitlab/image-arm64.docker b/tools/gitlab/image-arm64.docker index f63bc08079a..9caa80c916c 100644 --- a/tools/gitlab/image-arm64.docker +++ b/tools/gitlab/image-arm64.docker @@ -43,12 +43,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libfontconfig-dev \ libfreetype-dev \ libgl1-mesa-dev \ + libglib2.0-dev \ libgnutls28-dev \ libgphoto2-dev \ - libgstreamer-plugins-base1.0-dev \ libice-dev \ libkrb5-dev \ libmjpegutils-2.1-0 \ + liborc-0.4-dev \ libpcap-dev \ libpcsclite-dev \ libpulse-dev \ @@ -81,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ ocl-icd-opencl-dev \ perl \ pulseaudio \ + rsync \ samba-dev \ unixodbc-dev \ unzip \ @@ -91,6 +93,14 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ xserver-xorg \ xserver-xorg-video-dummy \ && \ + apt-get download -y \ + libgstreamer-plugins-base1.0-dev \ + libgstreamer1.0-dev \ + && \ + (for deb in *.deb; do dpkg-deb -x $deb /dpkg; done) && \ + rsync -arxv /dpkg/usr/include/ /usr/include/ && \ + rsync -arxv /dpkg/usr/lib/ /usr/lib/ && \ + rm -rf /dpkg && \ apt-get clean && \ curl -s -L https://github.com/mstorsjo/llvm-mingw/releases/download/20250613/llvm-mingw... | tar xJ && \ mv llvm-mingw-20250613-ucrt-ubuntu-22.04-aarch64 /usr/local/llvm-mingw && \