From ab21133ac95bb50eb2a0a0954d5a8003d9430251 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:39:00 +0200 Subject: wayland: updated patch to support nativesdk Change-Id: I37e305c5d592290d4dff8dd14e1bd224d72be621 Reviewed-by: Andy Nichols --- ...wayland-scanner-when-building-nativesdk-w.patch | 36 ++++++++++------------ recipes/wayland/wayland_1.%.bbappend | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) (limited to 'recipes/wayland') diff --git a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch b/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch index 2a691a1..9e5fe4d 100644 --- a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch +++ b/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch @@ -1,27 +1,25 @@ -From a9ab89496d32ab42d9f697c43cf8bb04feaeabfa Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 26 Sep 2014 10:39:51 +0300 -Subject: [PATCH] Use native wayland-scanner when building nativesdk-wayland - The wayland-scanner built for the nativesdk cannot be run during the build, so instead use the wayland-scanner from native build. ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/Makefile.am b/src/Makefile.am -index b938d17..84fcdf6 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -41,7 +41,7 @@ AM_CFLAGS = $(GCC_CFLAGS) -pthread - protocoldir = $(top_srcdir)/protocol +Upstream-Status: Pending + +Signed-off-by: Samuli Piippo +--- + 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)/src/wayland-scanner +-wayland_scanner = $(top_builddir)/wayland-scanner +wayland_scanner = wayland-scanner - else - wayland_scanner = wayland-scanner - endif + bin_PROGRAMS = wayland-scanner + wayland_scanner_SOURCES = src/scanner.c + wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la -- -1.8.3.2 +1.9.1 diff --git a/recipes/wayland/wayland_1.%.bbappend b/recipes/wayland/wayland_1.%.bbappend index 8df7524..f61301d 100644 --- a/recipes/wayland/wayland_1.%.bbappend +++ b/recipes/wayland/wayland_1.%.bbappend @@ -21,7 +21,7 @@ ############################################################################# FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_class-nativesdk = " file://just-scanner.patch \ +SRC_URI_append_class-nativesdk = " \ file://disable-macro-checks-not-used-for-scanner.patch \ file://0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch \ " -- cgit v1.2.3-54-g00ecf