[OE-core] [PATCH] wayland: add nativesdk support

[Samuli Piippo]

Allow building wayland-scanner for nativesdk. Extra patch required
to use the scanner from wayland-native during the build.

Signed-off-by: Samuli Piippo <samuli.piippo at theqtcompany.com>
---
 .../always-use-wayland-scanner-from-system.patch   | 25 ++++++++++++++++++++++
 meta/recipes-graphics/wayland/wayland_1.6.0.bb     |  8 ++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/wayland/wayland/always-use-wayland-scanner-from-system.patch

diff --git a/meta/recipes-graphics/wayland/wayland/always-use-wayland-scanner-from-system.patch b/meta/recipes-graphics/wayland/wayland/always-use-wayland-scanner-from-system.patch
new file mode 100644
index 0000000..9e5fe4d
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/always-use-wayland-scanner-from-system.patch
@@ -0,0 +1,25 @@
+The wayland-scanner built for the nativesdk cannot be run during the build,
+so instead use the wayland-scanner from native build.
+
+Upstream-Status: Pending
+
+Signed-off-by: Samuli Piippo <samuli.piippo at theqtcompany.com>
+---
+ Makefile.am | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+diff --git a/Makefile.am b/Makefile.am
+index c15d8b8..45f7133 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -62,7 +62,7 @@ nodist_libwayland_client_la_SOURCES =         \
+ pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
+ 
+ if ENABLE_SCANNER
+-wayland_scanner = $(top_builddir)/wayland-scanner
++wayland_scanner = wayland-scanner
+ bin_PROGRAMS = wayland-scanner
+ wayland_scanner_SOURCES = src/scanner.c
+ wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
+-- 
+1.9.1
+
diff --git a/meta/recipes-graphics/wayland/wayland_1.6.0.bb b/meta/recipes-graphics/wayland/wayland_1.6.0.bb
index cf3c094..5c9832e 100644
--- a/meta/recipes-graphics/wayland/wayland_1.6.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.6.0.bb
@@ -16,14 +16,20 @@ SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86b
 SRC_URI_append_class-native = " \
     file://disable-macro-checks-not-used-for-scanner.patch \
     "
+SRC_URI_append_class-nativesdk = " \
+    file://disable-macro-checks-not-used-for-scanner.patch \
+    file://always-use-wayland-scanner-from-system.patch \
+    "
 EXTRA_OECONF_class-native = "--disable-documentation --enable-scanner"
+EXTRA_OECONF_class-nativesdk = "--disable-documentation --enable-scanner"
 
 inherit autotools pkgconfig
 
 # We need wayland-native for the wayland-scanner utility
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 
 DEPENDS_class-native = "expat-native libffi-native"
+DEPENDS_class-nativesdk = "nativesdk-expat nativesdk-libffi wayland-native"
 DEPENDS = "expat libffi wayland-native"
 
 EXTRA_OECONF = "--disable-documentation --disable-scanner"
-- 
1.9.1