[meta-fsl-demos][PATCH v3 1/6] fsl-gpu-sdk: Use wayland backend whenever it is availiable

[meta-fsl-demos][PATCH v3 1/6] fsl-gpu-sdk: Use wayland backend whenever it is availiable

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy@freescale.com>

When X11 and Wayland DISTRO_FEATURES are available, fsl-gpu-sdk ought to use Wayland.

Wayland backend is preferred as in this case we will be using X11 on top of Wayland (XWayland).

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>
---
 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb
index 01d2103..f794375 100644
--- a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb
+++ b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_2.1.bb
@@ -22,8 +22,9 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 SRC_URI[md5sum] = "8f656b8a3a7b7390f434ec1cebf66334"
 SRC_URI[sha256sum] = "eccfd6f412c256e92e61d811cbe607e77bdfd13e268f4840b819e32dcd92921e"
 
-BACKEND = "${@base_contains('DISTRO_FEATURES', 'x11', 'X11', \
-                    base_contains('DISTRO_FEATURES', 'wayland', 'Wayland', 'FB', d), d)}"
+BACKEND = "${@base_contains('DISTRO_FEATURES', 'wayland', 'Wayland', \
+                base_contains('DISTRO_FEATURES', 'x11', 'X11', 'FB', d), d)}"
+
 do_compile () {
     export FSL_GRAPHICS_SDK=${S}
     export FSL_PLATFORM_NAME=Yocto
-- 
2.1.4

[meta-fsl-demos][PATCH v3 2/6] packagegroup-fsl-tools-gpu-external: Use wayland packages for xwayland backend

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy@freescale.com>

Install wayland packages when both X11 and wayland DISTRO_FEATURES are availiable
as we will be using x11 on top of wayland (XWayland).

- Add mesa-demos package for wayland backend.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>
---
 .../packagegroups/packagegroup-fsl-tools-gpu-external.bb      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
index dc425cc..aa61cff 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -29,14 +29,15 @@ SOC_GPU_TOOLS_FB_mx6dl = "eglinfo-fb"
 SOC_GPU_TOOLS_FB_mx6sx = "eglinfo-fb"
 
 SOC_GPU_TOOLS_WAYLAND = ""
-SOC_GPU_TOOLS_WAYLAND_mx6q  = "glmark2"
-SOC_GPU_TOOLS_WAYLAND_mx6dl = "glmark2"
-SOC_GPU_TOOLS_WAYLAND_mx6sx = "glmark2"
+SOC_GPU_TOOLS_WAYLAND_mx6q  = "glmark2 mesa-demos"
+SOC_GPU_TOOLS_WAYLAND_mx6dl = "glmark2 mesa-demos"
+SOC_GPU_TOOLS_WAYLAND_mx6sx = "glmark2 mesa-demos"
+SOC_GPU_TOOLS_WAYLAND_mx6sl = "mesa-demos"
 
 RDEPENDS_${PN} = " \
     opencv-apps \
     opencv-samples \
-    ${@base_contains("DISTRO_FEATURES", "x11", "${SOC_GPU_TOOLS_X11}", \
-        base_contains("DISTRO_FEATURES", "wayland", "${SOC_GPU_TOOLS_WAYLAND}", \
+    ${@base_contains('DISTRO_FEATURES', "wayland", "${SOC_GPU_TOOLS_WAYLAND}", \
+        base_contains("DISTRO_FEATURES", "x11", "${SOC_GPU_TOOLS_X11}", \
                  "${SOC_GPU_TOOLS_FB}", d), d)} \
 "
-- 
2.1.4

[meta-fsl-demos][PATCH v3 3/6] packagegroup-fsl-tools-gpu: Do no add xserver-xorg-extension-viv-autohdmi for xwayland

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy@freescale.com>

When both x11 and wayland DISTRO_FEATURES are availiable, install wayland packages as
we will be using x11 on top of wayland (xwayland).

xserver-xorg-extension-viv-autohdmi is a x11 package and do not install it for xwayland.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>
---
 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
index 71df6e0..c4912e3 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -20,7 +20,7 @@ SOC_TOOLS_GPU_IMX6QDLSX = " \
     imx-gpu-viv-tools \
     imx-gpu-viv-tools-apitrace \
     ${@base_contains('DISTRO_FEATURES', 'x11', \
-                     'xserver-xorg-extension-viv-autohdmi', '', d)} \
+           base_contains('DISTRO_FEATURES', 'wayland', '', 'xserver-xorg-extension-viv-autohdmi', d), '', d)} \
 "
 SOC_TOOLS_GPU_mx6q  = "${SOC_TOOLS_GPU_IMX6QDLSX}"
 SOC_TOOLS_GPU_mx6dl = "${SOC_TOOLS_GPU_IMX6QDLSX}"
@@ -33,7 +33,7 @@ SOC_TOOLS_GPU_mx6sl = " \
     imx-gpu-viv-g2d \
     imx-gpu-viv-tools \
     ${@base_contains('DISTRO_FEATURES', 'x11', \
-                     'xserver-xorg-extension-viv-autohdmi', '', d)} \
+           base_contains('DISTRO_FEATURES', 'wayland', '', 'xserver-xorg-extension-viv-autohdmi', d), '', d)} \
 "
 
 RDEPENDS_${PN} = " \
-- 
2.1.4

[meta-fsl-demos][PATCH v3 4/6] fsl-image-machine-test: Install weston-init for xwayland backend

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy@freescale.com>

Install wayland packages when both X11 and Wayland DISTRO_FEATURES are availiable
as we will be using x11 on top of wayland(xwayland)

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>
---
 recipes-fsl/images/fsl-image-machine-test.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb
index 3d8ea12..54abdb4 100644
--- a/recipes-fsl/images/fsl-image-machine-test.bb
+++ b/recipes-fsl/images/fsl-image-machine-test.bb
@@ -20,7 +20,5 @@ CORE_IMAGE_EXTRA_INSTALL += " \
     packagegroup-fsl-tools-gpu-external \
     packagegroup-fsl-tools-testapps \
     packagegroup-fsl-tools-benchmark \
-    ${@base_contains('DISTRO_FEATURES', 'x11', '', \
-                      base_contains('DISTRO_FEATURES', 'wayland', 'weston-init', \
-                                    '', d), d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wayland', 'weston-init', '', d)} \
 "
-- 
2.1.4

[meta-fsl-demos][PATCH v3 5/6] packagegroup-core-x11-base: Remove matchbox packages for xwayland

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy@freescale.com>

Do not install x11 packages when both x11 and wayland DISTRO_FEATURES are availiable.
Wayland backend is preferred as we will be using X11 on top of Wayland (XWayland).

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>
---
 recipes-fsl/packagegroups/packagegroup-core-x11-base.bbappend | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 recipes-fsl/packagegroups/packagegroup-core-x11-base.bbappend

diff --git a/recipes-fsl/packagegroups/packagegroup-core-x11-base.bbappend b/recipes-fsl/packagegroups/packagegroup-core-x11-base.bbappend
new file mode 100644
index 0000000..adcf4b7
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-core-x11-base.bbappend
@@ -0,0 +1,5 @@
+
+# Remove matchbox for xwayland
+matchbox = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'matchbox-terminal matchbox-wm', '', d)}"
+
+RDEPENDS_${PN}_remove = "${matchbox}"
-- 
2.1.4

[meta-fsl-demos][PATCH v3 6/6] packagegroup-core-x11-sato: Remove matchbox packages for xwayland.

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy@freescale.com>

Do not install x11 packages when both x11 and wayland DISTRO_FEATURES are availiable.
Wayland backend is preferred as we are using X11 on top of Wayland (XWayland).

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>
---
 recipes-fsl/packagegroups/packagegroup-core-x11-sato.bbappend | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 recipes-fsl/packagegroups/packagegroup-core-x11-sato.bbappend

diff --git a/recipes-fsl/packagegroups/packagegroup-core-x11-sato.bbappend b/recipes-fsl/packagegroups/packagegroup-core-x11-sato.bbappend
new file mode 100644
index 0000000..a6e8954
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-core-x11-sato.bbappend
@@ -0,0 +1,8 @@
+
+
+matchbox-base = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', ' \
+                                         matchbox-desktop matchbox-session-sato  matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im matchbox-config-gtk', '', d)}"
+matchbox-apps = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'matchbox-terminal', '', d)}"
+
+RDEPENDS_${PN}-base_remove = "${matchbox-base}"
+RDEPENDS_${PN}-apps_remove = "${matchbox-apps}"
-- 
2.1.4

Re: [meta-fsl-demos][PATCH v3 5/6] packagegroup-core-x11-base: Remove matchbox packages for xwayland

[Otavio Salvador]

On Wed, Nov 25, 2015 at 8:12 PM, Tom Hochstein
<tom.hochstein@freescale.com> wrote:
> From: Neena Busireddy <neena.busireddy@freescale.com>
>
> Do not install x11 packages when both x11 and wayland DISTRO_FEATURES are availiable.
> Wayland backend is preferred as we will be using X11 on top of Wayland (XWayland).
>
> Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
> Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>

This should be discussed at OE-Core mailing list as it will support
XWayland and we ought to have an unified design on how to implement
it.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-freescale] [meta-fsl-demos][PATCH v3 5/6] packagegroup-core-x11-base: Remove matchbox packages for xwayland

[Otavio Salvador]

On Wed, Nov 25, 2015 at 8:12 PM, Tom Hochstein
<tom.hochstein@freescale.com> wrote:
> From: Neena Busireddy <neena.busireddy@freescale.com>
>
> Do not install x11 packages when both x11 and wayland DISTRO_FEATURES are availiable.
> Wayland backend is preferred as we will be using X11 on top of Wayland (XWayland).
>
> Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
> Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>

This should be discussed at OE-Core mailing list as it will support
XWayland and we ought to have an unified design on how to implement
it.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750