From bc0a0c1f268ffdfe425e0a08ec2bf48cb43b39b7 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 15 Jun 2025 10:32:07 -0400
Subject: [PATCH] revert ralibretro change

---
 DEVELOPER_SETUP.md | 4 +++-
 docker/Dockerfile  | 8 ++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/DEVELOPER_SETUP.md b/DEVELOPER_SETUP.md
index c5e984ec3..d3c82f411 100644
--- a/DEVELOPER_SETUP.md
+++ b/DEVELOPER_SETUP.md
@@ -31,8 +31,10 @@ sudo apt install libmariadb3 libmariadb-dev libpq-dev pipx
 
 # Build and configure RAHasher (optional)
 # IMPORTANT! This is only required to calculate RA hashes. This is needed only if RA API is going to be enabled
-git clone --recursive --branch 1.8.0 --depth 1 https://github.com/RetroAchievements/RALibretro.git
+git clone --recursive https://github.com/RetroAchievements/RALibretro.git
 cd ./RALibretro
+git checkout 1.8.0
+git submodule update --init --recursive
 sed -i '22a #include <ctime>' ./src/Util.h
 make HAVE_CHD=1 -f ./Makefile.RAHasher
 cp ./bin64/RAHasher /usr/bin/RAHasher
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2a814d91d..dadc2fba3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -66,19 +66,15 @@ RUN apk add --no-cache \
     make
 
 # TODO: Move to a tagged release of `RALibretro`, once a version newer than 1.8.0 is released.
-ARG RALIBRETRO_SHA=304ed205f11dd0bb22c01afe11d1ffabf176facc
+ARG RALIBRETRO_VERSION=1.8.0
 # TODO: Remove `sed` command adding "ctime", when RAHasher can be compiled without it.
 # TODO: Remove `sed` command adding "unistd.h", when RAHasher can be compiled without it.
 #       Related pull request: https://github.com/madler/zlib/pull/1022
 RUN git clone --recursive https://github.com/RetroAchievements/RALibretro.git && \
     cd ./RALibretro && \
-    git checkout "${RALIBRETRO_SHA}" && \
+    git checkout "${RALIBRETRO_VERSION}" && \
     git submodule update --init --recursive && \
     sed -i '22a #include <ctime>' ./src/Util.h && \
-    sed -i '6a #include <unistd.h>' \
-      ./src/libchdr/deps/zlib-1.3.1/gzlib.c \
-      ./src/libchdr/deps/zlib-1.3.1/gzread.c \
-      ./src/libchdr/deps/zlib-1.3.1/gzwrite.c && \
     make HAVE_CHD=1 -f ./Makefile.RAHasher