mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 09:32:17 +02:00
mesa: allow mesa (gbm) to compile without backend
Commit introduces a patch that allows for gbm to
be built with an empty backend. There are situation
where mesa-gl is the preferred provider for virtual/libgbm,
virtual/libgl, virtual/mesa, etc... But the x11 DISTRO_FEATURE
isn't included this leads to build errors such as
| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o: in function
`find_backend':
| backend.c:(.text.find_backend+0xa4): undefined reference to
`gbm_dri_backend'
| /../../../ld:
src/gbm/libgbm.so.1.0.0.p/main_backend.c.o:(.data.rel.ro.builtin_backends+0x4):
undefined reference to `gbm_dri_backend'
| collect2: error: ld returned 1 exit status
Add patch to bypass compilation issue by excluding gbm dri backend.
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20447
842ca28465
Commit also includes the use of TARGET_CFLAGS variable in mesa-gl recipe
to fix bellow compilation bug.
/../recipe-sysroot/usr/include/xf86drm.h:40:10: fatal error: drm.h: No such file or directory
| 40 | #include <drm.h>
(From OE-Core rev: 00a662c5e28235fb64348aab4ce9aeb5e7f95d06)
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2ac1235b9b
commit
daf42dbe78
@@ -0,0 +1,65 @@
|
||||
From 25946100e21cf2095bea334e8d7096798561d0b7 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Davis Jr <vince@underview.tech>
|
||||
Date: Wed, 28 Dec 2022 16:28:01 -0600
|
||||
Subject: [PATCH] gbm/backend: fix gbm compile without dri
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20447
|
||||
https://gitlab.freedesktop.org/mesa/mesa/-/commit/842ca284650f066e58706741a7d22d67b5088e60
|
||||
|
||||
At mesa version 22.2.3 patch wasn't introduced until after.
|
||||
|
||||
Commit introduces a fix that allows for gbm to be built with an empty
|
||||
backend. There are situation especially in a Yocto/OE cross compilation
|
||||
environment where you want to build with an empty backend. The particular
|
||||
situation is as such:
|
||||
|
||||
The mesa-gl recipe is the preferred provider for virtual/libgbm, virtual/libgl,
|
||||
virtual/mesa, etc... But the x11 DISTRO_FEATURE in't included this leads to build
|
||||
errors such as:
|
||||
|
||||
| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o: in function `find_backend':
|
||||
| backend.c:(.text.find_backend+0xa4): undefined reference to `gbm_dri_backend'
|
||||
| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o:(.data.rel.ro.builtin_backends+0x4):
|
||||
undefined reference to `gbm_dri_backend'
|
||||
| collect2: error: ld returned 1 exit status
|
||||
|
||||
Issue should be replicable by setting -Ddri3=disabled and -Dgbm=enabled
|
||||
|
||||
Add fix to bypasses compilation issue by excluding gbm dri backend. If
|
||||
HAVE_DRI || HAVE_DRIX not specified.
|
||||
|
||||
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
|
||||
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
|
||||
---
|
||||
src/gbm/main/backend.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c
|
||||
index 974d0a76a4e..feee0703495 100644
|
||||
--- a/src/gbm/main/backend.c
|
||||
+++ b/src/gbm/main/backend.c
|
||||
@@ -42,7 +42,9 @@
|
||||
#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
|
||||
#define VER_MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
+#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3)
|
||||
extern const struct gbm_backend gbm_dri_backend;
|
||||
+#endif
|
||||
|
||||
struct gbm_backend_desc {
|
||||
const char *name;
|
||||
@@ -51,7 +53,9 @@ struct gbm_backend_desc {
|
||||
};
|
||||
|
||||
static const struct gbm_backend_desc builtin_backends[] = {
|
||||
+#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3)
|
||||
{ "dri", &gbm_dri_backend },
|
||||
+#endif
|
||||
};
|
||||
|
||||
#define BACKEND_LIB_SUFFIX "_gbm"
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -6,6 +6,8 @@ PROVIDES = "virtual/libgl virtual/mesa"
|
||||
|
||||
S = "${WORKDIR}/mesa-${PV}"
|
||||
|
||||
TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm"
|
||||
|
||||
# At least one DRI rendering engine is required to build mesa.
|
||||
# When no X11 is available, use osmesa for the rendering engine.
|
||||
PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}"
|
||||
|
||||
@@ -18,6 +18,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
|
||||
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
|
||||
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
|
||||
file://0001-util-format-Check-for-NEON-before-using-it.patch \
|
||||
file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \
|
||||
${NATIVE_PATCHES} \
|
||||
"
|
||||
NATIVE_PATCHES ?= ""
|
||||
|
||||
Reference in New Issue
Block a user