From e2cb6e2960b2d04fd6e3cc06a9b3070a9b4e90c6 Mon Sep 17 00:00:00 2001
From: lfdevs <109842948+lfdevs@users.noreply.github.com>
Date: Fri, 9 Jan 2026 16:55:33 +0800
Subject: [PATCH 1/5] bump(main/mesa): 26.0.0

Add experimental support for Adreno 840: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39167
---
 packages/mesa/build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/mesa/build.sh b/packages/mesa/build.sh
index f18736acb61..501271429fa 100644
--- a/packages/mesa/build.sh
+++ b/packages/mesa/build.sh
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specificatio
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_LICENSE_FILE="docs/license.rst"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="25.3.3"
-TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=05328b3891c000e6a110a3e7321d8bfbb21631d132bf86bd3d4a8f45c535ef6b
+TERMUX_PKG_VERSION="26.0.0"
+TERMUX_PKG_SRCURL=git+https://gitlab.freedesktop.org/robclark/mesa.git
+TERMUX_PKG_GIT_BRANCH=tu/gen8
+_COMMIT=7069f58ce80b5b11f688def1001e9c8651db04ec
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libglvnd, libllvm (<< $TERMUX_LLVM_NEXT_MAJOR_VERSION), libwayland, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, vulkan-loader, zlib, zstd"
 TERMUX_PKG_SUGGESTS="mesa-dev"

From d4454a7c217ab16a74975748dd4f25e48a98aaf8 Mon Sep 17 00:00:00 2001
From: lfdevs <109842948+lfdevs@users.noreply.github.com>
Date: Fri, 9 Jan 2026 18:21:07 +0800
Subject: [PATCH 2/5] fix(main/mesa): Fix build errors caused by Adreno 710/720

Try to fix unofficial support for Adreno 710 and Adreno 720 to prevent build errors.
The added values `tile_max_w` and `tile_max_h` were derived by analogy with the Adreno 730 and have not been empirically validated.
---
 .../0019-fix_support_adreno_710_720.patch     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 packages/mesa/0019-fix_support_adreno_710_720.patch

diff --git a/packages/mesa/0019-fix_support_adreno_710_720.patch b/packages/mesa/0019-fix_support_adreno_710_720.patch
new file mode 100644
index 00000000000..b6f70661392
--- /dev/null
+++ b/packages/mesa/0019-fix_support_adreno_710_720.patch
@@ -0,0 +1,23 @@
+Try to fix unofficial support for Adreno 710 and Adreno 720 to prevent build errors below:
+TypeError: A6xxGPUInfo.__init__() missing 2 required positional arguments: 'tile_max_w' and 'tile_max_h'
+
+--- a/src/freedreno/common/freedreno_devices.py
++++ b/src/freedreno/common/freedreno_devices.py
+@@ -1178,6 +1178,8 @@ add_gpus([
+         num_ccu = 4,
+         tile_align_w = 64,
+         tile_align_h = 32,
++        tile_max_w = 1024,
++        tile_max_h = 1024,
+         num_vsc_pipes = 32,
+         cs_shared_mem_size = 32 * 1024,
+         wave_granularity = 2,
+@@ -1196,6 +1198,8 @@ add_gpus([
+         num_ccu = 4,
+         tile_align_w = 64,
+         tile_align_h = 32,
++        tile_max_w = 1024,
++        tile_max_h = 1024,
+         num_vsc_pipes = 32,
+         cs_shared_mem_size = 32 * 1024,
+         wave_granularity = 2,

From 10163e72c161e8ae6fd8cbbadf9f4855f36d8076 Mon Sep 17 00:00:00 2001
From: lfdevs <109842948+lfdevs@users.noreply.github.com>
Date: Sun, 11 Jan 2026 22:30:19 +0800
Subject: [PATCH 3/5] bump(main/mesa): 26.0.0

Sync with upstream code: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39167
---
 packages/mesa/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mesa/build.sh b/packages/mesa/build.sh
index 501271429fa..94ee2bcea22 100644
--- a/packages/mesa/build.sh
+++ b/packages/mesa/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="26.0.0"
 TERMUX_PKG_SRCURL=git+https://gitlab.freedesktop.org/robclark/mesa.git
 TERMUX_PKG_GIT_BRANCH=tu/gen8
-_COMMIT=7069f58ce80b5b11f688def1001e9c8651db04ec
+_COMMIT=81075945d6c2dda77c6609180f3fcb6fd80372ab
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libglvnd, libllvm (<< $TERMUX_LLVM_NEXT_MAJOR_VERSION), libwayland, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, vulkan-loader, zlib, zstd"
 TERMUX_PKG_SUGGESTS="mesa-dev"

From 9105a67b609fd1736700d92cd2c1eeb454200b6c Mon Sep 17 00:00:00 2001
From: lfdevs <109842948+lfdevs@users.noreply.github.com>
Date: Fri, 16 Jan 2026 21:32:11 +0800
Subject: [PATCH 4/5] enhance(main/mesa): Add unofficial support for Adreno 830

---
 .../0020-unofficial-support-adreno-830.patch  | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 packages/mesa/0020-unofficial-support-adreno-830.patch

diff --git a/packages/mesa/0020-unofficial-support-adreno-830.patch b/packages/mesa/0020-unofficial-support-adreno-830.patch
new file mode 100644
index 00000000000..3d3ed9bdfdf
--- /dev/null
+++ b/packages/mesa/0020-unofficial-support-adreno-830.patch
@@ -0,0 +1,85 @@
+Modified based on Adreno 840, most features should work.
+
+--- a/src/freedreno/common/freedreno_devices.py
++++ b/src/freedreno/common/freedreno_devices.py
+@@ -1499,28 +1499,6 @@ a8xx_gen2 = GPUProps(
+         has_fs_tex_prefetch = False,
+ )
+ 
+-# Totally fake, just to get cffdump to work:
+-add_gpus([
+-        GPUId(chip_id=0x44050000, name="FD830"),
+-    ], A6xxGPUInfo(
+-        CHIP.A8XX,
+-        [a7xx_base, a7xx_gen3, a8xx_base],
+-        num_ccu = 6,
+-        num_slices = 3,
+-        tile_align_w = 64,
+-        tile_align_h = 32,
+-        tile_max_w = 16384,
+-        tile_max_h = 16384,
+-        num_vsc_pipes = 32,
+-        cs_shared_mem_size = 32 * 1024,
+-        wave_granularity = 2,
+-        fibers_per_sp = 128 * 2 * 16,
+-        magic_regs = dict(
+-        ),
+-        raw_magic_regs = [
+-        ],
+-    ))
+-
+ # For a8xx, the chicken bit and most other non-ctx reg
+ # programming moves into the kernel, and what remains
+ # should be easier to share between devices
+@@ -1555,6 +1533,29 @@ a8xx_gen2_raw_magic_regs = [
+         [A6XXRegs.REG_A8XX_PC_MODE_CNTL,    0x00003f00],
+     ]
+ 
++# Modified based on Adreno 840, most features should work
++add_gpus([
++        GPUId(chip_id=0x44050001, name="Adreno (TM) 830"),
++        GPUId(chip_id=0xffff44050001, name="Adreno (TM) 830"),
++    ], A6xxGPUInfo(
++        CHIP.A8XX,
++        [a7xx_base, a7xx_gen3, a8xx_base, a8xx_gen2,
++         GPUProps(shading_rate_matches_vk = True)],
++        num_ccu = 6,
++        num_slices = 3,
++        tile_align_w = 96,
++        tile_align_h = 32,
++        tile_max_w = 16416,
++        tile_max_h = 16384,
++        num_vsc_pipes = 32,
++        cs_shared_mem_size = 32 * 1024,
++        wave_granularity = 2,
++        fibers_per_sp = 128 * 2 * 16,
++        magic_regs = dict(
++        ),
++        raw_magic_regs = a8xx_gen2_raw_magic_regs,
++    ))
++
+ add_gpus([
+         GPUId(chip_id=0xffff44050A31, name="Adreno (TM) 840"),
+     ], A6xxGPUInfo(
+--- a/src/freedreno/drm-shim/freedreno_noop.c
++++ b/src/freedreno/drm-shim/freedreno_noop.c
+@@ -288,7 +288,7 @@ static const struct msm_device_info device_infos[] = {
+    },
+    {
+       .gpu_id = 830,
+-      .chip_id = 0x44050000,
++      .chip_id = 0x44050001,
+       .gmem_size = 12 * 1024 * 1024,
+    },
+ };
+--- a/src/freedreno/ir3/tests/disasm.c
++++ b/src/freedreno/ir3/tests/disasm.c
+@@ -33,7 +33,7 @@
+ #define INSTR_6XX_RAW(i, d, ...) { .gpu_id = 630, .instr = NULL, .instr_raw = i, .expected = d, __VA_ARGS__ }
+ #define INSTR_7XX(i, d, ...) { .chip_id = 0x07030001, .instr = #i, .instr_raw = 0, .expected = d, __VA_ARGS__ }
+ #define INSTR_7XX_RAW(i, d, ...) { .chip_id = 0x07030001, .instr = NULL, .instr_raw = i, .expected = d, __VA_ARGS__ }
+-#define INSTR_8XX(i, d, ...) { .chip_id = 0x44050000, .instr = #i, .instr_raw = 0, .expected = d, __VA_ARGS__ }
++#define INSTR_8XX(i, d, ...) { .chip_id = 0x44050001, .instr = #i, .instr_raw = 0, .expected = d, __VA_ARGS__ }
+ /* clang-format on */
+ 
+ static const struct test {

From 762118474b3e8bd8c3b4e61ec48ae04544bb67b8 Mon Sep 17 00:00:00 2001
From: lfdevs <109842948+lfdevs@users.noreply.github.com>
Date: Wed, 21 Jan 2026 10:42:00 +0800
Subject: [PATCH 5/5] bump(main/mesa): 26.0.0

Sync with upstream code: https://gitlab.freedesktop.org/mesa/mesa/-/commit/dc702671d9ad3e554f8e0559097ba7cff50c64db
---
 packages/mesa/build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mesa/build.sh b/packages/mesa/build.sh
index 94ee2bcea22..21e96f9f536 100644
--- a/packages/mesa/build.sh
+++ b/packages/mesa/build.sh
@@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_LICENSE_FILE="docs/license.rst"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="26.0.0"
-TERMUX_PKG_SRCURL=git+https://gitlab.freedesktop.org/robclark/mesa.git
-TERMUX_PKG_GIT_BRANCH=tu/gen8
-_COMMIT=81075945d6c2dda77c6609180f3fcb6fd80372ab
+TERMUX_PKG_SRCURL=git+https://gitlab.freedesktop.org/mesa/mesa.git
+TERMUX_PKG_GIT_BRANCH=main
+_COMMIT=dc702671d9ad3e554f8e0559097ba7cff50c64db
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libglvnd, libllvm (<< $TERMUX_LLVM_NEXT_MAJOR_VERSION), libwayland, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, vulkan-loader, zlib, zstd"
 TERMUX_PKG_SUGGESTS="mesa-dev"