From d5bdc310ef22ebbe336d5b0f8cbd12aeff94be9b Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 24 Sep 2014 10:50:59 +0200 Subject: Add Wayland and Weston into the iMX6 images weston-examples may get removed later on, for now they are necessary for testing and development. Change-Id: I0bbb1d9d66045d8844f07d8e0bca9d7fc19251c3 Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 4 +-- conf/distro/include/imx6qsabresd.conf | 6 ++++ conf/distro/include/nitrogen6x.conf | 6 ++++ ...dk-packagegroup-b2qt-embedded-toolchain-host.bb | 1 + ...wayland-scanner-when-building-nativesdk-w.patch | 27 ++++++++++++++++++ recipes/wayland/wayland_1.4.0.bbappend | 32 ++++++++++++++++++++++ 6 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch create mode 100644 recipes/wayland/wayland_1.4.0.bbappend diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 8819c93..679d768 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -35,8 +35,6 @@ SANITY_TESTED_DISTROS += " \ LinuxMint-16 \n \ " -include conf/distro/include/${MACHINE}.conf - SYSVINIT_ENABLED_GETTYS = "" DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs" @@ -50,3 +48,5 @@ MACHINE_EXTRA_INSTALL ?= "" LICENSE_CREATE_PACKAGE = "1" COPY_LIC_MANIFEST = "1" + +include conf/distro/include/${MACHINE}.conf diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 5a19c07..7ee426e 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -34,11 +34,16 @@ BOOTFS_DEPENDS = "u-boot:do_deploy" PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" +DISTRO_FEATURES_DEFAULT += "wayland" + MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ gst-fsl-plugin \ + wayland \ + weston \ + weston-examples \ " MACHINE_EXTRA_INSTALL_SDK = " \ @@ -47,6 +52,7 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libegl-mx6-dev \ libgles2-mx6 \ libgles2-mx6-dev \ + libwayland-egl-mx6-dev \ " ADB_PRODUCTID = "0x0000" diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 0907f93..65c7b14 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -37,11 +37,16 @@ EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" +DISTRO_FEATURES_DEFAULT += "wayland" + MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ gst-fsl-plugin \ + wayland \ + weston \ + weston-examples \ " MACHINE_EXTRA_INSTALL_SDK = " \ @@ -50,6 +55,7 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libegl-mx6-dev \ libgles2-mx6 \ libgles2-mx6-dev \ + libwayland-egl-mx6-dev \ " ADB_PRODUCTID = "0x0d02" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 281204c..b29aa36 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -34,6 +34,7 @@ RDEPENDS_${PN} = "\ python-multiprocessing-nativesdk \ python-shell-nativesdk \ python-threading-nativesdk \ + wayland-nativesdk \ " 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 new file mode 100644 index 0000000..2a691a1 --- /dev/null +++ b/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch @@ -0,0 +1,27 @@ +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 + + if ENABLE_SCANNER +-wayland_scanner = $(top_builddir)/src/wayland-scanner ++wayland_scanner = wayland-scanner + else + wayland_scanner = wayland-scanner + endif +-- +1.8.3.2 + diff --git a/recipes/wayland/wayland_1.4.0.bbappend b/recipes/wayland/wayland_1.4.0.bbappend new file mode 100644 index 0000000..ed064bc --- /dev/null +++ b/recipes/wayland/wayland_1.4.0.bbappend @@ -0,0 +1,32 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append_class-nativesdk = " file://just-scanner.patch \ + 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 = "wayland-native" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf