From 4c2a70bab612a68e3612491d27d3af57d8835f1a Mon Sep 17 00:00:00 2001
From: bicarus <202771338+bicarus-dev@users.noreply.github.com>
Date: Thu, 20 Aug 2026 23:25:00 -0700
Subject: [PATCH] build: improve dockerfile (#881)

## Link to GitHub Issue or related Pull Request, if one exists
#0

## Description of change

`mingw-w64-libjpeg-turbo` and `mingw-w64-x264` are AUR packages, so the
deps image compiles them from source, once per mingw target arch. Stock
`makepkg.conf` leaves `MAKEFLAGS` commented out and both PKGBUILDs call
bare `make`, so all of that was building single-threaded.

Adds a `~/.makepkg.conf` for the build user setting
`MAKEFLAGS="-j$(nproc)"`. It is kept literal so it evaluates when
makepkg sources the file, rather than baking in the core count of
whichever machine built the image. Using `~/.makepkg.conf` rather than
`/etc` leaves the pacman-owned system file untouched.

Measured on 20 cores, compiling both libraries from scratch: **310s to
64s, a 4.8x improvement.**

Also merges the two `yay` invocations into a single layer.

## Testing
---
 src/spice2x/external/docker/Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/spice2x/external/docker/Dockerfile b/src/spice2x/external/docker/Dockerfile
index 5032225..fa01867 100644
--- a/src/spice2x/external/docker/Dockerfile
+++ b/src/spice2x/external/docker/Dockerfile
@@ -25,10 +25,11 @@ ENV PATH="$PATH:/opt/llvm-mingw-xp/bin"
 RUN curl -fsSL "https://github.com/mon/windows-dll-compat-checker/releases/download/v1.3/windows_dll_compat_checker-linux-x86_64.tar.xz" \
     | tar -xJ -C /usr/local/bin
 
-# libjpeg-turbo for JPEG encoding. Only the mingw-w64 toolchains get it;
-# the WinXP targets build without JPEG support entirely.
-RUN su user -c "yay --noconfirm -S mingw-w64-libjpeg-turbo"
+# Stock makepkg.conf builds serially; this makes the AUR compiles below parallel.
+RUN printf '%s\n' 'MAKEFLAGS="-j$(nproc)"' > /home/user/.makepkg.conf \
+    && chown user: /home/user/.makepkg.conf
 
-# x264 for the API H.264 video stream. Only the mingw-w64 toolchains need it;
-# the WinXP targets build without the stream encoder.
-RUN su user -c "yay --noconfirm -S mingw-w64-x264"
+# libjpeg-turbo for JPEG encoding, x264 for the API H.264 video stream. Only the
+# mingw-w64 toolchains get these; the WinXP targets build without JPEG support
+# and without the stream encoder.
+RUN su user -c "yay --noconfirm -S mingw-w64-libjpeg-turbo mingw-w64-x264"