2b7b4506c8
waffle has four "backends", each having their own dependencies. At least one "backend" must be enabled, otherwise Waffle will refuse to build. The "backends" are: - glx, which needs full OpenGL + x11-xcb - wayland, which needs wayland-client, wayland-egl and EGL - x11-egl, which needs x11-xcb and EGL - gbm, which needs gbm, libudev and EGL Backport an upstream patch fixing a build issue with musl toolchains. Add a new patch fixing build with Wayand without X11. Signed-off-by: Romain Naour <romain.naour@gmail.com> [Thomas: drop GLES dependency, it is not mandatory.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@gmail.com>
|
|
Date: Sun, 24 Dec 2017 00:11:45 +0100
|
|
Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags
|
|
|
|
When building mesa egl without x11 and gles2 the headers need a
|
|
MESA_EGL_NO_X11_HEADERS define to avoid including X11 headers.
|
|
|
|
This define MESA_EGL_NO_X11_HEADERS is lost while building waffle
|
|
since CGLAGS defined by pc files are not used.
|
|
|
|
MESA_EGL_NO_X11_HEADERS is defined in CFLAGS from egl.pc.
|
|
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
---
|
|
src/waffle/CMakeLists.txt | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
|
|
index d76e029..2ff72c8 100644
|
|
--- a/src/waffle/CMakeLists.txt
|
|
+++ b/src/waffle/CMakeLists.txt
|
|
@@ -5,6 +5,14 @@
|
|
add_definitions(
|
|
-DWAFFLE_API_VERSION=${waffle_api_version}
|
|
-DWAFFLE_API_EXPERIMENTAL
|
|
+ ${egl_CFLAGS}
|
|
+ ${gbm_CFLAGS}
|
|
+ ${gl_CFLAGS}
|
|
+ ${GLEXT_CFLAGS}
|
|
+ ${libudev_CFLAGS}
|
|
+ ${wayland-client_CFLAGS}
|
|
+ ${wayland-egl_CFLAGS}
|
|
+ ${x11-xcb_CFLAGS}
|
|
)
|
|
|
|
include_directories(
|
|
--
|
|
2.14.3
|
|
|