Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bernd Kuhls <bernd@kuhls.net>
To: buildroot@buildroot.org
Cc: Joseph Kogut <joseph.kogut@gmail.com>,
	Romain Naour <romain.naour@gmail.com>
Subject: [Buildroot] [PATCH v3 2/2] package/{mesa3d, mesa3d-headers}: bump version to 26.3.0
Date: Sun, 15 Nov 2026 09:22:55 +0100	[thread overview]
Message-ID: <20261115082255.32679-2-bernd@kuhls.net> (raw)
In-Reply-To: <20261115082255.32679-1-bernd@kuhls.net>

https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-26.3.0/docs/relnotes/26.3.0.rst
https://lists.freedesktop.org/archives/mesa-announce/2026-November/000875.html

Removed patches which are included in this release.

Renumbered patch.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
v3: added wayland-protocols bump to series (Julien)

Series passed Gitlab pipelines:
https://gitlab.com/bkuhls/buildroot/-/commits/ae2ab901f73c54e11085c20252502adb993ebdd8

Also the series passed the following tests:

test_weston: https://gitlab.com/bkuhls/buildroot/-/pipelines/3069971265

test_glslsandbox_player:
https://gitlab.com/bkuhls/buildroot/-/pipelines/3069972266

test_virglrenderer:
https://gitlab.com/bkuhls/buildroot/-/pipelines/3069972629

test_kmscube: https://gitlab.com/bkuhls/buildroot/-/pipelines/3069973028

test_python_pyqt5:
https://gitlab.com/bkuhls/buildroot/-/pipelines/3069973189

test_glxinfo: https://gitlab.com/bkuhls/buildroot/-/pipelines/3069983085
This tests needs
https://patchwork.buildroot.org/project/buildroot/patch/20261115081722.31558-1-bernd@kuhls.net/
to pass.

 package/mesa3d-headers/mesa3d-headers.mk      |   2 +-
 ...floating-point-exception-flags-with.patch} |   0
 ...c-do-not-use-arm-fpu-instructions-if.patch |  55 --------
 ...do-not-compare-sys_path-against-NULL.patch | 129 ------------------
 ...d_libclc-turn-sys_path-into-an-array.patch | 109 ---------------
 ...load_libclc-add-llvm-23-libclc-paths.patch |  46 -------
 package/mesa3d/mesa3d.hash                    |   6 +-
 package/mesa3d/mesa3d.mk                      |   2 +-
 8 files changed, 5 insertions(+), 344 deletions(-)
 rename package/mesa3d/{0008-nir-fix-build-of-floating-point-exception-flags-with.patch => 0004-nir-fix-build-of-floating-point-exception-flags-with.patch} (100%)
 delete mode 100644 package/mesa3d/0004-src-util-u_math.c-do-not-use-arm-fpu-instructions-if.patch
 delete mode 100644 package/mesa3d/0005-nir-load_libclc-do-not-compare-sys_path-against-NULL.patch
 delete mode 100644 package/mesa3d/0006-nir-load_libclc-turn-sys_path-into-an-array.patch
 delete mode 100644 package/mesa3d/0007-nir-load_libclc-add-llvm-23-libclc-paths.patch

diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index d42e7c7a0a..8e7d3dfd6f 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 26.2.5
+MESA3D_HEADERS_VERSION = 26.3.0
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = https://archive.mesa3d.org
 MESA3D_HEADERS_DL_SUBDIR = mesa3d
diff --git a/package/mesa3d/0008-nir-fix-build-of-floating-point-exception-flags-with.patch b/package/mesa3d/0004-nir-fix-build-of-floating-point-exception-flags-with.patch
similarity index 100%
rename from package/mesa3d/0008-nir-fix-build-of-floating-point-exception-flags-with.patch
rename to package/mesa3d/0004-nir-fix-build-of-floating-point-exception-flags-with.patch
diff --git a/package/mesa3d/0004-src-util-u_math.c-do-not-use-arm-fpu-instructions-if.patch b/package/mesa3d/0004-src-util-u_math.c-do-not-use-arm-fpu-instructions-if.patch
deleted file mode 100644
index 96d1902061..0000000000
--- a/package/mesa3d/0004-src-util-u_math.c-do-not-use-arm-fpu-instructions-if.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 345b14a820a557b72f218637cb37ef39947b1f50 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Wed, 1 Jul 2026 22:48:15 +0200
-Subject: [PATCH] src/util/u_math.c: do not use arm fpu instructions if fpu is
- not available
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/42682>
-
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/42682
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/util/u_math.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/util/u_math.c b/src/util/u_math.c
-index 722eac7f733..5683766a417 100644
---- a/src/util/u_math.c
-+++ b/src/util/u_math.c
-@@ -87,6 +87,7 @@ util_fpstate_get(void)
-    }
- #endif
- #if DETECT_ARCH_ARM
-+#if !defined(__SOFTFP__)
-    if (util_get_cpu_caps()->has_neon) {
- #ifdef HAVE___BUILTIN_ARM_GET_FPSCR
-       fpstate = __builtin_arm_get_fpscr();
-@@ -94,6 +95,7 @@ util_fpstate_get(void)
-       __asm__ volatile("vmrs %0, fpscr" : "=r"(fpstate));
- #endif
-    }
-+#endif
- #elif DETECT_ARCH_AARCH64
-    {
- #ifdef HAVE___BUILTIN_AARCH64_GET_FPCR
-@@ -154,6 +156,7 @@ util_fpstate_set(unsigned fpstate)
-    }
- #endif
- #if DETECT_ARCH_ARM
-+#if !defined(__SOFTFP__)
-    if (util_get_cpu_caps()->has_neon) {
- #ifdef HAVE___BUILTIN_ARM_SET_FPSCR
-       __builtin_arm_set_fpscr(fpstate);
-@@ -161,6 +164,7 @@ util_fpstate_set(unsigned fpstate)
-       __asm__ volatile("vmsr fpscr, %0" :: "r"(fpstate));
- #endif
-    }
-+#endif
- #elif DETECT_ARCH_AARCH64
-    {
- #ifdef HAVE___BUILTIN_AARCH64_SET_FPCR
--- 
-2.47.3
-
diff --git a/package/mesa3d/0005-nir-load_libclc-do-not-compare-sys_path-against-NULL.patch b/package/mesa3d/0005-nir-load_libclc-do-not-compare-sys_path-against-NULL.patch
deleted file mode 100644
index 6883031951..0000000000
--- a/package/mesa3d/0005-nir-load_libclc-do-not-compare-sys_path-against-NULL.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 1219dc3f7fe83b1f7f200190bf02a86ab57b3d4f Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Tue, 22 Sep 2026 13:53:43 +0200
-Subject: [PATCH] nir/load_libclc: do not compare sys_path against NULL
-
-sys_path will become an array and the NULL checks were all a bit awkward
-because all the code was already guarded with DYNAMIC_LIBCLC_PATH anyway
-and most likely constant folded away.
-
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/44624>
-
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/1219dc3f7fe83b1f7f200190bf02a86ab57b3d4f
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/compiler/clc/nir_load_libclc.c | 76 ++++++++++++++----------------
- 1 file changed, 35 insertions(+), 41 deletions(-)
-
-diff --git a/src/compiler/clc/nir_load_libclc.c b/src/compiler/clc/nir_load_libclc.c
-index edcd13b3b26..913dd8ff7a7 100644
---- a/src/compiler/clc/nir_load_libclc.c
-+++ b/src/compiler/clc/nir_load_libclc.c
-@@ -145,20 +145,18 @@ map_clc_data(struct clc_data *clc)
-    }
- 
- #ifdef DYNAMIC_LIBCLC_PATH
--   if (clc->file->sys_path != NULL) {
--      if (clc->size % SPIRV_WORD_SIZE != 0) {
--         fprintf(stderr, "File length isn't a multiple of the word size\n");
--         return false;
--      }
--
--      clc->data = mmap(NULL, clc->size, PROT_READ, MAP_PRIVATE, clc->fd, 0);
--      if (clc->data == MAP_FAILED) {
--         fprintf(stderr, "Failed to mmap libclc SPIR-V: %m\n");
--         return false;
--      }
-+   if (clc->size % SPIRV_WORD_SIZE != 0) {
-+      fprintf(stderr, "File length isn't a multiple of the word size\n");
-+      return false;
-+   }
- 
--      return true;
-+   clc->data = mmap(NULL, clc->size, PROT_READ, MAP_PRIVATE, clc->fd, 0);
-+   if (clc->data == MAP_FAILED) {
-+      fprintf(stderr, "Failed to mmap libclc SPIR-V: %m\n");
-+      return false;
-    }
-+
-+   return true;
- #endif
- 
-    return true;
-@@ -175,12 +173,10 @@ close_clc_data(struct clc_data *clc)
-    }
- 
- #ifdef DYNAMIC_LIBCLC_PATH
--   if (clc->file->sys_path != NULL) {
--      if (clc->data)
--         munmap((void *)clc->data, clc->size);
--      clc->data = NULL;
--      close(clc->fd);
--   }
-+   if (clc->data)
-+      munmap((void *)clc->data, clc->size);
-+   clc->data = NULL;
-+   close(clc->fd);
- #endif
- }
- 
-@@ -198,34 +194,32 @@ open_clc_data(struct clc_data *clc, unsigned ptr_bit_size)
-    }
- 
- #ifdef DYNAMIC_LIBCLC_PATH
--   if (clc->file->sys_path != NULL) {
--      int fd = open(clc->file->sys_path, O_RDONLY);
--      if (fd < 0)
--         return false;
-+   int fd = open(clc->file->sys_path, O_RDONLY);
-+   if (fd < 0)
-+      return false;
- 
--      struct stat stat;
--      int ret = fstat(fd, &stat);
--      if (ret < 0) {
--         fprintf(stderr, "fstat failed on %s: %m\n", clc->file->sys_path);
--         close(fd);
--         return false;
--      }
-+   struct stat stat;
-+   int ret = fstat(fd, &stat);
-+   if (ret < 0) {
-+      fprintf(stderr, "fstat failed on %s: %m\n", clc->file->sys_path);
-+      close(fd);
-+      return false;
-+   }
- 
--      clc->fd = fd;
--      clc->size = stat.st_size;
-+   clc->fd = fd;
-+   clc->size = stat.st_size;
- 
--      if (!map_clc_data(clc)) {
--         close_clc_data(clc);
--         return false;
--      }
-+   if (!map_clc_data(clc)) {
-+      close_clc_data(clc);
-+      return false;
-+   }
- 
--      blake3_hasher ctx;
--      _mesa_blake3_init(&ctx);
--      _mesa_blake3_update(&ctx, clc->data, clc->size);
--      _mesa_blake3_final(&ctx, clc->cache_key);
-+   blake3_hasher ctx;
-+   _mesa_blake3_init(&ctx);
-+   _mesa_blake3_update(&ctx, clc->data, clc->size);
-+   _mesa_blake3_final(&ctx, clc->cache_key);
- 
--      return true;
--   }
-+   return true;
- #endif
- 
-    return false;
--- 
-2.47.3
-
diff --git a/package/mesa3d/0006-nir-load_libclc-turn-sys_path-into-an-array.patch b/package/mesa3d/0006-nir-load_libclc-turn-sys_path-into-an-array.patch
deleted file mode 100644
index 916af6547d..0000000000
--- a/package/mesa3d/0006-nir-load_libclc-turn-sys_path-into-an-array.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 62ee563fd398169005906245831db680f813b19f Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Tue, 22 Sep 2026 14:11:09 +0200
-Subject: [PATCH] nir/load_libclc: turn sys_path into an array
-
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/44624>
-
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/62ee563fd398169005906245831db680f813b19f
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/compiler/clc/nir_load_libclc.c | 55 +++++++++++++++++-------------
- 1 file changed, 31 insertions(+), 24 deletions(-)
-
-diff --git a/src/compiler/clc/nir_load_libclc.c b/src/compiler/clc/nir_load_libclc.c
-index 913dd8ff7a7..17b901db47c 100644
---- a/src/compiler/clc/nir_load_libclc.c
-+++ b/src/compiler/clc/nir_load_libclc.c
-@@ -52,7 +52,7 @@ struct clc_file {
-    unsigned bit_size;
-    const char *static_data;
-    size_t static_data_size;
--   const char *sys_path;
-+   const char *sys_paths[1];
- };
- 
- static const struct clc_file libclc_files[] = {
-@@ -63,7 +63,9 @@ static const struct clc_file libclc_files[] = {
-       .static_data_size = sizeof(libclc_spirv_mesa3d_spv),
- #endif
- #ifdef DYNAMIC_LIBCLC_PATH
--      .sys_path = DYNAMIC_LIBCLC_PATH "spirv-mesa3d-.spv",
-+      .sys_paths = {
-+         DYNAMIC_LIBCLC_PATH "spirv-mesa3d-.spv",
-+      },
- #endif
-    },
-    {
-@@ -73,7 +75,9 @@ static const struct clc_file libclc_files[] = {
-       .static_data_size = sizeof(libclc_spirv64_mesa3d_spv),
- #endif
- #ifdef DYNAMIC_LIBCLC_PATH
--      .sys_path = DYNAMIC_LIBCLC_PATH "spirv64-mesa3d-.spv",
-+      .sys_paths = {
-+         DYNAMIC_LIBCLC_PATH "spirv64-mesa3d-.spv",
-+      },
- #endif
-    },
- };
-@@ -194,32 +198,35 @@ open_clc_data(struct clc_data *clc, unsigned ptr_bit_size)
-    }
- 
- #ifdef DYNAMIC_LIBCLC_PATH
--   int fd = open(clc->file->sys_path, O_RDONLY);
--   if (fd < 0)
--      return false;
-+   for (unsigned i = 0; i < ARRAY_SIZE(clc->file->sys_paths); i++) {
-+      const char *sys_path = clc->file->sys_paths[i];
-+      int fd = open(sys_path, O_RDONLY);
-+      if (fd < 0)
-+         continue;
- 
--   struct stat stat;
--   int ret = fstat(fd, &stat);
--   if (ret < 0) {
--      fprintf(stderr, "fstat failed on %s: %m\n", clc->file->sys_path);
--      close(fd);
--      return false;
--   }
-+      struct stat stat;
-+      int ret = fstat(fd, &stat);
-+      if (ret < 0) {
-+         fprintf(stderr, "fstat failed on %s: %m\n", sys_path);
-+         close(fd);
-+         continue;
-+      }
- 
--   clc->fd = fd;
--   clc->size = stat.st_size;
-+      clc->fd = fd;
-+      clc->size = stat.st_size;
- 
--   if (!map_clc_data(clc)) {
--      close_clc_data(clc);
--      return false;
--   }
-+      if (!map_clc_data(clc)) {
-+         close_clc_data(clc);
-+         continue;
-+      }
- 
--   blake3_hasher ctx;
--   _mesa_blake3_init(&ctx);
--   _mesa_blake3_update(&ctx, clc->data, clc->size);
--   _mesa_blake3_final(&ctx, clc->cache_key);
-+      blake3_hasher ctx;
-+      _mesa_blake3_init(&ctx);
-+      _mesa_blake3_update(&ctx, clc->data, clc->size);
-+      _mesa_blake3_final(&ctx, clc->cache_key);
- 
--   return true;
-+      return true;
-+   }
- #endif
- 
-    return false;
--- 
-2.47.3
-
diff --git a/package/mesa3d/0007-nir-load_libclc-add-llvm-23-libclc-paths.patch b/package/mesa3d/0007-nir-load_libclc-add-llvm-23-libclc-paths.patch
deleted file mode 100644
index f43b7b7260..0000000000
--- a/package/mesa3d/0007-nir-load_libclc-add-llvm-23-libclc-paths.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6b9cd5ab9cc3bfd0c79d9500a07a5e74351c72d1 Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Tue, 22 Sep 2026 14:13:28 +0200
-Subject: [PATCH] nir/load_libclc: add llvm-23 libclc paths
-
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/44624>
-
-Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/6b9cd5ab9cc3bfd0c79d9500a07a5e74351c72d1
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- src/compiler/clc/nir_load_libclc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/compiler/clc/nir_load_libclc.c b/src/compiler/clc/nir_load_libclc.c
-index 17b901db47c..889bde610a3 100644
---- a/src/compiler/clc/nir_load_libclc.c
-+++ b/src/compiler/clc/nir_load_libclc.c
-@@ -52,7 +52,7 @@ struct clc_file {
-    unsigned bit_size;
-    const char *static_data;
-    size_t static_data_size;
--   const char *sys_paths[1];
-+   const char *sys_paths[2];
- };
- 
- static const struct clc_file libclc_files[] = {
-@@ -65,6 +65,7 @@ static const struct clc_file libclc_files[] = {
- #ifdef DYNAMIC_LIBCLC_PATH
-       .sys_paths = {
-          DYNAMIC_LIBCLC_PATH "spirv-mesa3d-.spv",
-+         DYNAMIC_LIBCLC_PATH "spirv32-unknown-unknown/libclc.spv",
-       },
- #endif
-    },
-@@ -77,6 +78,7 @@ static const struct clc_file libclc_files[] = {
- #ifdef DYNAMIC_LIBCLC_PATH
-       .sys_paths = {
-          DYNAMIC_LIBCLC_PATH "spirv64-mesa3d-.spv",
-+         DYNAMIC_LIBCLC_PATH "spirv64-unknown-unknown/libclc.spv",
-       },
- #endif
-    },
--- 
-2.47.3
-
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index fdcc345896..58e5817ef4 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,6 +1,6 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2026-October/000871.html
-sha256  794b3d1729075dae7ebd47c7283b7ca0cdb5dec668f7f11cc0a5d82f6138a0a5  mesa-26.2.5.tar.xz
-sha512  08c7d7ea426ddfb0f7bc51b06e18c363a4d31cf1a8b203828bb455eda0189e41d2215eb9f627585ed11e0d0f231a6a8c9f0c7176238760cd76b62e20c35ccd6a  mesa-26.2.5.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2026-November/000875.html
+sha256  91d729aa68bb89e4ec857841300bbe922bcb3e52b1f97566ca83930d3b28343a  mesa-26.3.0.tar.xz
+sha512  b4abd266ecaf813ef078a0461bcdf7c03d2ecddeb5b6e1c51054fb0afe0d830c0f27fc78f0effe68df5ea7b48f76f4e6ca36ed9afe98513f0e4bf8e0bbbe96dd  mesa-26.3.0.tar.xz
 # License
 sha256  0d1a0472ecc81830e75c20d59b0ea02841e3db21255e0ebad97ab682c54d6615  docs/license.rst
 sha256  323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f  licenses/MIT
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index f20f02190a..fe62de1446 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 26.2.5
+MESA3D_VERSION = 26.3.0
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = https://archive.mesa3d.org
 MESA3D_LICENSE = MIT, SGI, Khronos
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      reply	other threads:[~2026-11-15  8:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-15  8:22 [Buildroot] [PATCH 1/2] package/wayland-protocols: bump version to 1.50 Bernd Kuhls
2026-11-15  8:22 ` Bernd Kuhls [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261115082255.32679-2-bernd@kuhls.net \
    --to=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    --cc=joseph.kogut@gmail.com \
    --cc=romain.naour@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox