Install rust cross-toolchain

images/base-win32/Dockerfile

@@ -12,6 +12,8 @@ RUN \
     rm /usr/*-w64-mingw32/lib/*.dll.a && \
     mkdir /opt/ffbuild
 
+RUN rustup target add i686-pc-windows-gnu
+
 ADD toolchain.cmake /toolchain.cmake
 ADD cross.meson /cross.meson
 

images/base-win64/Dockerfile

@@ -12,6 +12,8 @@ RUN \
     rm /usr/*-w64-mingw32/lib/*.dll.a && \
     mkdir /opt/ffbuild
 
+RUN rustup target add x86_64-pc-windows-gnu
+
 ADD toolchain.cmake /toolchain.cmake
 ADD cross.meson /cross.meson
 

images/base/Dockerfile

@@ -5,9 +5,12 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN \
     apt-get -y update && \
     apt-get -y dist-upgrade && \
-    apt-get -y install build-essential yasm nasm pkg-config git curl wget cmake unzip subversion autoconf automake libtool cmake clang texinfo texi2html gperf ragel libc6-dev gawk meson ninja-build p7zip-full python3-distutils python3-apt && \
+    apt-get -y install build-essential yasm nasm pkg-config git curl wget cmake unzip subversion autoconf automake libtool autopoint cmake clang texinfo texi2html gperf gettext itstool ragel libc6-dev gtk-doc-tools gobject-introspection gawk meson ninja-build p7zip-full python3-distutils python3-apt && \
     apt-get -y clean
 
+ENV CARGO_HOME="/opt/cargo" RUSTUP_HOME="/opt/rustup" PATH="/opt/cargo/bin:${PATH}"
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --no-modify-path
+
 ADD run_stage.sh /usr/bin/run_stage
 ADD git-mini-clone.sh /usr/bin/git-mini-clone
 ADD check-wget.sh /usr/bin/check-wget