From 9b541a4b698bd745e03a54f89411c3865be99b9e Mon Sep 17 00:00:00 2001
From: hackgrid <hackgrid@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:10:12 +0100
Subject: [PATCH 1/3] upgrade docker image to Ubuntu 23.04 to fix build

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c9838b..a07679d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-from ubuntu:22.04
+from ubuntu:23.04
 
 WORKDIR /usr/src/app
 
@@ -30,6 +30,7 @@ RUN apt update -y && \
     libgl1 \
     python3 \
     pip \
+    pipx \
     imagemagick \
     libpng-dev \
     libtiff-dev \
@@ -56,4 +57,4 @@ RUN rm /opt/blender/blender-3.6.1-linux-x64.tar.xz
 
 ENV BLENDER_3_6 /opt/blender/blender-3.6.1-linux-x64/blender
 
-RUN pip install vpk
\ No newline at end of file
+RUN pipx install vpk

From db67b00a9fe16de2e753771a05b695fa9d9d23fe Mon Sep 17 00:00:00 2001
From: hackgrid <hackgrid@users.noreply.github.com>
Date: Tue, 28 Nov 2023 10:44:10 +0100
Subject: [PATCH 2/3] fix path of vpk for language builds

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index a07679d..fa2edd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /usr/src/app
 
 ENV N64_LIBGCCDIR /opt/crashsdk/lib/gcc/mips64-elf/12.2.0
 ENV PATH /opt/crashsdk/bin:$PATH
+ENV PATH /root/.local/bin:$PATH
 ENV ROOT /etc/n64
 
 RUN apt update -y && \
@@ -57,4 +58,5 @@ RUN rm /opt/blender/blender-3.6.1-linux-x64.tar.xz
 
 ENV BLENDER_3_6 /opt/blender/blender-3.6.1-linux-x64/blender
 
+RUN pipx ensurepath
 RUN pipx install vpk

From efbc1fea761dec9062e292453768c0bfab0c4f58 Mon Sep 17 00:00:00 2001
From: hackgrid <hackgrid@users.noreply.github.com>
Date: Tue, 28 Nov 2023 10:45:19 +0100
Subject: [PATCH 3/3] add missing build options to Makefile.docker

---
 Makefile.docker | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Makefile.docker b/Makefile.docker
index 69ac49b..293d847 100644
--- a/Makefile.docker
+++ b/Makefile.docker
@@ -8,8 +8,28 @@ convert_all_png:
 	docker run -v $$PWD:/usr/src/app -it portal64 make convert_all_png
 
 bash:
-	docker run  -v $$PWD:/usr/src/app -it portal64 bash
+	docker run -v $$PWD:/usr/src/app -it portal64 bash
 
 clean:
 	sudo rm -rf build
+	sudo rm -rf portal_pak_dir
+	sudo rm -rf portal_pak_modified
+	sudo rm -rf assets/locales/
+	
+english_audio:
+	docker run -v $$PWD:/usr/src/app -it portal64 make english_audio
 
+all_languages:
+	docker run -v $$PWD:/usr/src/app -it portal64 make all_languages
+
+german_audio:
+	docker run -v $$PWD:/usr/src/app -it portal64 make german_audio
+
+french_audio:
+	docker run -v $$PWD:/usr/src/app -it portal64 make french_audio
+
+russian_audio:
+	docker run -v $$PWD:/usr/src/app -it portal64 make russian_audio
+
+spanish_audio:
+	docker run -v $$PWD:/usr/src/app -it portal64 make spanish_audio