From 9b9bd5225eb5f6524149ca173f3e273a6549ce08 Mon Sep 17 00:00:00 2001
From: Bassem Nomany <bassem.nomany@id8-engineering.io>
Date: Fri, 22 Nov 2024 13:26:19 +0100
Subject: [PATCH] mesa: update to 24.3.1

Upgrade to latest official mesa release.

Fixes DRM DSI linking to missing and non exisiting library
drm-rp1-dsi_dri.so on mesa 24.0.7 from poky scarthgap
and styhead.

    https://github.com/agherzan/meta-raspberrypi/issues/1389

Signed-off-by: Bassem Nomany <bassem.nomany@id8-engineering.io>
---
 recipes-graphics/mesa/mesa_%.bbappend         | 32 ++++++++++++++++---
 .../wayland/wayland-protocols_1.38.bb         | 30 +++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 recipes-graphics/wayland/wayland-protocols_1.38.bb

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 7000ead0f..4ee31b23f 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,6 +1,28 @@
-# DRI3 note:
-# With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set
-# as default. To state out clearly that Raspi needs dri3 and to avoid surprises
-# in case oe-core changes this default, we set dri3 explicitly.
-PACKAGECONFIG:append:rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'vulkan broadcom', '', d)}"
+PACKAGECONFIG:append:rpi = " gallium gallium-llvm vc4 v3d ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'vulkan broadcom', '', d)}"
 DRIDRIVERS:class-target:rpi = ""
+
+# Remove unused patches
+SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
+           file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
+"
+
+SRC_URI[sha256sum] = "9c795900449ce5bc7c526ba0ab3532a22c3c951cab7e0dd9de5fcac41b0843af"
+PV = "24.3.1"
+
+# -Dglvnd is deprecated from true/false to enabled/disabled 
+PACKAGECONFIG[glvnd] = "-Dglvnd=enabled, -Dglvnd=disabled, libglvnd"
+
+# DRI3 note:
+# DRI3 Build option is removed from meson.
+PACKAGECONFIG:remove = "dri3"
+unset PACKAGECONFIG[dri3]
+
+DEPENDS += " wayland-protocols llvm python3-pyyaml python3-pyyaml-native"
+
+RDEPENDS:libgl-mesa += " llvm wayland-protocols"
+
+FILES:libgbm += " ${libdir}/gbm/dri_gbm*.so"
+
+FILES:libgl-mesa += " ${libdir}/libgallium*.so"
+
+FILES:libgbm-dev += " ${includedir}/gbm.h"
diff --git a/recipes-graphics/wayland/wayland-protocols_1.38.bb b/recipes-graphics/wayland/wayland-protocols_1.38.bb
new file mode 100644
index 000000000..821670a6b
--- /dev/null
+++ b/recipes-graphics/wayland/wayland-protocols_1.38.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Collection of additional Wayland protocols"
+DESCRIPTION = "Wayland protocols that add functionality not \
+available in the Wayland core protocol. Such protocols either add \
+completely new functionality, or extend the functionality of some other \
+protocol either in Wayland core, or some other protocol in \
+wayland-protocols."
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
+                    file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
+
+SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz"
+SRC_URI[sha256sum] = "ff17292c05159d2b20ce6cacfe42d7e31a28198fa1429a769b03af7c38581dbe"
+
+UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags"
+UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)"
+
+inherit meson pkgconfig allarch
+
+DEPENDS += " wayland-native"
+
+EXTRA_OEMESON += "-Dtests=false"
+
+PACKAGES = "${PN}"
+FILES:${PN} += "  \
+    ${datadir}/pkgconfig/wayland-protocols.pc  \
+    ${includedir}  \
+"
+
+BBCLASSEXTEND = "native nativesdk"