From 9d008ac3c00a0fe2330005e238b1236eb36119b9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Mar 2016 16:26:32 +0200 Subject: wayland: upstream now supports nativesdk build Change-Id: I92cc3c447e4f8d1da987ca49f996e939c81dc69c Reviewed-by: Teemu Holappa --- ...wayland-scanner-when-building-nativesdk-w.patch | 25 ----------------- recipes/wayland/wayland_1.%.bbappend | 31 ---------------------- 2 files changed, 56 deletions(-) delete mode 100644 recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch delete mode 100644 recipes/wayland/wayland_1.%.bbappend 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 deleted file mode 100644 index 9e5fe4d..0000000 --- a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 ---- - 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/recipes/wayland/wayland_1.%.bbappend b/recipes/wayland/wayland_1.%.bbappend deleted file mode 100644 index 4497942..0000000 --- a/recipes/wayland/wayland_1.%.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -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 \ - " - -EXTRA_OECONF_class-nativesdk = "--disable-documentation --enable-scanner" -DEPENDS_class-nativesdk = "libffi-nativesdk wayland-native" - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf