[PATCH wayland v4] scanner: add a new --include-core-only option

Bill Spitzak spitzak at gmail.com
Wed Apr 29 11:11:48 PDT 2015

Forcing --include-core-only on in wayland-scanner, the attached patch 
makes Weston compile. This involved adding two wayland-client-protocol.h 

IMHO it is better to require this small bit of editing than to continue 
to include a header with the comment "Use of this header file is 
discouraged" inside required header files.

A more complete patch would be to eradicate use of wayland-client.h 
everywhere. In most cases it is replaced with wayland-client-protocol.h 
though it should be checked when wayland-client-core.h works.
-------------- next part --------------
diff --git a/clients/ivi-shell-user-interface.c b/clients/ivi-shell-user-interface.c
index a83f9ad..031e9a9 100644
--- a/clients/ivi-shell-user-interface.c
+++ b/clients/ivi-shell-user-interface.c
@@ -37,6 +37,7 @@
 #include "../shared/os-compatibility.h"
 #include "ivi-application-client-protocol.h"
 #include "ivi-hmi-controller-client-protocol.h"
+#include "wayland-client-protocol.h"
  * A reference implementation how to use ivi-hmi-controller interface to
diff --git a/tests/weston-test-client-helper.h b/tests/weston-test-client-helper.h
index 8635471..5284b68 100644
--- a/tests/weston-test-client-helper.h
+++ b/tests/weston-test-client-helper.h
@@ -29,6 +29,7 @@
 #include <stdbool.h>
 #include "weston-test-runner.h"
 #include "weston-test-client-protocol.h"
+#include "wayland-client-protocol.h"
 struct client {
 	struct wl_display *wl_display;

More information about the wayland-devel mailing list