[PATCH v4 1/3] mesa: Upgrade to 26.2.0

["Zoltán Böszörményi" <zboszor@gmail.com>]

Release notes:
https://lists.freedesktop.org/archives/mesa-dev/2026-August/226690.html

Removed upstream patches:
* 0001-gallivm-Fix-armhf-build-against-LLVM-22.patch
* 0001-src-intel-compiler-jay-fix-GCC-10-case-label-declara.patch

Adapted patches:
* 0001-freedreno-don-t-encode-build-path-into-binaries.patch
* 0001-src-intel-compiler-jay-jay_ir.h-do-not-used-typed-en.patch

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 ...on-t-encode-build-path-into-binaries.patch | 17 +++++---
 ...livm-Fix-armhf-build-against-LLVM-22.patch | 27 -------------
 ...er-jay-fix-GCC-10-case-label-declara.patch | 39 -------------------
 ...er-jay-jay_ir.h-do-not-used-typed-en.patch |  8 ++--
 meta/recipes-graphics/mesa/mesa.inc           |  6 +--
 5 files changed, 17 insertions(+), 80 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-gallivm-Fix-armhf-build-against-LLVM-22.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-fix-GCC-10-case-label-declara.patch

diff --git a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
index 9aa598b2cf..a5e6570af8 100644
--- a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
+++ b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
@@ -1,4 +1,4 @@
-From 266f7047df67d500223b66f7eb9d8779be4f4ad1 Mon Sep 17 00:00:00 2001
+From 1ae1feb55885c8ec26ed2ef148fa75c6240d9804 Mon Sep 17 00:00:00 2001
 From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
 Date: Wed, 10 Dec 2025 02:27:16 +0200
 Subject: [PATCH] freedreno: don't encode build path into binaries
@@ -25,7 +25,7 @@ Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build
-index e8f01b8..8144a75 100644
+index e8f01b880bc..8144a75bd1c 100644
 --- a/src/freedreno/meson.build
 +++ b/src/freedreno/meson.build
 @@ -4,9 +4,10 @@
@@ -42,13 +42,18 @@ index e8f01b8..8144a75 100644
  dep_libarchive = dependency('libarchive', allow_fallback: true, required: false, disabler : true)
  dep_libxml2 = dependency('libxml-2.0', allow_fallback: true, required: false)
 diff --git a/src/freedreno/registers/meson.build b/src/freedreno/registers/meson.build
-index f4be681..cd0caaf 100644
+index 9318ce48fe5..8d2b305d202 100644
 --- a/src/freedreno/registers/meson.build
 +++ b/src/freedreno/registers/meson.build
-@@ -43,4 +43,6 @@ if install_fd_decode_tools
-   endforeach
- endif
+@@ -16,6 +16,8 @@ freedreno_copyright = files(copyright_file)
+ 
+ freedreno_xml_header_files = []
  
 +devenv.set('RNN_PATH', meson.current_source_dir())
 +
  subdir('adreno')
+ 
+ foreach f : xml_adreno_files
+-- 
+2.55.0
+
diff --git a/meta/recipes-graphics/mesa/files/0001-gallivm-Fix-armhf-build-against-LLVM-22.patch b/meta/recipes-graphics/mesa/files/0001-gallivm-Fix-armhf-build-against-LLVM-22.patch
deleted file mode 100644
index 32fac20d94..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-gallivm-Fix-armhf-build-against-LLVM-22.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8db6e909c3a540d31a73b79a0792e927cc2c6e83 Mon Sep 17 00:00:00 2001
-From: Alessandro Astone <ales.astone@gmail.com>
-Date: Sun, 1 Mar 2026 18:14:09 +0100
-Subject: [PATCH] gallivm: Fix armhf build against LLVM 22
-
-StringMapIterator<bool> became StringMapIterBase<bool, false /* IsConst */>;
-Use `auto` to handle either case.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40161]
-Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
----
- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index ce8ca02..86779f0 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -331,7 +331,7 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
-       llvm::sys::getHostCPUFeatures(features);
-    #endif
- 
--   for (llvm::StringMapIterator<bool> f = features.begin();
-+   for (auto f = features.begin();
-         f != features.end();
-         ++f) {
-       MAttrs.push_back(((*f).second ? "+" : "-") + (*f).first().str());
diff --git a/meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-fix-GCC-10-case-label-declara.patch b/meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-fix-GCC-10-case-label-declara.patch
deleted file mode 100644
index 8fb73d978f..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-fix-GCC-10-case-label-declara.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e41dee25f266d434e39af66e216a945f0085533b Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Tue, 16 Jun 2026 09:12:34 +0000
-Subject: [PATCH] src/intel/compiler/jay: fix GCC 10 case label declaration
- error
-
-GCC 10 (and earlier) does not allow a variable declaration immediately
-after a case label, because a label must be followed by a statement.
-
-  error: a label can only be part of a statement and a declaration is not a statement
-
-Wrap the case block for JAY_OPCODE_DESWIZZLE_ODD in braces to make the
-declaration a valid statement inside the block.
-
-Upstream-Status: Inappropriate [yocto host distro requirements]
-
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- src/intel/compiler/jay/jay_to_binary.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/intel/compiler/jay/jay_to_binary.c b/src/intel/compiler/jay/jay_to_binary.c
-index 62b9576..a0a9498 100644
---- a/src/intel/compiler/jay/jay_to_binary.c
-+++ b/src/intel/compiler/jay/jay_to_binary.c
-@@ -362,11 +362,12 @@ emit(struct brw_codegen *p,
-       brw_BFN(p, dst, SRC(0), SRC(1), SRC(2), brw_imm_ud(jay_bfn_ctrl(I)));
-       break;
- 
--   case JAY_OPCODE_DESWIZZLE_ODD:
-+   case JAY_OPCODE_DESWIZZLE_ODD: {
-       bool hi = simd_offs ? true : jay_deswizzle_odd_src2_hi(I);
-       brw_MOV(p, dst,
-               byte_offset(to_brw_reg(f, I, simd_offs, 0, false), hi ? 64 : 0));
-       break;
-+   }
- 
-    case JAY_OPCODE_DESWIZZLE_EVEN:
-       brw_set_default_exec_size(p, BRW_EXECUTE_16);
diff --git a/meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-jay_ir.h-do-not-used-typed-en.patch b/meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-jay_ir.h-do-not-used-typed-en.patch
index 2513b0324b..72b6d10b0f 100644
--- a/meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-jay_ir.h-do-not-used-typed-en.patch
+++ b/meta/recipes-graphics/mesa/files/0001-src-intel-compiler-jay-jay_ir.h-do-not-used-typed-en.patch
@@ -16,7 +16,7 @@ diff --git a/src/intel/compiler/jay/jay_ir.h b/src/intel/compiler/jay/jay_ir.h
 index 8307044..abf175a 100644
 --- a/src/intel/compiler/jay/jay_ir.h
 +++ b/src/intel/compiler/jay/jay_ir.h
-@@ -579,7 +579,7 @@ jay_type_is_any_float(enum jay_type t)
+@@ -518,7 +518,7 @@ jay_type_is_any_float(enum jay_type t)
     return jay_base_type(t) == JAY_TYPE_F || jay_base_type(t) == JAY_TYPE_BF;
  }
  
@@ -25,12 +25,12 @@ index 8307044..abf175a 100644
     /** No predication. */
     JAY_NOT_PREDICATED = 0,
  
-@@ -634,7 +634,7 @@ typedef struct jay_inst {
+@@ -592,7 +592,7 @@ typedef struct jay_inst {
     bool decrement_dep:1;
-    unsigned padding  :12;
+    uint8_t padding   :1;
  
 -   enum jay_predication predication;
 +   uint8_t predication;
-    enum jay_conditional_mod conditional_mod;
+    gen_condition conditional_mod;
  
     jay_def cond_flag; /**< conditional flag */
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index cbf67e50ce..01981de968 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -17,14 +17,12 @@ PE = "2"
 SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
-           file://0001-gallivm-Fix-armhf-build-against-LLVM-22.patch \
            file://0001-src-intel-compiler-jay-jay_ir.h-do-not-used-typed-en.patch \
-           file://0001-src-intel-compiler-jay-fix-GCC-10-case-label-declara.patch \
            file://0001-src-util-u_math.c-do-not-use-arm-fpu-instructions-if.patch \
            "
 
-SRC_URI[sha256sum] = "5296b88a0f1e012e2cb9ada150a2bbadf728ca81e5a4fb2ab43c83a4d2158606"
-PV = "26.1.6"
+SRC_URI[sha256sum] = "efd4bb08cdb7c365a812cd4e6c9202ab55b2f22cdcd13c7d6c4f9647b799a4ef"
+PV = "26.2.0"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
-- 
2.55.0