qemu: Fix build when x11 is not in distro features
PATCH v2 1/2 qemu: Fix build when x11 is not in distro features
There is use of MESA_EGL_NO_X11_HEADERS which is now renamed in newer headers to EGL_NO_X11 from mesa/khronos headers, however this define is relatively new and 3D stacks do not have this adopted but apps
like qemu and bunch of others depend on it, I guess they assume mesa. One can argue that its better to fix the 3D stacks to behave
like mesa but this means every BSP using these stacks will need to carry such a fix.
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/include/EGL/eglplatform.h
--- meta/recipes-devtools/qemu/qemu_6.2.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/qemu/qemu_6.2.0.bb +2 -0
@@ -6,6 +6,8 @@ DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" DEPENDS:append:libc-musl = " libucontext" +CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + RDEPENDS:${PN}:class-target += "bash" EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
Signature · 1 line
2.35.1
PATCH 2/2 webkitgtk: Fix build when x11 is not in distro features
ANGLE's copy of khrplatform.h is not uptodate with mesa/khronos khrplatform.h which uses MESA_EGL_NO_X11_HEADERS which is now renamed in newer headers to EGL_NO_X11 from mesa/khronos headers, however this define is relatively new and 3D stacks do not have this adopted but apps like qemu and bunch of others depend on it, I guess they assume mesa. One can argue that its better to fix the 3D stacks to behave
like mesa but this means every BSP using these stacks will need to carry such a fix.
https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/include/EGL/eglplatform.h
This patch helps with that
--- meta/recipes-sato/webkit/webkitgtk_2.34.6.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-sato/webkit/webkitgtk_2.34.6.bb +3 -0
@@ -98,6 +98,9 @@ EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " CFLAGS:append:arc = " -mlong-calls" CXXFLAGS:append:arc = " -mlong-calls" +# Needed for non-mesa graphics stacks when x11 is disabled +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + # Javascript JIT is not supported on powerpc EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF "
Signature · 1 line
2.35.1