0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001
  2. From: Romain Naour <romain.naour@gmail.com>
  3. Date: Sun, 24 Dec 2017 00:11:45 +0100
  4. Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags
  5. When building mesa egl without x11 and gles2 the headers need a
  6. EGL_NO_X11 define to avoid including X11 headers.
  7. This define EGL_NO_X11 is lost while building waffle
  8. since CFLAGS defined by pc files are not used.
  9. EGL_NO_X11 is defined in CFLAGS from egl.pc.
  10. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  11. [Upstream status:
  12. https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/111]
  13. ---
  14. src/waffle/CMakeLists.txt | 8 ++++++++
  15. 1 file changed, 8 insertions(+)
  16. diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
  17. index d76e029..2ff72c8 100644
  18. --- a/src/waffle/CMakeLists.txt
  19. +++ b/src/waffle/CMakeLists.txt
  20. @@ -5,6 +5,14 @@
  21. add_definitions(
  22. -DWAFFLE_API_VERSION=${waffle_api_version}
  23. -DWAFFLE_API_EXPERIMENTAL
  24. + ${egl_CFLAGS}
  25. + ${gbm_CFLAGS}
  26. + ${gl_CFLAGS}
  27. + ${GLEXT_CFLAGS}
  28. + ${libudev_CFLAGS}
  29. + ${wayland-client_CFLAGS}
  30. + ${wayland-egl_CFLAGS}
  31. + ${x11-xcb_CFLAGS}
  32. )
  33. include_directories(
  34. --
  35. 2.14.3