From b99f57fabfe136fa251be1f8520ec501f6bd3c18 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sat, 25 Mar 2023 17:44:42 -0400 Subject: [PATCH 1/2] fresh-arm64: Set vcpkg to 2022.08.15 Provides fmt 9.0.0, Boost 1.79. This downgrades from upstream vcpkg's Boost 1.81 as a result of runtime issues in yuzu by Boost >= 1.80. --- linux-fresh-arm64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-fresh-arm64/Dockerfile b/linux-fresh-arm64/Dockerfile index 946bd0b..225f038 100644 --- a/linux-fresh-arm64/Dockerfile +++ b/linux-fresh-arm64/Dockerfile @@ -68,7 +68,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=1 USER 1027 # Install vcpkg and required dependencies for yuzu RUN cd /home/yuzu &&\ - git clone --depth 1 https://github.com/Microsoft/vcpkg.git &&\ + git clone --branch 2022.08.15 --depth 1 https://github.com/Microsoft/vcpkg.git &&\ cd vcpkg &&\ ./bootstrap-vcpkg.sh &&\ ./vcpkg install \ From 4df5ab453aa955775d5662f0e88239a9c696df8d Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sat, 25 Mar 2023 17:43:43 -0400 Subject: [PATCH 2/2] mingw: Install Boost 1.79 from a pre-built package Effectively downgrades boost from 1.81 to 1.79 at time of writing. 1.79 appears to be causing issues in yuzu during runtime. --- linux-mingw/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index b313032..1bdfc45 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -26,7 +26,6 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \ p7zip \ cmake \ ninja \ - mingw-w64-boost \ mingw-w64-gcc \ mingw-w64-libusb \ mingw-w64-lz4 \ @@ -46,6 +45,12 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \ pacman -Scc --noconfirm && \ rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32 +# Install Boost from yuzu-emu/ext-linux-bin +RUN wget --no-verbose \ + https://github.com/yuzu-emu/ext-linux-bin/raw/main/mingw/mingw-w64-boost-1.79.0-1-any.pkg.tar.zst && \ + pacman -U --noconfirm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst && \ + rm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst + # Setup extra mingw work arounds RUN pip3 install pefile # Compatibility with the old Ubuntu MingW image