From edcc8c1ac22afd84fa0be41d479e32a29a8ef34c Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 28 Aug 2025 02:30:30 +0000
Subject: [PATCH] mesa: update to 25.1.9

---
 packages/graphics/mesa/package.mk             |  4 +-
 ...kport-mr36870-gallium-extra-samplers.patch | 80 -------------------
 2 files changed, 2 insertions(+), 82 deletions(-)
 delete mode 100644 packages/graphics/mesa/patches/001-backport-mr36870-gallium-extra-samplers.patch

diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index 225d82aa24..c9c0e7f9fa 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="25.1.8"
-PKG_SHA256="5cf1571d0d646d90047f3d93f57acc787cf88ec7e95efe172c555b492c30fb71"
+PKG_VERSION="25.1.9"
+PKG_SHA256="412df33a1bb3c785ed698555a3972118a37c458e7accf6ae53f4bb87b3db454a"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
diff --git a/packages/graphics/mesa/patches/001-backport-mr36870-gallium-extra-samplers.patch b/packages/graphics/mesa/patches/001-backport-mr36870-gallium-extra-samplers.patch
deleted file mode 100644
index 26cc579b4e..0000000000
--- a/packages/graphics/mesa/patches/001-backport-mr36870-gallium-extra-samplers.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
-index cca06e9f5dcd..76ea924a9de6 100644
---- a/src/mesa/state_tracker/st_atom_texture.c
-+++ b/src/mesa/state_tracker/st_atom_texture.c
-@@ -187,6 +187,7 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       case PIPE_FORMAT_NV12:
-          if (stObj->pt->format == PIPE_FORMAT_R8_G8B8_420_UNORM)
-@@ -199,6 +200,7 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       case PIPE_FORMAT_NV21:
-          if (stObj->pt->format == PIPE_FORMAT_R8_B8G8_420_UNORM)
-@@ -211,6 +213,7 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       case PIPE_FORMAT_P010:
-       case PIPE_FORMAT_P012:
-@@ -222,6 +225,7 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       case PIPE_FORMAT_IYUV:
-          if (stObj->pt->format == PIPE_FORMAT_R8_G8_B8_420_UNORM ||
-@@ -234,9 +238,11 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       case PIPE_FORMAT_YUYV:
-       case PIPE_FORMAT_YVYU:
-@@ -252,6 +258,7 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       case PIPE_FORMAT_UYVY:
-       case PIPE_FORMAT_VYUY:
-@@ -267,6 +274,7 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       case PIPE_FORMAT_Y210:
-       case PIPE_FORMAT_Y212:
-@@ -278,14 +286,12 @@ st_get_sampler_views(struct st_context *st,
-          extra = u_bit_scan(&free_slots);
-          sampler_views[extra] =
-                pipe->create_sampler_view(pipe, stObj->pt->next, &tmpl);
-+         (*extra_sampler_views) |= 1 << extra;
-          break;
-       default:
-          break;
-       }
- 
--      if (extra)
--         (*extra_sampler_views) |= 1 << extra;
--
-       num_textures = MAX2(num_textures, extra + 1);
-    }
-