[Buildroot] [PATCH v4 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.3.3

Fiona Klute fiona.klute at gmx.de
Sat Jan 25 23:07:45 UTC 2025


Am 18.01.25 um 09:38 schrieb Bernd Kuhls:
> Release notes:
> https://lists.freedesktop.org/archives/mesa-announce/2024-May/000762.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-June/000763.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-June/000765.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-July/000766.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-July/000767.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-July/000771.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-August/000773.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-August/000776.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-September/000778.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-October/000780.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-October/000781.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-October/000782.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-November/000784.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-November/000786.html
> https://lists.freedesktop.org/archives/mesa-announce/2024-December/000788.html
> https://docs.mesa3d.org/relnotes/24.3.2.html
> https://docs.mesa3d.org/relnotes/24.3.3.html
> ------------------------------------------------------------------------
> Changes needed for the bump to 24.1.x:
>
> Added dependency to llvm & Co. for iris driver due to upstream commit:
> https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=a512c2a8b572c5da360873320dbbd343c6223cd6
>
> Added host version of mesa tool intel_clc needed for target build of the
> iris driver.
>
> Added dependency to host-python-pycparser for etnaviv driver due to
> upstream commit:
> https://cgit.freedesktop.org/mesa/mesa/commit/src/etnaviv/hwdb/meson.build?h=24.1&id=2192e620bb0c68b75ff45165d0b117c7ecb77268
>
> Added dependency to host-python-ply for intel vulkan driver due to
> upstream commit:
> https://cgit.freedesktop.org/mesa/mesa/commit/src/intel/vulkan/grl/meson.build?h=24.1&id=dc1aedef2bd054884685ad971a3ef5be07ecd101
>
> Although this dependency exists since mesa3d 22.3 it is only needed when
> intel-clc is enabled, this dependency is added with this patch so no need
> to backport this dependency to older buildroot trees.
>
> Update configure parameter of glvnd option due to upstream commit:
> https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=4f25b84b2460524d375424a81b42faa4d99c8e60
> ------------------------------------------------------------------------
> Changes needed for the bump to 24.2.x:
>
> Added dependency to host-python-pyyaml to host and target build, needed
> due to upstream commit
> https://gitlab.freedesktop.org/mesa/mesa/-/commit/a3813327575e8875c8c3ed24b5f45a0b7ba64446
>
> Rebased patch 0002 due to upstream commit:
> https://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/vc4/meson.build?h=24.2&id=da70827656757cd070faac7aff5ca057f1e7fb8a
>
> Renamed BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST to
> BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE (also updated tests) and
> added new option BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE due to
> upstream commit
> https://gitlab.freedesktop.org/mesa/mesa/-/commit/010b2f9497ab256d9e8041207902948331af5b4b
> "gallium/meson: Deconflate swrast/softpipe/llvmpipe"
> ------------------------------------------------------------------------
> Changes needed for the bump to 24.3.x:
>
> Rebased patch 0002 again due to upstream commit:
> https://gitlab.freedesktop.org/mesa/mesa/-/commit/25ba90fd888cef431c2098c8afdb0a2bbd34b303
>
> Removed dri3 configure option:
> https://gitlab.freedesktop.org/mesa/mesa/-/commit/8f6fca89aa1812b03da6d9f7fac3966955abc41e
>
> Removed gallium-omx configure option:
> https://gitlab.freedesktop.org/mesa/mesa/-/commit/9b6c27a320ab4b0fcf1fb16220ae7c3d3f06f7df
>
> Signed-off-by: Bernd Kuhls <bernd at kuhls.net>

Tested-by: Fiona Klute (WIWA) <fiona.klute at gmx.de>  # tested with VC4

Note maintainers, half of the patch I sent on Friday to add options to
enable the zink and kmsro Gallium drivers [1] is obsolete (and broken)
if this series is applied, because Mesa now enables kmsro automatically
if any of the GPU drivers that can use kmsro is enabled, and the option
is invalid. Probably easiest to apply this Mesa update first, and then I
can respin the patch.

Thanks,
Fiona

[1]
https://patchwork.ozlabs.org/project/buildroot/patch/20250124101900.99783-1-fiona.klute@gmx.de/

> ---
> v4: bumped to 24.3.3
> v3: bumped to 24.3.2
>      renamed remaining occurences of BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
>      to BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE (Andreas)
> v2: sed -i 's/SWRAST/SOFTPIPE/g' support/testing/tests/package/test_*.py
>      (Julien)
>
>   Config.in.legacy                              |  7 +++
>   package/mesa3d-headers/mesa3d-headers.mk      |  2 +-
>   ...tion-to-disable-optional-neon-suppor.patch | 18 +++---
>   package/mesa3d/Config.in                      | 32 ++++++++--
>   package/mesa3d/mesa3d.hash                    |  6 +-
>   package/mesa3d/mesa3d.mk                      | 58 ++++++++++++++-----
>   support/testing/tests/package/test_flutter.py |  2 +-
>   .../tests/package/test_glslsandbox_player.py  |  2 +-
>   support/testing/tests/package/test_glxinfo.py |  2 +-
>   support/testing/tests/package/test_kmscube.py |  2 +-
>   .../tests/package/test_python_pyqt5.py        |  2 +-
>   support/testing/tests/package/test_weston.py  |  2 +-
>   12 files changed, 96 insertions(+), 39 deletions(-)
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index e091fd8c0a..965097208e 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
>   comment "Legacy options removed in 2025.02"
>
> +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
> +	bool "mesa Gallium swrast driver was replaced by softpipe"
> +	select BR2_LEGACY
> +	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
> +	help
> +	  The Gallium swrast driver was replaced by softpipe.
> +
>   config BR2_nios2
>   	bool "nios2 architecture removed"
>   	select BR2_LEGACY
> diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
> index 33c60b285f..abe4350061 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 = 24.0.9
> +MESA3D_HEADERS_VERSION = 24.3.3
>   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/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
> index f3919478a6..3b9bca0693 100644
> --- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
> +++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch
> @@ -9,8 +9,8 @@ to force disabling it at compile time.
>
>   Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114
>   Signed-off-by: Peter Seiderer <ps.report at gmx.net>
> -Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
> -[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0]
> +Signed-off-by: Bernd Kuhls <bernd at kuhls.net>
> +[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.3.0]
>   Signed-off-by: Peter Seiderer <ps.report at gmx.net>
>   [fix syntax error after previous rebases]
>   ---
> @@ -23,7 +23,7 @@ diff --git a/meson_options.txt b/meson_options.txt
>   index 8e0bf2a..1cf0e07 100644
>   --- a/meson_options.txt
>   +++ b/meson_options.txt
> -@@ -124,6 +124,13 @@ option(
> +@@ -117,6 +117,13 @@ option(
>      description : 'enable gallium va frontend.',
>    )
>
> @@ -41,18 +41,18 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson
>   index 84da951..7f950de 100644
>   --- a/src/gallium/drivers/vc4/meson.build
>   +++ b/src/gallium/drivers/vc4/meson.build
> -@@ -84,7 +84,7 @@ files_libvc4 = files(
> - vc4_c_args = []
> +@@ -72,7 +72,7 @@ files_libvc4 = files(
> + ]
>
>    libvc4_neon = []
>   -if host_machine.cpu_family() == 'arm'
>   +if host_machine.cpu_family() == 'arm' and not get_option('gallium-vc4-neon').disabled()
>      libvc4_neon = static_library(
>        'vc4_neon',
> -     'vc4_tiling_lt_neon.c',
> -@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm'
> -     ],
> -     c_args : '-mfpu=neon',
> +     'vc4_tiling_lt.c',
> +@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm'
> +     c_args : ['-mfpu=neon', '-DV3D_BUILD_NEON'],
> +     dependencies : vc4_deps,
>      )
>   -  vc4_c_args += '-DUSE_ARM_ASM'
>   +  vc4_c_args += '-DVC4_TILING_LT_NEON'
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index 7761b0a650..16bd189a55 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -50,7 +50,8 @@ config BR2_PACKAGE_MESA3D_OPENCL
>   	bool "OpenCL support"
>   	depends on BR2_PACKAGE_MESA3D_LLVM
>   	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \
> -		BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
> +		BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \
> +		BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
>   	select BR2_PACKAGE_LLVM_RTTI
>   	select BR2_PACKAGE_CLANG
>   	select BR2_PACKAGE_LIBCLC
> @@ -129,10 +130,18 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915
>   config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
>   	bool "Gallium iris driver"
>   	depends on BR2_i386 || BR2_x86_64
> +	depends on BR2_PACKAGE_MESA3D_LLVM
>   	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
> +	select BR2_PACKAGE_MESA3D_OPENCL
> +	select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR
> +	select BR2_PACKAGE_SPIRV_TOOLS
>   	help
>   	  Mesa driver for iris-based Intel GPUs.
>
> +comment "iris driver needs llvm"
> +	depends on BR2_i386 || BR2_x86_64
> +	depends on !BR2_PACKAGE_MESA3D_LLVM
> +
>   config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
>   	bool "Gallium lima driver"
>   	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
> @@ -140,6 +149,17 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
>   	help
>   	  Mesa driver for ARM Mali Utgard GPUs.
>
> +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE
> +	bool "Gallium llvmpipe driver"
> +	depends on BR2_PACKAGE_MESA3D_LLVM
> +	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
> +	help
> +	  This is a llvm opengl implementation using the Gallium3D
> +	  infrastructure.
> +
> +comment "llvmpipe driver needs llvm"
> +	depends on !BR2_PACKAGE_MESA3D_LLVM
> +
>   config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
>   	bool "Gallium nouveau driver"
>   	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
> @@ -212,8 +232,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
>   	help
>   	  This is a virtual GPU driver for VMWare virtual machines.
>
> -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
> -	bool "Gallium swrast driver"
> +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
> +	bool "Gallium softpipe driver"
>   	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
>   	help
>   	  This is a software opengl implementation using the Gallium3D
> @@ -285,7 +305,7 @@ comment "Vulkan drivers"
>   config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM
>   	bool "Vulkan broadcom driver"
>   	depends on BR2_arm || BR2_aarch64
> -	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # dri3/libxshmfence
> +	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence
>   	select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
>   	help
>   	  Vulkan broadcom driver.
> @@ -309,7 +329,7 @@ comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17"
>   config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST
>   	bool "Vulkan swrast driver"
>   	depends on BR2_PACKAGE_MESA3D_LLVM
> -	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
> +	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
>   	select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
>   	help
>   	  Vulkan swrast driver.
> @@ -318,7 +338,7 @@ comment "Off-screen Rendering"
>
>   config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM
>   	bool "OSMesa (Gallium) library"
> -	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
> +	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE
>   	help
>   	  The OSMesa API provides functions for off-screen rendering.
>
> diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
> index d506d398b8..c9240b23ef 100644
> --- a/package/mesa3d/mesa3d.hash
> +++ b/package/mesa3d/mesa3d.hash
> @@ -1,5 +1,5 @@
> -# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html
> -sha256  51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c  mesa-24.0.9.tar.xz
> -sha512  de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5  mesa-24.0.9.tar.xz
> +# From https://docs.mesa3d.org/relnotes/24.3.3.html
> +sha256  105afc00a4496fa4d29da74e227085544919ec7c86bd92b0b6e7fcc32c7125f4  mesa-24.3.3.tar.xz
> +sha512  280d7a6dd64503ec398d449430270c78b5558c03bfeed3a42346573fd2db1aa3f96f5a212e49288718a7fe27447ee40235b066517622d68b0dfdd7b251a4e85f  mesa-24.3.3.tar.xz
>   # License
>   sha256  a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75  docs/license.rst
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index ce460c4475..bd46d4b893 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 = 24.0.9
> +MESA3D_VERSION = 24.3.3
>   MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
>   MESA3D_SITE = https://archive.mesa3d.org
>   MESA3D_LICENSE = MIT, SGI, Khronos
> @@ -21,19 +21,20 @@ MESA3D_DEPENDENCIES = \
>   	host-bison \
>   	host-flex \
>   	host-python-mako \
> +	host-python-pyyaml \
>   	expat \
>   	libdrm \
>   	zlib
>
>   MESA3D_CONF_OPTS = \
> -	-Dgallium-omx=disabled \
> +	-Dgallium-opencl=disabled \
> +	-Dgallium-rusticl=false \
> +	-Dmicrosoft-clc=disabled \
> +	-Dopencl-spirv=false \
>   	-Dpower8=disabled
>
>   ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy)
> -MESA3D_CONF_OPTS += -Ddri3=enabled
>   MESA3D_DEPENDENCIES += xlib_libxshmfence
> -else
> -MESA3D_CONF_OPTS += -Ddri3=disabled
>   endif
>
>   ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y)
> @@ -50,14 +51,9 @@ else
>   MESA3D_CONF_OPTS += -Dllvm=disabled
>   endif
>
> -# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of
> -# libMesaOpenCL and CL headers are installed
>   ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y)
>   MESA3D_PROVIDES += libopencl
>   MESA3D_DEPENDENCIES += clang libclc
> -MESA3D_CONF_OPTS += -Dgallium-opencl=standalone
> -else
> -MESA3D_CONF_OPTS += -Dgallium-opencl=disabled
>   endif
>
>   ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
> @@ -99,13 +95,14 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedre
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915)     += i915
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS)     += iris
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA)     += lima
> +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LLVMPIPE) += llvmpipe
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)  += nouveau
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST) += panfrost
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300)     += r300
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600)     += r600
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA)     += svga
> -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST)   += swrast
> +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE) += softpipe
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA)    += tegra
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D)      += v3d
>   MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4)      += vc4
> @@ -126,6 +123,19 @@ MESA3D_CONF_OPTS += \
>   	-Dgallium-extra-hud=true
>   endif
>
> +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y)
> +MESA3D_DEPENDENCIES += host-python-pycparser
> +endif
> +
> +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y)
> +MESA3D_DEPENDENCIES += host-python-ply
> +endif
> +
> +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y)
> +MESA3D_CONF_OPTS += -Dintel-clc=system
> +MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools
> +endif
> +
>   ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),)
>   MESA3D_CONF_OPTS += \
>   	-Dvulkan-drivers=
> @@ -251,12 +261,32 @@ endif
>   ifeq ($(BR2_PACKAGE_LIBGLVND),y)
>   ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),)
>   MESA3D_DEPENDENCIES += libglvnd
> -MESA3D_CONF_OPTS += -Dglvnd=true
> +MESA3D_CONF_OPTS += -Dglvnd=enabled
>   else
> -MESA3D_CONF_OPTS += -Dglvnd=false
> +MESA3D_CONF_OPTS += -Dglvnd=disabled
>   endif
>   else
> -MESA3D_CONF_OPTS += -Dglvnd=false
> +MESA3D_CONF_OPTS += -Dglvnd=disabled
>   endif
>
> +HOST_MESA3D_CONF_OPTS = \
> +	-Dglvnd=disabled \
> +	-Dgallium-drivers=iris \
> +	-Dgallium-vdpau=disabled \
> +	-Dplatforms= \
> +	-Dglx=disabled \
> +	-Dvulkan-drivers=""
> +
> +HOST_MESA3D_DEPENDENCIES = \
> +	host-libclc \
> +	host-libdrm \
> +	host-python-mako \
> +	host-python-pyyaml \
> +	host-spirv-tools
> +
> +define HOST_MESA3D_INSTALL_CMDS
> +	$(INSTALL) -D -m 0755 $(@D)/build/src/intel/compiler/intel_clc $(HOST_DIR)/bin/intel_clc
> +endef
> +
>   $(eval $(meson-package))
> +$(eval $(host-meson-package))
> diff --git a/support/testing/tests/package/test_flutter.py b/support/testing/tests/package/test_flutter.py
> index 08aa497417..e4040ca7dc 100644
> --- a/support/testing/tests/package/test_flutter.py
> +++ b/support/testing/tests/package/test_flutter.py
> @@ -22,7 +22,7 @@ class TestFlutter(infra.basetest.BRTest, GraphicsBase):
>           BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{infra.filepath("tests/package/test_flutter/linux-vkms.fragment")}"
>           BR2_PACKAGE_LIBDRM=y
>           BR2_PACKAGE_MESA3D=y
> -        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> +        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
>           BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y
>           BR2_PACKAGE_MESA3D_OPENGL_ES=y
>           BR2_PACKAGE_FLUTTER_PI=y
> diff --git a/support/testing/tests/package/test_glslsandbox_player.py b/support/testing/tests/package/test_glslsandbox_player.py
> index 3b0dd60395..f72ac2adce 100644
> --- a/support/testing/tests/package/test_glslsandbox_player.py
> +++ b/support/testing/tests/package/test_glslsandbox_player.py
> @@ -17,7 +17,7 @@ class TestGlslsandboxPlayer(infra.basetest.BRTest):
>           BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
>           BR2_PACKAGE_LIBDRM=y
>           BR2_PACKAGE_MESA3D=y
> -        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> +        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
>           BR2_PACKAGE_MESA3D_LLVM=y
>           BR2_PACKAGE_MESA3D_OPENGL_EGL=y
>           BR2_PACKAGE_MESA3D_OPENGL_ES=y
> diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py
> index 3ccbdca8d9..2fece52372 100644
> --- a/support/testing/tests/package/test_glxinfo.py
> +++ b/support/testing/tests/package/test_glxinfo.py
> @@ -19,7 +19,7 @@ class TestGlxinfo(infra.basetest.BRTest):
>           BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config"
>           BR2_PACKAGE_MESA3D_DEMOS=y
>           BR2_PACKAGE_MESA3D=y
> -        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> +        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
>           BR2_PACKAGE_MESA3D_OPENGL_GLX=y
>           BR2_PACKAGE_XORG7=y
>           BR2_PACKAGE_XSERVER_XORG_SERVER=y
> diff --git a/support/testing/tests/package/test_kmscube.py b/support/testing/tests/package/test_kmscube.py
> index 0ddeb67939..4a0eb07c32 100644
> --- a/support/testing/tests/package/test_kmscube.py
> +++ b/support/testing/tests/package/test_kmscube.py
> @@ -18,7 +18,7 @@ class TestKmsCube(infra.basetest.BRTest):
>           BR2_PACKAGE_KMSCUBE=y
>           BR2_PACKAGE_LIBDRM=y
>           BR2_PACKAGE_MESA3D=y
> -        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> +        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
>           BR2_PACKAGE_MESA3D_LLVM=y
>           BR2_PACKAGE_MESA3D_OPENGL_EGL=y
>           BR2_PACKAGE_MESA3D_OPENGL_ES=y
> diff --git a/support/testing/tests/package/test_python_pyqt5.py b/support/testing/tests/package/test_python_pyqt5.py
> index 5f1952b559..65130f9c03 100644
> --- a/support/testing/tests/package/test_python_pyqt5.py
> +++ b/support/testing/tests/package/test_python_pyqt5.py
> @@ -28,7 +28,7 @@ class TestPythonPyQt5(infra.basetest.BRTest):
>           BR2_PACKAGE_DEJAVU=y
>           BR2_PACKAGE_LIBDRM=y
>           BR2_PACKAGE_MESA3D=y
> -        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> +        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
>           BR2_PACKAGE_MESA3D_LLVM=y
>           BR2_PACKAGE_MESA3D_OPENGL_EGL=y
>           BR2_PACKAGE_MESA3D_OPENGL_ES=y
> diff --git a/support/testing/tests/package/test_weston.py b/support/testing/tests/package/test_weston.py
> index 2ed59a7f15..461ae50544 100644
> --- a/support/testing/tests/package/test_weston.py
> +++ b/support/testing/tests/package/test_weston.py
> @@ -22,7 +22,7 @@ class TestWeston(infra.basetest.BRTest, GraphicsBase):
>           BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
>           BR2_PACKAGE_LIBDRM=y
>           BR2_PACKAGE_MESA3D=y
> -        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> +        BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SOFTPIPE=y
>           BR2_PACKAGE_MESA3D_LLVM=y
>           BR2_PACKAGE_MESA3D_OPENGL_EGL=y
>           BR2_PACKAGE_MESA3D_OPENGL_ES=y



More information about the buildroot mailing list