Merge pull request #9512 from heitbaum/mesa

mesa: update to 24.3.0
This commit is contained in:
CvH 2024-11-23 22:28:13 +01:00 committed by GitHub
commit dc45a75b2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 51 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mesa"
PKG_VERSION="24.2.7"
PKG_SHA256="a0ce37228679647268a83b3652d859dcf23d6f6430d751489d4464f6de6459fd"
PKG_VERSION="24.3.0"
PKG_SHA256="97813fe65028ef21b4d4e54164563059e8408d8fee3489a2323468d198bf2efc"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"
PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
@ -22,14 +22,12 @@ PKG_MESON_OPTS_HOST="-Dglvnd=disabled \
-Dgallium-drivers=iris \
-Dgallium-vdpau=disabled \
-Dplatforms= \
-Ddri3=disabled \
-Dglx=disabled \
-Dvulkan-drivers="
PKG_MESON_OPTS_TARGET="-Dgallium-drivers=${GALLIUM_DRIVERS// /,} \
-Dgallium-extra-hud=false \
-Dgallium-rusticl=false \
-Dgallium-omx=disabled \
-Dgallium-nine=false \
-Dgallium-opencl=disabled \
-Dshader-cache=enabled \
@ -44,23 +42,19 @@ PKG_MESON_OPTS_TARGET="-Dgallium-drivers=${GALLIUM_DRIVERS// /,} \
-Dbuild-tests=false \
-Ddraw-use-llvm=false \
-Dmicrosoft-clc=disabled \
-Dselinux=false \
-Dosmesa=false"
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr"
export X11_INCLUDES=
PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 \
-Ddri3=enabled \
-Dglx=dri"
elif [ "${DISPLAYSERVER}" = "wl" ]; then
PKG_DEPENDS_TARGET+=" wayland wayland-protocols"
PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland \
-Ddri3=disabled \
-Dglx=disabled"
else
PKG_MESON_OPTS_TARGET+=" -Dplatforms="" \
-Ddri3=disabled \
-Dglx=disabled"
fi

View File

@ -1,43 +0,0 @@
From 54cc206be2d48916862d7e264e886f58b27dd653 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Thu, 5 Oct 2023 19:32:10 +0100
Subject: [PATCH 1/3] gallium: Add kmsro drivers for RP1 DSI, DPI, and VEC
devices
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
src/gallium/targets/dril/meson.build | 3 +++
src/gallium/targets/dri/dri_target.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build
index 66619bba0db..443923772e8 100644
--- a/src/gallium/targets/dril/meson.build
+++ b/src/gallium/targets/dril/meson.build
@@ -64,6 +64,9 @@
foreach d : [[with_gallium_kmsro, [
'armada-drm_dri.so',
+ 'drm-rp1-dpi_dri.so',
+ 'drm-rp1-dsi_dri.so',
+ 'drm-rp1-vec_dri.so',
'exynos_dri.so',
'gm12u320_dri.so',
'hdlcd_dri.so',
diff --git a/src/gallium/targets/dri/dri_target.c b/src/gallium/targets/dri/dri_target.c
index 9d3069eb004..79f60a7224a 100644
--- a/src/gallium/targets/dri/dri_target.c
+++ b/src/gallium/targets/dri/dri_target.c
@@ -101,6 +101,9 @@
#if defined(GALLIUM_KMSRO)
DEFINE_LOADER_DRM_ENTRYPOINT(armada_drm)
+DEFINE_LOADER_DRM_ENTRYPOINT(drm_rp1_dpi)
+DEFINE_LOADER_DRM_ENTRYPOINT(drm_rp1_dsi)
+DEFINE_LOADER_DRM_ENTRYPOINT(drm_rp1_vec)
DEFINE_LOADER_DRM_ENTRYPOINT(exynos)
DEFINE_LOADER_DRM_ENTRYPOINT(gm12u320)
DEFINE_LOADER_DRM_ENTRYPOINT(hdlcd)
--
2.39.2