mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/{mesa3d, mesa3d-headers}: bump version to 25.3.0

Browse Source 
Release notes:
https://gitlab.freedesktop.org/mesa/mesa/-/blob/25.3/docs/relnotes/25.3.0.rst?ref_type=heads

Rebased patch 0001 due to upstream commit
82bafaa1fa

Rebased patch 0003 due to upstream commit
3bd0badd3a

Removed VDPAU support following upstream commit:
4b54277d2e
Added Config.in.legacy option.

Added optional dependency to libdisplay-info for Vulkan drivers:
2c870bbe20
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35461/diffs#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Julien: resolve Config.in.legacy conflict]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2025-11-15 18:01:33 +01:00
committed by Julien Olivain
parent cad4f06931
commit 3e296a1511
7 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2026.02"
config BR2_PACKAGE_MESA3D_VDPAU
bool "mesa3d Gallium VDPAU state tracker support removed"
select BR2_LEGACY
help
Mesa3d removed the Gallium VDPAU state tracker.
config BR2_BINUTILS_VERSION_2_42_X
bool "binutils 2.42 has been removed"
select BR2_LEGACY

2
package/mesa3d-headers/mesa3d-headers.mk
View File

@@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
MESA3D_HEADERS_VERSION = 25.2.7
MESA3D_HEADERS_VERSION = 25.3.0
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://archive.mesa3d.org
MESA3D_HEADERS_DL_SUBDIR = mesa3d

15
package/mesa3d/0001-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
View File

@@ -10,7 +10,7 @@ to force disabling it at compile time.
Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0, 24.3.0, 25.1.0 & 25.2.0]
[rebased for 25.3.0]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[fix syntax error after previous rebases]
---
@@ -23,7 +23,7 @@ diff --git a/meson.options b/meson.options
index 8e0bf2a..1cf0e07 100644
--- a/meson.options
+++ b/meson.options
@@ -131,6 +131,13 @@ option(
@@ -123,6 +123,13 @@ option(
description : 'enable gallium mediafoundation frontend tests.',
)
@@ -50,11 +50,10 @@ index 84da951..7f950de 100644
libvc4_neon = static_library(
'vc4_neon',
'vc4_tiling_lt.c',
@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm'
@@ -82,6 +82,7 @@
c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'],
dependencies : vc4_deps,
)
- vc4_c_args += '-DUSE_ARM_ASM'
+ vc4_c_args += '-DVC4_TILING_LT_NEON'
endif
@@ -63,20 +62,20 @@ diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_
index 5afe329..919b299 100644
--- a/src/gallium/drivers/vc4/vc4_tiling.h
+++ b/src/gallium/drivers/vc4/vc4_tiling.h
@@ -89,7 +89,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride,
@@ -90,7 +90,7 @@ vc4_load_lt_image(void *dst, uint32_t dst_stride,
void *src, uint32_t src_stride,
int cpp, const struct pipe_box *box)
{
-#ifdef USE_ARM_ASM
-#if DETECT_ARCH_ARM
+#ifdef VC4_TILING_LT_NEON
if (util_get_cpu_caps()->has_neon) {
vc4_load_lt_image_neon(dst, dst_stride, src, src_stride,
cpp, box);
@@ -105,7 +105,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride,
@@ -106,7 +106,7 @@ vc4_store_lt_image(void *dst, uint32_t dst_stride,
void *src, uint32_t src_stride,
int cpp, const struct pipe_box *box)
{
-#ifdef USE_ARM_ASM
-#if DETECT_ARCH_ARM
+#ifdef VC4_TILING_LT_NEON
if (util_get_cpu_caps()->has_neon) {
vc4_store_lt_image_neon(dst, dst_stride, src, src_stride,

7
package/mesa3d/0003-Fix-uClibc-build.patch
View File

@@ -25,9 +25,8 @@ Fixes build errors with uClibc and gcc-9.3.0:
Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[rebased for 23.2.0]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[rebased for 25.3.0]
---
src/util/compiler.h | 10 ++++++++++
src/util/macros.h | 1 +
@@ -59,10 +58,10 @@ diff --git a/src/util/macros.h b/src/util/macros.h
index 22b18303826..8f73ee72693 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -31,6 +31,7 @@
#include <stddef.h>
@@ -32,6 +32,7 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
+#include "util/compiler.h"
#ifdef _GAMING_XBOX

20
package/mesa3d/Config.in
View File

@@ -102,7 +102,7 @@ config BR2_PACKAGE_MESA3D_DRIVER
bool
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7
# OpenGL GLX and Gallium VDPAU both needs X11
# OpenGL GLX needs X11
config BR2_PACKAGE_MESA3D_NEEDS_X11
bool
depends on BR2_PACKAGE_XORG7
@@ -322,24 +322,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ZINK
providing OpenGL support on devices that only support
Vulkan.
config BR2_PACKAGE_MESA3D_VDPAU
bool "Gallium VDPAU state tracker"
depends on BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \
|| BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \
|| BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
select BR2_PACKAGE_MESA3D_NEEDS_X11
select BR2_PACKAGE_LIBVDPAU
help
VDPAU state tracker (needs r300, r600, radeonsi or nouveau
gallium drivers).
comment "Gallium VDPAU state tracker needs X.org and gallium drivers r600, radeonsi or nouveau"
depends on !BR2_PACKAGE_XORG7 || \
!(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \
|| BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \
|| BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI)
comment "Vulkan drivers"
config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM

6
package/mesa3d/mesa3d.hash
View File

@@ -1,6 +1,6 @@
# From https://lists.freedesktop.org/archives/mesa-announce/2025-November/000828.html
sha256 b40232a642011820211aab5a9cdf754e106b0bce15044bc4496b0ac9615892ad mesa-25.2.7.tar.xz
sha512 87dd815e0d11d6ec0eb969ee93d3f376103bb899d90599e0b7902394e41c58139384df79f89633e132ca969348d3320f55308a74651d409b454d51f1bcda27bc mesa-25.2.7.tar.xz
# From https://gitlab.freedesktop.org/mesa/mesa/-/blob/25.3/docs/relnotes/25.3.0.rst?ref_type=heads
sha256 0fd54fea7dbbddb154df05ac752b18621f26d97e27863db3be951417c6abe8ae mesa-25.3.0.tar.xz
sha512 46df9e5e27f9a36cf893a68ad4a465fcc6efe1bcb46ad8d4b015699ad1a11e582b8d41f4157326556af603fe454b2ff34ecc17a0c742b5fd9ce5f0097106fec5 mesa-25.3.0.tar.xz
# License
sha256 0d1a0472ecc81830e75c20d59b0ea02841e3db21255e0ebad97ab682c54d6615 docs/license.rst
sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f licenses/MIT

17
package/mesa3d/mesa3d.mk
View File

@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
MESA3D_VERSION = 25.2.7
MESA3D_VERSION = 25.3.0
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://archive.mesa3d.org
MESA3D_LICENSE = MIT, SGI, Khronos
@@ -159,11 +159,18 @@ endif
ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),)
MESA3D_CONF_OPTS += \
-Ddisplay-info=disabled \
-Dvulkan-drivers=
else
MESA3D_DEPENDENCIES += host-python-glslang
MESA3D_CONF_OPTS += \
-Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y))
ifeq ($(BR2_PACKAGE_LIBDISPLAY_INFO),y)
MESA3D_DEPENDENCIES += libdisplay-info
MESA3D_CONF_OPTS += -Ddisplay-info=enabled
else
MESA3D_CONF_OPTS += -Ddisplay-info=disabled
endif
endif
# APIs
@@ -245,13 +252,6 @@ else
MESA3D_CONF_OPTS += -Dlibunwind=disabled
endif
ifeq ($(BR2_PACKAGE_MESA3D_VDPAU),y)
MESA3D_DEPENDENCIES += libvdpau
MESA3D_CONF_OPTS += -Dgallium-vdpau=enabled
else
MESA3D_CONF_OPTS += -Dgallium-vdpau=disabled
endif
ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
MESA3D_CONF_OPTS += -Dlmsensors=enabled
MESA3D_DEPENDENCIES += lm-sensors
@@ -287,7 +287,6 @@ endif
HOST_MESA3D_CONF_OPTS = \
-Dglvnd=disabled \
-Dgallium-drivers=$(subst $(space),$(comma),$(HOST_MESA3D_GALLIUM_DRIVERS-y)) \
-Dgallium-vdpau=disabled \
-Dinstall-mesa-clc=true \
-Dmesa-clc=enabled \
-Dplatforms= \