From c0855f6b0f38840ec4ac4e0857bc34f865dd7480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 10 Jan 2022 17:47:16 +0100
Subject: docker: Add nasm package to Proton 6.3 SDK.

This reverts commit d39f08b182d2fe743ca7f004f196b25bf87e1ba8 as we want
to update older SDK here.
---
 docker/Makefile             | 20 ++++++++++----------
 docker/proton.Dockerfile.in |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docker/Makefile b/docker/Makefile
index cc8deeca..2618e4a8 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,4 +1,4 @@
-STEAMRT_VERSION = 0.20211207.0
+STEAMRT_VERSION = 0.20210505.0
 STEAMRT_URLBASE = registry.gitlab.steamos.cloud
 
 PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/soldier/sdk
@@ -10,10 +10,10 @@ PROTONSDK_VERSION = $(STEAMRT_VERSION)-0-dev
 BASE_IMAGE_i686 = i386/ubuntu:18.04
 BASE_IMAGE_x86_64 = ubuntu:18.04
 
-BINUTILS_VERSION = 2.37
-GCC_VERSION = 10.3.0
-MINGW_VERSION = 9.0.0
-RUST_VERSION = 1.57.0
+BINUTILS_VERSION = 2.36.1
+GCC_VERSION = 10.2.0
+MINGW_VERSION = 8.0.0
+RUST_VERSION = 1.50.0
 
 SOURCES_URLBASE = https://repo.steampowered.com/proton-sdk
 BINUTILS_URLBASE = $(SOURCES_URLBASE)
@@ -27,11 +27,11 @@ MINGW_SOURCE = mingw-w64-v$(MINGW_VERSION).tar.bz2
 RUST_SOURCE_x86_64 = rust-$(RUST_VERSION)-x86_64-unknown-linux-gnu.tar.gz
 RUST_SOURCE_i686 = rust-$(RUST_VERSION)-i686-unknown-linux-gnu.tar.gz
 
-BINUTILS_SHA256 = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
-GCC_SHA256 = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
-MINGW_SHA256 = 1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181
-RUST_SHA256_x86_64 = ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda
-RUST_SHA256_i686 = 7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa
+BINUTILS_SHA256 = e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0
+GCC_SHA256 = b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c
+MINGW_SHA256 = 44c740ea6ab3924bc3aa169bad11ad3c5766c5c8459e3126d44eabb8735a5762
+RUST_SHA256_x86_64 = fa889b53918980aea2dea42bfae4e858dcb2104c6fdca6e4fe359f3a49767701
+RUST_SHA256_i686 = dee56dc425ed5d8e8112f26fba3060fd324c49f1261e0b7e8e29f7d9b852b09a
 
 DOCKER = docker
 
diff --git a/docker/proton.Dockerfile.in b/docker/proton.Dockerfile.in
index 77f0fd33..dd1e461b 100644
--- a/docker/proton.Dockerfile.in
+++ b/docker/proton.Dockerfile.in
@@ -57,6 +57,7 @@ RUN apt-get install -y \
   python3-pefile \
   libcapstone-dev \
   libcapstone-dev:i386 \
+  nasm \
   yasm \
 && rm -rf /opt/usr/share/doc /opt/usr/share/info /opt/usr/share/man \
 && rm -rf /var/lib/apt/lists/*
-- 
cgit v1.2.3