From 084ff02fa0f7a32e73a4aebba1a8ca0322ceaa8f Mon Sep 17 00:00:00 2001
From: Derek Holloway <derek@mistox.com>
Date: Thu, 10 Sep 2026 10:11:44 -0700
Subject: [PATCH] Update comfyui-rocm-dockerfile

---
 comfyui-rocm-dockerfile | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/comfyui-rocm-dockerfile b/comfyui-rocm-dockerfile
index 8fc2ae6..0efb292 100644
--- a/comfyui-rocm-dockerfile
+++ b/comfyui-rocm-dockerfile
@@ -35,6 +35,12 @@ RUN apt-get update && apt-get install -y \
     libxrandr-dev \
     && rm -rf /var/lib/apt/lists/*
 
+# Build required newer libdrm from source
+RUN git clone --depth 1 https://gitlab.freedesktop.org/mesa/drm.git /drm
+WORKDIR /drm
+RUN meson setup build -Dbuildtype=release -Dprefix=/opt/mesa
+RUN ninja -C build -j16 && ninja -C build install
+
 # Build matching LLVMSPIRVLib (SPIRV-LLVM-Translator) for LLVM 18
 RUN git clone --branch llvm_release_180 --depth 1 https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git /spirv-llvm-translator
 WORKDIR /spirv-llvm-translator
@@ -45,22 +51,6 @@ RUN cmake -B build \
 RUN cmake --build build --parallel 16
 RUN cmake --install build
 
-# Build required newer libdrm from source
-RUN git clone --depth 1 https://gitlab.freedesktop.org/mesa/drm.git /drm
-WORKDIR /drm
-RUN meson setup build -Dbuildtype=release -Dprefix=/opt/mesa
-RUN ninja -C build -j16 && ninja -C build install
-
-# Build matching LLVMSPIRVLib (SPIRV-LLVM-Translator) for LLVM 21
-RUN git clone --branch llvm_release_210 --depth 1 https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git /spirv-llvm-translator
-WORKDIR /spirv-llvm-translator
-RUN cmake -B build \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/opt/mesa \
-    -DLLVM_DIR=/usr/lib/llvm-21/cmake
-RUN cmake --build build --parallel 16
-RUN cmake --install build
-
 # Build Mesa-git pointing to the custom libdrm and LLVMSPIRVLib paths
 RUN git clone --depth 1 https://gitlab.freedesktop.org/mesa/mesa.git /mesa
 WORKDIR /mesa