From 0ee5567616bab3e3cbb5a5d120c2f5850ca8395c Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 31 Jan 2025 00:53:14 +0000
Subject: [PATCH] mesa: update to 25.0.0

- change from intel_clc to mesa_clc
  https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33014/commits
- clover: drop support for nir drivers - was not used
  https://gitlab.freedesktop.org/mesa/mesa/-/commit/80c4ffb61a91ed252d45e38a96e893cec0771940
---
 packages/graphics/mesa/package.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index e1e1f0b3e2..8ac21bdd75 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mesa"
-PKG_VERSION="24.3.4"
-PKG_SHA256="e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025"
+PKG_VERSION="25.0.0"
+PKG_SHA256="96a53501fd59679654273258c6c6a1055a20e352ee1429f0b123516c7190e5b0"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
@@ -32,7 +32,6 @@ PKG_MESON_OPTS_TARGET="-Dgallium-drivers=${GALLIUM_DRIVERS// /,} \
                        -Dgallium-opencl=disabled \
                        -Dshader-cache=enabled \
                        -Dshared-glapi=enabled \
-                       -Dopencl-spirv=false \
                        -Dopengl=true \
                        -Dgbm=enabled \
                        -Degl=enabled \
@@ -64,7 +63,7 @@ fi
 
 if listcontains "${GRAPHIC_DRIVERS}" "iris"; then
   PKG_DEPENDS_TARGET+=" mesa:host"
-  PKG_MESON_OPTS_TARGET+=" -Dintel-clc=system"
+  PKG_MESON_OPTS_TARGET+=" -Dmesa-clc=system"
 fi
 
 if listcontains "${GRAPHIC_DRIVERS}" "(nvidia|nvidia-ng)"; then
@@ -117,5 +116,6 @@ fi
 
 makeinstall_host() {
   mkdir -p "${TOOLCHAIN}/bin"
-    cp -a src/intel/compiler/intel_clc "${TOOLCHAIN}/bin"
+    cp -a src/compiler/clc/mesa_clc "${TOOLCHAIN}/bin"
+    cp -a src/compiler/spirv/vtn_bindgen "${TOOLCHAIN}/bin"
 }