From a29dfdf64eebe58392ee3ad55ecb8a6a50a2d81c Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 8 May 2025 16:41:18 +0000
Subject: [PATCH] mesa: build panfrost compiler as required by 25.1.0

---
 packages/graphics/mesa/package.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index 3a2b7dd1f7..1ad886fa32 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -61,11 +61,17 @@ if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
   PKG_DEPENDS_TARGET+=" pycparser:host"
 fi
 
-if listcontains "${GRAPHIC_DRIVERS}" "(iris|panfrost)"; then
+if listcontains "${GRAPHIC_DRIVERS}" "iris"; then
   PKG_DEPENDS_TARGET+=" mesa:host"
   PKG_MESON_OPTS_TARGET+=" -Dmesa-clc=system"
 fi
 
+if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
+  PKG_DEPENDS_TARGET+=" mesa:host"
+  PKG_MESON_OPTS_HOST+=" -Dtools=panfrost"
+  PKG_MESON_OPTS_TARGET+=" -Dprecomp-compiler=system -Dmesa-clc=system"
+fi
+
 if listcontains "${GRAPHIC_DRIVERS}" "(nvidia|nvidia-ng)" ||
               [ "${OPENGL_SUPPORT}" = "yes" ] &&
               [ "${DISPLAYSERVER}" != "x11" ]; then
@@ -120,4 +126,8 @@ makeinstall_host() {
   mkdir -p "${TOOLCHAIN}/bin"
     cp -a src/compiler/clc/mesa_clc "${TOOLCHAIN}/bin"
     cp -a src/compiler/spirv/vtn_bindgen2 "${TOOLCHAIN}/bin"
+
+    if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
+      cp -a src/panfrost/clc/panfrost_compile "${TOOLCHAIN}/bin"
+    fi
 }