[meta-fsl-arm PATCH v2 0/15] master-next pending updates

[meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Otavio Salvador]

Hello,

This patchset includes:

* update the GPU, kernel for the 3.0.35-4.0.0 BSP (meta-fsl-arm and
  meta-fsl-arm-extra)
* Jeremy's update of linux-boundary (meta-fsl-arm-extra)
* mesa and mesa-demos rework for building with Vivante GPU (meta-fsl-arm)
* Eric's AMD GPU and the Qt5 patches (meta-fsl-arm)

I've pushed these patches for master-next so it easy testing.

meta-fsl-arm
------------

The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be applied
on Monday; the other patches still need work and won't be applied now.

Known issues
------------

* non-fullscreen acceleration broken (as 3.0.35-1.1.0 and 3.0.35-3.0.0
  releases)

meta-fsl-arm-extra
------------------

From initial v1 patchset, we fixed the segfault in the Wandboard
boards but these patches are still waiting to be applied in Wandboard
tree. As a workaround I did a temporary change to use linux-mainline
(from github) to grab these patches and will later rework the fixes to
be applied on the recipe.

Regards,

-- 
1.8.1

[meta-fsl-arm PATCH v2 01/15] firmware-imx: Remove Atheros firmware

[Otavio Salvador]

The linux-firmware already provide the Atheros firmware so we should
use it and avoid duplication.

Change-Id: I5e8675612916ab20ae27e63aedba6758e9a17afb
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/imx53ard.conf                | 4 ++--
 conf/machine/imx53qsb.conf                | 4 ++--
 recipes-bsp/firmware-imx/firmware-imx.inc | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index 63048f7..5e6137c 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -12,6 +12,6 @@ KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts"
 
 UBOOT_MACHINE = "mx53ard_config"
 
-MACHINE_FIRMWARE += "firmware-imx-ar3k \
-                     firmware-imx-ath6k"
+MACHINE_FIRMWARE += "linux-firmware-ar3k \
+                     linux-firmware-ath6k"
 MACHINE_FEATURES += "wifi bluetooth"
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 3114688..ca84243 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -12,6 +12,6 @@ KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
 
 UBOOT_MACHINE = "mx53loco_config"
 
-MACHINE_FIRMWARE += "firmware-imx-ar3k \
-                     firmware-imx-ath6k"
+MACHINE_FIRMWARE = "linux-firmware-ar3k \
+                     linux-firmware-ath6k"
 MACHINE_FEATURES += " wifi bluetooth"
diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc
index f321617..43bdf2f 100644
--- a/recipes-bsp/firmware-imx/firmware-imx.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx.inc
@@ -19,12 +19,10 @@ do_install() {
     find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';'
     rm ${D}/lib/firmware/LICENCE.atheros_firmware \
        ${D}/lib/firmware/README
-}
-
-PACKAGES += "${PN}-ath6k ${PN}-ar3k"
 
-FILES_${PN}-ath6k = "/lib/firmware/ath6k/*"
-FILES_${PN}-ar3k  = "/lib/firmware/ar3k/*"
+    # FIXME: Remove firmware packaged in linux-firmware
+    rm -r ${D}/lib/firmware/ath6k ${D}/lib/firmware/ar3k
+}
 
 python populate_packages_prepend() {
     vpudir = bb.data.expand('/lib/firmware/vpu', d)
-- 
1.8.1

[meta-fsl-arm PATCH v2 02/15] linux-fslc: Update to 2013-06-05 patches-3.9's snapshot

[Otavio Salvador]

The includes following changes:

* Merge v3.9.4 stable release
* ASoC: pcm: Require both CODEC and CPU support when declaring stream caps
* ASoC: mxs: mxs-saif: Split mxs_saif_dai into two elements
* ARM: mxs: Pass the system revision
* ARM: mxs: Print silicon version on boot
* ARM: dt: Use the 'model' field for printing the hardware revision

Change-Id: Icc919e04a44f47db09e0e1266e971c3bb23ff2bd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-kernel/linux/linux-fslc_3.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-fslc_3.9.bb b/recipes-kernel/linux/linux-fslc_3.9.bb
index e3ee311..86acc75 100644
--- a/recipes-kernel/linux/linux-fslc_3.9.bb
+++ b/recipes-kernel/linux/linux-fslc_3.9.bb
@@ -6,6 +6,6 @@ include linux-fslc.inc
 PV = "3.9+git${SRCPV}"
 
 # patches-3.9
-SRCREV = "10bc2b6b466ab890c3e7a6623d13b7dbea788ce4"
+SRCREV = "e73478d010918d25986923c0b18a9805d13182f4"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
1.8.1

[meta-fsl-arm PATCH v2 03/15] u-boot-imx: Update i.MX6 variants to 3.0.35-4.0.0

[Otavio Salvador]

The 4.0.0 version supports all i.MX6 variants so we can use a single
revision for them all.

Change-Id: I6a2ea90b1609a696c6f40a296e2e6612b14d40d9
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/u-boot/u-boot-imx_2009.08.bb | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
index b2111fc..8460399 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Freescale Semiconductor
+# Copyright (C) 2011-2013 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "bootloader for imx platforms"
@@ -22,22 +22,12 @@ SRC_URI_append_imx5 = " \
            file://mx53_loco_bootenv.patch \
 "
 
-# Revision of imx_3.0.35_1.1.0 branch
-SRCREV_mx6 = "98a5299c945cb7e440e3c3d9c572f017e5a02ede"
+# Revision of imx_3.0.35_4.0.0 branch
+SRCREV_mx6 = "5899674bf39544bec47e209649a723cf7348d3ba"
 SRC_URI_append_mx6 = " \
    file://mx6q_sabreauto-Fix-the-patch-for-the-default-environ.patch \
    file://mx6q_sabresd-Change-default-environment-to-work-with.patch \
-"
-
-# Revision of imx_3.0.35_12.10.02 branch
-SRCREV_mx6sl = "27cdce50f9a7fc30d7cff067b420a32e5f2c5959"
-SRC_URI_append_mx6sl = " \
    file://mx6sl_evk-Fix-the-patch-for-the-default-environment-.patch \
-"
-
-# Revision of imx_3.0.35_3.0.0 branch
-SRCREV_mx6dl = "d4057eba315edbc8335c138c0c9edbe2109ea36e"
-SRC_URI_append_mx6dl = " \
    file://mx6dl_sabresd-Change-default-environment-to-work-wit.patch \
 "
 
-- 
1.8.1

[meta-fsl-arm PATCH v2 04/15] linux-imx (3.0.35) Update to 3.0.35-4.0.0 BSP version

[Otavio Salvador]

The 4.0.0 version supports all i.MX6 variants so we can use a single
revision for them all.

The eGalax' support for single touch events and the perf build fix are
fixed in Freescale tree, so we drop these patches on this version.

Change-Id: Iaec598dd69a3107c09d20e3e890c46d0922d4e44
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...s-Add-support-for-single-touch-in-Kconfig.patch | 68 ----------------------
 .../linux/linux-imx/fix_getrusage_for_perf.patch   | 33 -----------
 recipes-kernel/linux/linux-imx_3.0.35.bb           | 20 ++-----
 3 files changed, 4 insertions(+), 117 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch
 delete mode 100644 recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch

diff --git a/recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch b/recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch
deleted file mode 100644
index 33a8393..0000000
--- a/recipes-kernel/linux/linux-imx/egalax_ts-Add-support-for-single-touch-in-Kconfig.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From f6b560538edca833481c1d67ecf3cfe2d65c4018 Mon Sep 17 00:00:00 2001
-From: Eric Nelson <eric.nelson@boundarydevices.com>
-Date: Wed, 29 Aug 2012 21:50:30 -0700
-Subject: [PATCH] egalax_ts: Add support for single-touch in Kconfig
-
-Upstream-Status: Pending
----
- drivers/input/touchscreen/Kconfig     |   10 ++++++++++
- drivers/input/touchscreen/egalax_ts.c |    7 ++++---
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
-index c00ab79..311bd4d 100644
---- a/drivers/input/touchscreen/Kconfig
-+++ b/drivers/input/touchscreen/Kconfig
-@@ -199,6 +199,16 @@ config TOUCHSCREEN_ELAN
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called elan-touch.
- 
-+config TOUCHSCREEN_EGALAX_SINGLE_TOUCH
-+	bool "EETI eGalax touchscreen as single-touch"
-+	default N
-+	depends on TOUCHSCREEN_EGALAX
-+	help
-+	  If you say yes here you get single-touch touchscreen support
-+	  on the eGalax I2C controller.
-+	  If you say "no", you'll get the normal multi-touch.
-+
-+
- config TOUCHSCREEN_FUJITSU
- 	tristate "Fujitsu serial touchscreen"
- 	select SERIO
-diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
-index fff8afe..0b6cde7 100644
---- a/drivers/input/touchscreen/egalax_ts.c
-+++ b/drivers/input/touchscreen/egalax_ts.c
-@@ -139,7 +139,7 @@ retry:
- 		events[id].x = x;
- 		events[id].y = y;
- 
--#ifdef FORCE_SINGLE_POINTER_SUPPORT
-+#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH
- 		input_report_abs(input_dev, ABS_X, x);
- 		input_report_abs(input_dev, ABS_Y, y);
- 		input_event(data->input_dev, EV_KEY, BTN_TOUCH, 1);
-@@ -166,7 +166,7 @@ retry:
- 		dev_dbg(&client->dev, "release id:%d\n", id);
- 		events[id].valid = 0;
- 		events[id].status = 0;
--#ifdef FORCE_SINGLE_POINTER_SUPPORT
-+#ifdef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH
- 		input_report_key(input_dev, BTN_TOUCH, 0);
- 		input_report_abs(input_dev, ABS_PRESSURE, 0);
- #else
-@@ -256,8 +256,9 @@ static int __devinit egalax_ts_probe(struct i2c_client *client,
- 	__set_bit(ABS_PRESSURE, input_dev->absbit);
- 	input_set_abs_params(input_dev, ABS_X, 0, 32767, 0, 0);
- 	input_set_abs_params(input_dev, ABS_Y, 0, 32767, 0, 0);
-+	input_set_abs_params(input_dev, ABS_PRESSURE, 0, 1, 0, 0);
- 
--#ifndef FORCE_SINGLE_POINTER_SUPPORT
-+#ifndef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH
- 	input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, 32767, 0, 0);
- 	input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, 32767, 0, 0);
- 	input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
--- 
-1.7.9.5
-
diff --git a/recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch b/recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch
deleted file mode 100644
index fb6a024..0000000
--- a/recipes-kernel/linux/linux-imx/fix_getrusage_for_perf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 7b78f13603c6fcb64e020a0bbe31a651ea2b657b
-Author: Markus Trippelsdorf <markus@trippelsdorf.de>
-Date:   Wed Apr 4 10:45:27 2012 +0200
-
-    perf tools: Fix getrusage() related build failure on glibc trunk
-    
-    On a system running glibc trunk perf doesn't build:
-    
-        CC builtin-sched.o
-    builtin-sched.c: In function ‘get_cpu_usage_nsec_parent’: builtin-sched.c:399:16: error: storage size of ‘ru’ isn’t known builtin-sched.c:403:2: error: implicit declaration of function ‘getrusage’ [-Werror=implicit-function-declaration]
-        [...]
-    
-    Fix it by including sys/resource.h.
-    
-    Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
-    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
-    Link: http://lkml.kernel.org/r/20120404084527.GA294@x4
-    Signed-off-by: Ingo Molnar <mingo@kernel.org>
-
-Upstream-Status: Backport [3.4]
-
-diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
-index fb8b5f8..1cad3af 100644
---- a/tools/perf/builtin-sched.c
-+++ b/tools/perf/builtin-sched.c
-@@ -17,6 +17,7 @@
- #include "util/debug.h"
- 
- #include <sys/prctl.h>
-+#include <sys/resource.h>
- 
- #include <semaphore.h>
- #include <pthread.h>
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
index 12e75cd..ce4bac3 100644
--- a/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 Freescale Semiconductor
+# Copyright (C) 2011-2013 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 include linux-imx.inc
@@ -7,18 +7,6 @@ PR = "${INC_PR}.14"
 
 COMPATIBLE_MACHINE = "(mx6)"
 
-# Revision of 1.1.0 branch
-SRCREV = "21304e170e6aa140d189158fcf27d731d3547969"
-LOCALVERSION = "-1.1.0+yocto"
-
-# Revision of 12.10.02 branch
-SRCREV_mx6sl = "741f7dcf5dd1b5ce82986eda139ddbce69c66e31"
-LOCALVERSION_mx6sl = "-12.10.02+yocto"
-
-# Revision of 3.0.0 branch
-SRCREV_mx6dl = "7e8c89cd4b47c4ac6ec6a91a5f54d450688bde4f"
-LOCALVERSION_mx6dl = "-3.0.0+yocto"
-
-SRC_URI += "file://fix_getrusage_for_perf.patch \
-            file://egalax_ts-Add-support-for-single-touch-in-Kconfig.patch \
-           "
+# Revision of 4.0.0 branch
+SRCREV = "572fd62b7e2d70ef83e2ca8fe9895fe6f1531f8a"
+LOCALVERSION = "-4.0.0+yocto"
-- 
1.8.1

[meta-fsl-arm PATCH v2 05/15] xf86-dri-vivante: Update to 3.0.35-4.0.0

[Otavio Salvador]

Change-Id: Idc86a2c70345a16b2eb77c4ce7c188a638c6b1fd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../{xf86-dri-vivante_1.1.0.bb => xf86-dri-vivante_3.0.35-4.0.0.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-graphics/xorg-driver/{xf86-dri-vivante_1.1.0.bb => xf86-dri-vivante_3.0.35-4.0.0.bb} (91%)

diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb b/recipes-graphics/xorg-driver/xf86-dri-vivante_3.0.35-4.0.0.bb
similarity index 91%
rename from recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
rename to recipes-graphics/xorg-driver/xf86-dri-vivante_3.0.35-4.0.0.bb
index 09bba2d..c116d57 100644
--- a/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
+++ b/recipes-graphics/xorg-driver/xf86-dri-vivante_3.0.35-4.0.0.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=1d0d59e1dc96f5197ea3a8b101bf1
 
 SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
            file://fix-libdrm-link.patch"
-SRC_URI[md5sum] = "d872365c046738628a7016343ffdb79a"
-SRC_URI[sha256sum] = "d53216d5f9e3f7803983ac1577d83985dfda33145e4711300f4ad5cbbe28e32d"
+SRC_URI[md5sum] = "5c5b5be029b077346610518bb729c012"
+SRC_URI[sha256sum] = "c67249e68d4233eb1d0a5f337ded8f121dc61fa26fca102a00f93acc3e37ea0f"
 
 PE = "1"
 PR = "r0"
-- 
1.8.1

[meta-fsl-arm PATCH v2 06/15] xf86-video-imxfb-vivante: Update to 3.0.35-4.0.0

[Otavio Salvador]

Change-Id: I5238f70533ba56d105fcad60e19f43832628cf63
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...fb-vivante_1.1.0.bb => xf86-video-imxfb-vivante_3.0.35-4.0.0.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_1.1.0.bb => xf86-video-imxfb-vivante_3.0.35-4.0.0.bb} (90%)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.0.35-4.0.0.bb
similarity index 90%
rename from recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
rename to recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.0.35-4.0.0.bb
index 36f56f2..dbaf2ab 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.0.35-4.0.0.bb
@@ -9,12 +9,12 @@ PR = "${INC_PR}.3"
 
 DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 gpu-viv-bin-mx6q"
 
-LIC_FILES_CHKSUM = "file://src/vivante_fbdev/vivante.h;endline=19;md5=93a322f91ec495569dcbcfbb2a95454a"
+LIC_FILES_CHKSUM = "file://src/vivante_fbdev/vivante.h;endline=19;md5=641ac6e6d013833e36290797f4d7089c"
 
 SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
            file://Makefile.am-remove-prefixed-include-path.patch"
-SRC_URI[md5sum] = "d872365c046738628a7016343ffdb79a"
-SRC_URI[sha256sum] = "d53216d5f9e3f7803983ac1577d83985dfda33145e4711300f4ad5cbbe28e32d"
+SRC_URI[md5sum] = "5c5b5be029b077346610518bb729c012"
+SRC_URI[sha256sum] = "c67249e68d4233eb1d0a5f337ded8f121dc61fa26fca102a00f93acc3e37ea0f"
 
 EXTRA_OECONF_armv7a = " --enable-neon --disable-static"
 CFLAGS += " -I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/drm"
-- 
1.8.1

[meta-fsl-arm PATCH v2 07/15] mesa: Drop libGL when building for i.MX6

[Otavio Salvador]

The Vivante GPU package provide a libGL library which we should use to
fully support the GPU features; so we drop the binary library from
mesa package.

Change-Id: I7e675e2fb6b9cf8600c7aa7fa961fc743bb051bc
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/mesa/mesa_9.0.2.bbappend | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes-graphics/mesa/mesa_9.0.2.bbappend b/recipes-graphics/mesa/mesa_9.0.2.bbappend
index 765e2f8..b0535a7 100644
--- a/recipes-graphics/mesa/mesa_9.0.2.bbappend
+++ b/recipes-graphics/mesa/mesa_9.0.2.bbappend
@@ -34,3 +34,8 @@ python __anonymous () {
         # We are now machine specific
         d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH'))
 }
+
+# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
+do_install_append_mx6 () {
+    rm ${D}${libdir}/libGL.*
+}
-- 
1.8.1

[meta-fsl-arm PATCH v2 08/15] mesa-demos: Fix building using Vivante libGL

[Otavio Salvador]

Vivante libGL does not provide the glWindowPos2iARB symbol, but
glWindowPos2i. Use this instead.

Change-Id: I8226fd54935bab2bbc9b2d9df92c0c18bf935186
Reported-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...glWindowPos2iARB-calls-with-glWindowPos2i.patch | 355 +++++++++++++++++++++
 recipes-graphics/mesa/mesa-demos_8.1.0.bbappend    |   3 +
 2 files changed, 358 insertions(+)
 create mode 100644 recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch
 create mode 100644 recipes-graphics/mesa/mesa-demos_8.1.0.bbappend

diff --git a/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch b/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch
new file mode 100644
index 0000000..d899540
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch
@@ -0,0 +1,355 @@
+From 757649a766f90e745f24df1d191caeef15c71399 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Tue, 4 Jun 2013 09:28:51 -0300
+Subject: [PATCH] Replace glWindowPos2iARB calls with glWindowPos2i
+
+Vivante libGL does not provide the glWindowPos2iARB symbol, but
+glWindowPos2i. Use this instead.
+
+Upstream-Status: Inapropriate [embedded specific]
+
+Reported-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ src/demos/copypix.c             |  4 ++--
+ src/demos/engine.c              |  2 +-
+ src/demos/fogcoord.c            |  4 ++--
+ src/glsl/shadow_sampler.c       |  2 +-
+ src/tests/auxbuffer.c           |  2 +-
+ src/tests/copypixrate.c         |  2 +-
+ src/tests/drawbuffers.c         |  2 +-
+ src/tests/drawbuffers2.c        |  2 +-
+ src/tests/fbotest1.c            |  2 +-
+ src/tests/fbotest2.c            |  4 ++--
+ src/tests/fbotest3.c            |  2 +-
+ src/tests/readrate.c            | 10 +++++-----
+ src/tests/viewmemory.c          |  2 +-
+ src/trivial/clear-fbo-scissor.c |  2 +-
+ src/trivial/clear-fbo-tex.c     |  2 +-
+ src/trivial/clear-fbo.c         |  2 +-
+ src/trivial/readpixels.c        |  2 +-
+ src/trivial/tri-fbo.c           |  2 +-
+ src/xdemos/glxsnoop.c           |  2 +-
+ src/xdemos/wincopy.c            |  4 ++--
+ 20 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/src/demos/copypix.c b/src/demos/copypix.c
+index 286c5a9..041b567 100644
+--- a/src/demos/copypix.c
++++ b/src/demos/copypix.c
+@@ -54,7 +54,7 @@ static void Display( void )
+    glClear( GL_COLOR_BUFFER_BIT );
+ 
+    /* draw original image */
+-   glWindowPos2iARB(dx, dy);                    
++   glWindowPos2i(dx, dy);                    
+    glDrawPixels(ImgWidth, ImgHeight, ImgFormat, GL_UNSIGNED_BYTE, Image);
+ 
+    if (Scissor)
+@@ -71,7 +71,7 @@ static void Display( void )
+ 
+    /* draw copy */
+    glPixelZoom(Xzoom, Yzoom);
+-   glWindowPos2iARB(Xpos, Ypos);
++   glWindowPos2i(Xpos, Ypos);
+    glCopyPixels(dx, dy, ImgWidth, ImgHeight, GL_COLOR);
+    glPixelZoom(1, 1);
+ 
+diff --git a/src/demos/engine.c b/src/demos/engine.c
+index 928fcbb..beace4c 100644
+--- a/src/demos/engine.c
++++ b/src/demos/engine.c
+@@ -971,7 +971,7 @@ Draw(void)
+       glDisable(GL_LIGHTING);
+       glDisable(GL_TEXTURE_2D);
+       glColor3f(1, 1 , 1);
+-      glWindowPos2iARB(10, 10);
++      glWindowPos2i(10, 10);
+       PrintString(s);
+       if (lit)
+ 	 glEnable(GL_LIGHTING);
+diff --git a/src/demos/fogcoord.c b/src/demos/fogcoord.c
+index 567eec0..e833009 100644
+--- a/src/demos/fogcoord.c
++++ b/src/demos/fogcoord.c
+@@ -68,14 +68,14 @@ PrintInfo(void)
+ 
+    sprintf(s, "Mode(m): %s  Start(s/S): %g  End(e/E): %g  Density(d/D): %g",
+            ModeStr, fogStart, fogEnd, fogDensity);
+-   glWindowPos2iARB(5, 20);
++   glWindowPos2i(5, 20);
+    PrintString(s);
+ 
+    sprintf(s, "Arrays(a): %s  glFogCoord(c): %s  EyeZ(z/z): %g",
+            (Arrays ? "Yes" : "No"),
+            (fogCoord ? "Yes" : "No"),
+            camz);
+-   glWindowPos2iARB(5, 5);
++   glWindowPos2i(5, 5);
+    PrintString(s);
+ }
+ 
+diff --git a/src/glsl/shadow_sampler.c b/src/glsl/shadow_sampler.c
+index b830030..eb82d8b 100644
+--- a/src/glsl/shadow_sampler.c
++++ b/src/glsl/shadow_sampler.c
+@@ -85,7 +85,7 @@ Redisplay(void)
+    glPopMatrix();
+ 
+    glUseProgram(0);
+-   glWindowPos2iARB(80, 20);
++   glWindowPos2i(80, 20);
+    PrintString("white   black   white   black");
+ 
+    {
+diff --git a/src/tests/auxbuffer.c b/src/tests/auxbuffer.c
+index 5fa399a..0cd5f47 100644
+--- a/src/tests/auxbuffer.c
++++ b/src/tests/auxbuffer.c
+@@ -419,7 +419,7 @@ event_loop(Display *dpy, Window win)
+       /* Copy aux buffer image to back color buffer */
+       glReadBuffer(GL_AUX0);
+       glDrawBuffer(GL_BACK);
+-      glWindowPos2iARB(0, 0);
++      glWindowPos2i(0, 0);
+       glDisable(GL_DEPTH_TEST);
+       glCopyPixels(0, 0, WinWidth, WinHeight, GL_COLOR);
+       glEnable(GL_DEPTH_TEST);
+diff --git a/src/tests/copypixrate.c b/src/tests/copypixrate.c
+index 2f64e0a..df1f9b0 100644
+--- a/src/tests/copypixrate.c
++++ b/src/tests/copypixrate.c
+@@ -91,7 +91,7 @@ BlitOne(void)
+    else
+ #endif
+    {
+-      glWindowPos2iARB(x, y);
++      glWindowPos2i(x, y);
+       glCopyPixels(0, 0, ImgWidth, ImgHeight, GL_COLOR);
+    }
+ }
+diff --git a/src/tests/drawbuffers.c b/src/tests/drawbuffers.c
+index fa2f8a7..cd5033f 100644
+--- a/src/tests/drawbuffers.c
++++ b/src/tests/drawbuffers.c
+@@ -88,7 +88,7 @@ Display(void)
+    glUseProgram(0);
+    glDisable(GL_DEPTH_TEST);
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+-   glWindowPos2iARB(0, 0);
++   glWindowPos2i(0, 0);
+    glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+ 
+    free(buffer);
+diff --git a/src/tests/drawbuffers2.c b/src/tests/drawbuffers2.c
+index 5bcf0b2..84d444b 100644
+--- a/src/tests/drawbuffers2.c
++++ b/src/tests/drawbuffers2.c
+@@ -112,7 +112,7 @@ Display(void)
+    glUseProgram(0);
+    glDisable(GL_DEPTH_TEST);
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+-   glWindowPos2iARB(0, 0);
++   glWindowPos2i(0, 0);
+    glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+ 
+    free(buffer);
+diff --git a/src/tests/fbotest1.c b/src/tests/fbotest1.c
+index 161903c..5930a6d 100644
+--- a/src/tests/fbotest1.c
++++ b/src/tests/fbotest1.c
+@@ -61,7 +61,7 @@ Display( void )
+ 
+    /* draw to window */
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+-   glWindowPos2iARB(0, 0);
++   glWindowPos2i(0, 0);
+    glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+ 
+    free(buffer);
+diff --git a/src/tests/fbotest2.c b/src/tests/fbotest2.c
+index 6ef7f12..11c867e 100644
+--- a/src/tests/fbotest2.c
++++ b/src/tests/fbotest2.c
+@@ -72,7 +72,7 @@ Display( void )
+ 
+       glDisable(GL_DEPTH_TEST);  /* in case window has depth buffer */
+ 
+-      glWindowPos2iARB(0, 0);
++      glWindowPos2i(0, 0);
+       glCopyPixels(0, 0, Width, Height, GL_COLOR);
+    }
+    else if (blitPix) {
+@@ -95,7 +95,7 @@ Display( void )
+       /* draw to window */
+       glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+       glDisable(GL_DEPTH_TEST);  /* in case window has depth buffer */
+-      glWindowPos2iARB(0, 0);
++      glWindowPos2i(0, 0);
+       glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+ 
+       free(buffer);
+diff --git a/src/tests/fbotest3.c b/src/tests/fbotest3.c
+index 19f684d..e6d7710 100644
+--- a/src/tests/fbotest3.c
++++ b/src/tests/fbotest3.c
+@@ -79,7 +79,7 @@ Display( void )
+    /* draw to window */
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+    glDisable(GL_DEPTH_TEST);  /* in case window has depth buffer */
+-   glWindowPos2iARB(0, 0);
++   glWindowPos2i(0, 0);
+    glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+ 
+    free(buffer);
+diff --git a/src/tests/readrate.c b/src/tests/readrate.c
+index 3859cf4..81eb8a3 100644
+--- a/src/tests/readrate.c
++++ b/src/tests/readrate.c
+@@ -85,7 +85,7 @@ MeasureFormat(struct format_type *fmt, GLint width, GLint height, GLuint pbo)
+       glEnd();
+ 
+ #if DRAW
+-      glWindowPos2iARB(0,0);
++      glWindowPos2i(0,0);
+       glDrawPixels(width, height,
+                    fmt->Format, fmt->Type, Buffer);
+       glFinish();
+@@ -137,21 +137,21 @@ Draw(void)
+ 
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ 
+-   glWindowPos2iARB(10, y);
++   glWindowPos2i(10, y);
+    sprintf(str, "ReadPixels size: %d x %d", width, height);
+    PrintString(str);
+    y -= 14;
+ 
+-   glWindowPos2iARB(10, y);
++   glWindowPos2i(10, y);
+    PrintString("Press up/down/left/right to change image size.");
+    y -= 14;
+ 
+-   glWindowPos2iARB(10, y);
++   glWindowPos2i(10, y);
+    PrintString("Press 'b' to run benchmark test.");
+    y -= 14;
+ 
+    if (Benchmark) {
+-      glWindowPos2iARB(10, y);
++      glWindowPos2i(10, y);
+       PrintString("Testing...");
+    }
+ 
+diff --git a/src/tests/viewmemory.c b/src/tests/viewmemory.c
+index 16044b9..3584c33 100644
+--- a/src/tests/viewmemory.c
++++ b/src/tests/viewmemory.c
+@@ -95,7 +95,7 @@ Draw(void)
+ 
+    glDisable(GL_TEXTURE_2D);
+    glColor3f(0, 1, 0);
+-   glWindowPos2iARB(10, 10);
++   glWindowPos2i(10, 10);
+    PrintString(s);
+ 
+    glutSwapBuffers();
+diff --git a/src/trivial/clear-fbo-scissor.c b/src/trivial/clear-fbo-scissor.c
+index a30935c..5c15200 100644
+--- a/src/trivial/clear-fbo-scissor.c
++++ b/src/trivial/clear-fbo-scissor.c
+@@ -182,7 +182,7 @@ Draw(void)
+ 
+       /* draw to window */
+       glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+-      glWindowPos2iARB(0, 0);
++      glWindowPos2i(0, 0);
+       glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+ 
+       free(buffer);
+diff --git a/src/trivial/clear-fbo-tex.c b/src/trivial/clear-fbo-tex.c
+index de84f98..f0fbdf6 100644
+--- a/src/trivial/clear-fbo-tex.c
++++ b/src/trivial/clear-fbo-tex.c
+@@ -140,7 +140,7 @@ static void Draw( void )
+       glClearColor(0.8, 0.8, 0, 0.0);
+       glClear(GL_COLOR_BUFFER_BIT);
+ 
+-      glWindowPos2iARB(30, 30);
++      glWindowPos2i(30, 30);
+       glDrawPixels(Width-60, Height-60, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+       
+       free(buffer);
+diff --git a/src/trivial/clear-fbo.c b/src/trivial/clear-fbo.c
+index 10d830b..3fee3e3 100644
+--- a/src/trivial/clear-fbo.c
++++ b/src/trivial/clear-fbo.c
+@@ -116,7 +116,7 @@ Draw(void)
+       glClearColor(0.8, 0.8, 0, 0.0);
+       glClear(GL_COLOR_BUFFER_BIT);
+ 
+-      glWindowPos2iARB(30, 30);
++      glWindowPos2i(30, 30);
+       glDrawPixels(Width-60, Height-60, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+       
+       free(buffer);
+diff --git a/src/trivial/readpixels.c b/src/trivial/readpixels.c
+index ccce4ed..74e0546 100644
+--- a/src/trivial/readpixels.c
++++ b/src/trivial/readpixels.c
+@@ -71,7 +71,7 @@ static void Draw(void)
+    printf("Pixel(0,0) = %f, %f, %f, %f\n",
+           image[0], image[1], image[2], image[3]);
+    /* draw to right half of window */
+-   glWindowPos2iARB(Width, 0);
++   glWindowPos2i(Width, 0);
+    glPixelZoom(Zoom, Zoom);
+    glDrawPixels(Width, Height, GL_RGBA, GL_FLOAT, image);
+    free(image);
+diff --git a/src/trivial/tri-fbo.c b/src/trivial/tri-fbo.c
+index d5800b2..dd1f21a 100644
+--- a/src/trivial/tri-fbo.c
++++ b/src/trivial/tri-fbo.c
+@@ -119,7 +119,7 @@ static void Draw( void )
+       glClearColor(0.8, 0.8, 0, 0.0);
+       glClear(GL_COLOR_BUFFER_BIT);
+ 
+-      glWindowPos2iARB(30, 30);
++      glWindowPos2i(30, 30);
+       glDrawPixels(Width-60, Height-60, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+       
+       
+diff --git a/src/xdemos/glxsnoop.c b/src/xdemos/glxsnoop.c
+index 2215cfd..13d2b2d 100644
+--- a/src/xdemos/glxsnoop.c
++++ b/src/xdemos/glxsnoop.c
+@@ -91,7 +91,7 @@ redraw(Display *dpy, Window srcWin, Window dstWin )
+    }
+ 
+    glXMakeCurrent(dpy, dstWin, Context);
+-   glWindowPos2iARB(0, 0);
++   glWindowPos2i(0, 0);
+    glDrawBuffer(GL_FRONT);
+    glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, image);
+    glFlush();
+diff --git a/src/xdemos/wincopy.c b/src/xdemos/wincopy.c
+index f670983..d010085 100644
+--- a/src/xdemos/wincopy.c
++++ b/src/xdemos/wincopy.c
+@@ -156,11 +156,11 @@ Redraw(void)
+    glClear(GL_COLOR_BUFFER_BIT);
+ 
+    if (TestClipping) {
+-      glWindowPos2iARB(-2, -2);
++      glWindowPos2i(-2, -2);
+       glCopyPixels(-2, -2, Width[0] + 4, Height[0] + 4, GL_COLOR);
+    }
+    else {
+-      glWindowPos2iARB(0, 0);
++      glWindowPos2i(0, 0);
+       glCopyPixels(0, 0, Width[0], Height[0], GL_COLOR);
+    }
+ 
+-- 
+1.8.1
+
diff --git a/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend b/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend
new file mode 100644
index 0000000..d68f8a1
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-demos_8.1.0.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch"
-- 
1.8.1

[meta-fsl-arm PATCH v2 09/15] gpu-viv-bin-mx6q: Update to 3.0.35-4.0.0 BSP release

[Otavio Salvador]

This includes a new libgl-mx6 package, besides the 3.0.35-4.0.0
release includes the GL library (without the headers) so we needed to
avoid the headers removal done before. The Wayland backend needs to be
removed as it will be supported in another GPU package so we added an
explicit FIXME note to keep it recorded.

Change-Id: I07f926b94f7dd31ce51dc03f676adc6d2a080b88
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc     | 12 ++++++++++--
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb             | 14 --------------
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb      | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 16 deletions(-)
 delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 97cebfd..cc82b45 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -5,7 +5,7 @@
 DESCRIPTION = "GPU driver and apps for imx6"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c831981a5cbb2673318b77fb2f07014c"
+LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
 PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2"
 
 INC_PR = "r5"
@@ -19,6 +19,7 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
           "
 
 PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
+	libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
 	libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
 	libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
 	libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
@@ -56,9 +57,13 @@ do_install () {
 
     cp ${S}/usr/lib/*.so ${D}${libdir}
     cp -axr ${S}/usr/include/* ${D}${includedir}
-    rm -r ${D}${includedir}/GL
     cp -axr ${S}/opt ${D}
 
+    # FIXME: Remove Wayland contents
+    rm -r ${D}${includedir}/wayland-viv
+    find ${D}${libdir} -name '*-wl.so' -exec rm '{}' ';'
+    rm ${D}${libdir}/*wayland*.so
+
     if [ "${USE_X11}" = "yes" ]; then
         cp -r ${S}/usr/lib/dri ${D}${libdir}
         find ${D}${libdir} -name '*-dfb.so' -exec rm '{}' ';'
@@ -114,6 +119,9 @@ FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
 FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}"
 FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
 
+FILES_libgl-mx6 = "${libdir}/libGL${SOLIBS}"
+FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
+
 FILES_libgles-mx6 = "${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
 FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV}"
 FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb
deleted file mode 100644
index 994c11c..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2012 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-PR = "${INC_PR}.0"
-PE = "1"
-
-include gpu-viv-bin-mx6q.inc
-
-SRC_URI[md5sum] = "60f4ba65f557fc63fde6dacfeef205a8"
-SRC_URI[sha256sum] = "4238b72a6dad2d075d159bb1e86fb68bbed7c27894ce82c546a8e7c58ae5d683"
-
-# FIXME: 1.1.0 BSP release uses DirectFB 1.4 and Yocto has 1.6 so
-# disable it for now
-USE_DFB = "no"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb
new file mode 100644
index 0000000..47390cf
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.0.35-4.0.0.bb
@@ -0,0 +1,14 @@
+# Copyright (C) 2012-2013 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+PR = "${INC_PR}.0"
+PE = "1"
+
+include gpu-viv-bin-mx6q.inc
+
+SRC_URI[md5sum] = "2bb7d2f4bdff79ae99ce0c9fc2540701"
+SRC_URI[sha256sum] = "48d04d11c6fec11411bcd97c47199caea517ebcd86db6c70f1964b3358a68924"
+
+# FIXME: 3.0.35-4.0.0 BSP release uses DirectFB 1.4 and Yocto has 1.6 so
+# disable it for now
+USE_DFB = "no"
-- 
1.8.1

[meta-fsl-arm PATCH v2 10/15] gpu-viv-bin-mx6q: Add pkg-config files

[Otavio Salvador]

From: Diego Rondini <diego.rondini@zoho.com>

Provide pkg-config files for egl, glesv1_cm and glesv2

Change-Id: Ie6d8c24d9415068927784a917ede644d87c283f7
Signed-off-by: Diego Rondini <diego.rondini@zoho.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc     | 14 +++++++++++---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc  | 12 ++++++++++++
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc         | 12 ++++++++++++
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc            | 12 ++++++++++++
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index cc82b45..e1f10b6 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -16,6 +16,9 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
            file://0001-change-header-path-to-HAL.patch \
            file://gc_hal_eglplatform-remove-xlib-undefs.patch \
            file://fix-conflicting-TLS-definition.patch \
+           file://egl.pc \
+           file://glesv1_cm.pc \
+           file://glesv2.pc \
           "
 
 PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
@@ -59,6 +62,11 @@ do_install () {
     cp -axr ${S}/usr/include/* ${D}${includedir}
     cp -axr ${S}/opt ${D}
 
+    install -d ${D}${libdir}/pkgconfig
+    install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/
+    install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/
+    install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/
+
     # FIXME: Remove Wayland contents
     rm -r ${D}${includedir}/wayland-viv
     find ${D}${libdir} -name '*-wl.so' -exec rm '{}' ';'
@@ -112,7 +120,7 @@ FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
 FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
 
 FILES_libegl-mx6 = "${libdir}/libEGL${SOLIBS}"
-FILES_libegl-mx6-dev = "${libdir}/libEGL${SOLIBSDEV}"
+FILES_libegl-mx6-dev = "${libdir}/libEGL${SOLIBSDEV} ${libdir}/pkgconfig/egl.pc"
 FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
 
 FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
@@ -123,11 +131,11 @@ FILES_libgl-mx6 = "${libdir}/libGL${SOLIBS}"
 FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
 
 FILES_libgles-mx6 = "${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
-FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV}"
+FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
 FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
 
 FILES_libgles2-mx6 = "${libdir}/libGLESv2${SOLIBS}"
-FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}"
+FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc"
 FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
 RDEPENDS_libgles2-mx6 = "libglslc-mx6"
 
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
new file mode 100644
index 0000000..5921583
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: egl
+Description: Vivante EGL library
+Requires.private: libdrm x11 xext xdamage xfixes xcb
+Version: 8.0
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} -DLINUX
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
new file mode 100644
index 0000000..b69bcb2
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: glesv1_cm
+Description: Vivante OpenGL ES 1.1 CM library
+Requires.private: libdrm x11 xext xdamage xfixes xcb
+Version: 8.0
+Libs: -L${libdir} -lGLESv1_CM
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
new file mode 100644
index 0000000..e92620b
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: glesv2
+Description: Vivante OpenGL ES 2.0 library
+Requires.private:
+Version: 8.0
+Libs: -L${libdir} -lGLESv2
+Libs.private: -lpthread -lrt
+Cflags: -I${includedir}
-- 
1.8.1

[meta-fsl-arm PATCH v2 11/15] amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES

[Otavio Salvador]

From: Eric BENARD <eric@eukrea.com>

this prevent warnings and parse errors

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
index 2dee47a..70568f9 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
@@ -84,5 +84,5 @@ FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
 FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
 FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
 
-COMPATIBLE_MACHINE = "(mx5)"
+COMPATIBLE_MACHINE = "${@base_contains('DISTRO_FEATURES', 'x11', '(mx5)', 'Invalid!', d)}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.8.1

[meta-fsl-arm PATCH v2 12/15] amd-gpu-x11-bin-mx51: factorize the recipes

[Otavio Salvador]

From: Eric BENARD <eric@eukrea.com>

this will allow easier addition of non x11 package

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc  | 82 ++++++++++++++++++++++
 .../amd-gpu-x11-bin-mx51_11.09.01.bb               | 74 +------------------
 .../fix-linux-build-check.patch                    |  0
 3 files changed, 83 insertions(+), 73 deletions(-)
 create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
 rename recipes-graphics/amd-gpu-x11-bin/{amd-gpu-x11-bin-mx51 => files}/fix-linux-build-check.patch (100%)

diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
new file mode 100644
index 0000000..b081695
--- /dev/null
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
@@ -0,0 +1,82 @@
+# Copyright (C) 2011, 2012 Freescale
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+LICENSE = "Proprietary"
+SECTION = "libs"
+
+# FIXME: Replace for correct AMD license
+LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
+
+PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+           file://fix-linux-build-check.patch"
+
+inherit fsl-eula-unpack
+
+# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
+# the source we cannot fix it. Disable the insane check for now.
+python populate_packages_prepend() {
+    for p in d.getVar('PACKAGES', True).split():
+        d.setVar("INSANE_SKIP_%s" % p, "ldflags")
+}
+
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${bindir}
+    install -d ${D}${includedir}
+
+    cp -axr ${S}/usr/bin/* ${D}${bindir}
+    cp -axf ${S}/usr/lib/* ${D}${libdir}
+    cp -axr ${S}/usr/include/* ${D}${includedir}
+
+    find ${D}${bindir} -type f -exec chmod 755 {} \;
+    find ${D}${libdir} -type f -exec chmod 644 {} \;
+    find ${D}${includedir} -type f -exec chmod 644 {} \;
+
+    # FIXME: Fix sonames of broken libraries
+    mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0
+    mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0
+
+    # FIXME: Remove unkown files
+    rm -r ${D}${libdir}/libcsi.a \
+          ${D}${libdir}/libres.a
+}
+
+PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \
+             libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \
+             libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \
+             libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \
+             libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \
+             lib2dz160-mx51 lib2dz160-mx51-dbg \
+             lib2dz430-mx51 lib2dz430-mx51-dbg"
+
+FILES_${PN}-dbg = "${bindir}/.debug/*"
+
+FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}"
+FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}"
+FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}"
+
+FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}"
+FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV}"
+FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
+
+FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}"
+FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}"
+FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}"
+
+FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}"
+FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}"
+FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
+
+FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}"
+FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}"
+FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}"
+
+FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}"
+FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
+
+FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
+FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
index 70568f9..1a3c542 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
@@ -2,87 +2,15 @@
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "GPU driver and apps for x11 on mx51"
-LICENSE = "Proprietary"
-SECTION = "libs"
 PR = "r12"
 
 # FIXME: Replace for correct AMD license
 LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
 DEPENDS = "virtual/libx11 libxrender"
 
-PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
+include amd-gpu-mx51.inc
 
-SRC_URI = "${FSL_MIRROR}/amd-gpu-x11-bin-mx51-${PV}.bin;fsl-eula=true \
-           file://fix-linux-build-check.patch"
 SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad"
 SRC_URI[sha256sum] = "c7a6fa03b7aa2a375556c59908876554ba720c1e744baba2debb84a408f790db"
 
-inherit fsl-eula-unpack
-
-# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
-# the source we cannot fix it. Disable the insane check for now.
-python populate_packages_prepend() {
-    for p in d.getVar('PACKAGES', True).split():
-        d.setVar("INSANE_SKIP_%s" % p, "ldflags")
-}
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${bindir}
-    install -d ${D}${includedir}
-
-    cp -axr ${S}/usr/bin/* ${D}${bindir}
-    cp -axf ${S}/usr/lib/* ${D}${libdir}
-    cp -axr ${S}/usr/include/* ${D}${includedir}
-
-    find ${D}${bindir} -type f -exec chmod 755 {} \;
-    find ${D}${libdir} -type f -exec chmod 644 {} \;
-    find ${D}${includedir} -type f -exec chmod 644 {} \;
-
-    # FIXME: Fix sonames of broken libraries
-    mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0
-    mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0
-
-    # FIXME: Remove unkown files
-    rm -r ${D}${libdir}/libcsi.a \
-          ${D}${libdir}/libres.a
-}
-
-PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \
-             libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \
-             libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \
-             libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \
-             libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \
-             lib2dz160-mx51 lib2dz160-mx51-dbg \
-             lib2dz430-mx51 lib2dz430-mx51-dbg"
-
-FILES_${PN}-dbg = "${bindir}/.debug/*"
-
-FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}"
-FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}"
-FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}"
-
-FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}"
-FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV}"
-FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
-
-FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}"
-FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}"
-FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}"
-
-FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}"
-FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}"
-FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
-
-FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}"
-FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}"
-FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}"
-
-FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}"
-FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
-
-FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
-FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
-
 COMPATIBLE_MACHINE = "${@base_contains('DISTRO_FEATURES', 'x11', '(mx5)', 'Invalid!', d)}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch b/recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch
similarity index 100%
rename from recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch
rename to recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch
-- 
1.8.1

[meta-fsl-arm PATCH v2 13/15] amd-gpu-bin-mx51: new recipe

[Otavio Salvador]

From: Eric BENARD <eric@eukrea.com>

this provides the GPU libraries for framebuffer

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 .../amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb            | 13 +++++++++++++
 .../amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb        |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb

diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb
new file mode 100644
index 0000000..ecf38f2
--- /dev/null
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb
@@ -0,0 +1,13 @@
+# Copyright (C) 2011, 2012 Freescale
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "GPU driver and apps for frambuffer on mx51"
+
+include amd-gpu-mx51.inc
+
+SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46"
+SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9"
+
+RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51"
+
+COMPATIBLE_MACHINE = "(mx5)"
diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
index 1a3c542..6358aca 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
@@ -13,4 +13,6 @@ include amd-gpu-mx51.inc
 SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad"
 SRC_URI[sha256sum] = "c7a6fa03b7aa2a375556c59908876554ba720c1e744baba2debb84a408f790db"
 
+RCONFLICTS_${PN} = "amd-gpu-bin-mx51"
+
 COMPATIBLE_MACHINE = "${@base_contains('DISTRO_FEATURES', 'x11', '(mx5)', 'Invalid!', d)}"
-- 
1.8.1

[meta-fsl-arm PATCH v2 14/15] layer.conf: handle dynamic layer configuration

[Otavio Salvador]

From: Eric BENARD <eric@eukrea.com>

this patch is taken from :
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
as suggested by Chris Larson

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 conf/layer.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index c4b9cd1..e260e62 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,3 +16,8 @@ FSL_MIRROR ?= "http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/"
 MIRRORS += " \
 ${FSL_MIRROR}	http://download.ossystems.com.br/bsp/freescale/source/ \n \
 "
+
+# Let us add layer-specific bbappends which are only applied when that
+# layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
-- 
1.8.1

[meta-fsl-arm PATCH v2 15/15] qt5: add mx5 and mx6 support

[Otavio Salvador]

From: Eric BENARD <eric@eukrea.com>

- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6Q

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 .../recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp | 105 +++++++++++++++++++++
 qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend     |  68 +++++++++++++
 2 files changed, 173 insertions(+)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend

diff --git a/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp b/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
new file mode 100644
index 0000000..43e6d8d
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** hacked by Eric Bénard - Eukréa Electromatique
+** inspired from https://community.freescale.com/docs/DOC-94123
+** and from fbset.c http://users.telenet.be/geertu/Linux/fbdev/
+**
+** based on qeglfshooks_imx6.cpp which is :
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <fcntl.h>    /* For O_RDWR */
+#include <unistd.h>   /* For open(), creat() */
+#include "qeglfshooks.h"
+#include <EGL/egl.h>
+#include <linux/fb.h>
+#include <sys/ioctl.h>
+
+QT_BEGIN_NAMESPACE
+
+class QEglFSImx5Hooks : public QEglFSHooks
+{
+public:
+    QEglFSImx5Hooks();
+    virtual QSize screenSize() const;
+    virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format);
+    virtual void destroyNativeWindow(EGLNativeWindowType window);
+
+private:
+    QSize mScreenSize;
+    EGLNativeDisplayType mNativeDisplay;
+};
+
+
+QEglFSImx5Hooks::QEglFSImx5Hooks()
+{
+    int width, height;
+    /* code taken from fbset.c */
+    int fh;
+    struct fb_var_screeninfo var;
+    fh = open("/dev/fb0", O_RDONLY);
+    ioctl(fh, FBIOGET_VSCREENINFO, &var);
+    mScreenSize.setHeight(var.yres);
+    mScreenSize.setWidth(var.xres);
+    close(fh);
+    mNativeDisplay = EGL_DEFAULT_DISPLAY;
+}
+
+QSize QEglFSImx5Hooks::screenSize() const
+{
+    return mScreenSize;
+}
+
+EGLNativeWindowType QEglFSImx5Hooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
+{
+    Q_UNUSED(format);
+
+    EGLNativeWindowType eglWindow =  open("/dev/fb0", O_RDWR);
+    return eglWindow;
+}
+
+
+void QEglFSImx5Hooks::destroyNativeWindow(EGLNativeWindowType window)
+{
+    close(window);
+}
+
+QEglFSImx5Hooks eglFSImx5Hooks;
+QEglFSHooks *platformHooks = &eglFSImx5Hooks;
+
+QT_END_NAMESPACE
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend
new file mode 100644
index 0000000..00a8819
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend
@@ -0,0 +1,68 @@
+# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
+
+GL_DEPENDS_mx6 = "virtual/libgles2 virtual/egl"
+QT_GLFLAGS_mx6 = "-opengl es2 -eglfs"
+QT_EXAMPLES_mx6 = "-make examples"
+QT_DEMOS_mx6 = "-make demos"
+
+GL_DEPENDS_mx5 = "virtual/libgles2 virtual/egl"
+QT_GLFLAGS_mx5 = "-opengl es2 -eglfs"
+QT_EXAMPLES_mx5 = "-make examples"
+QT_DEMOS_mx5 = "-make demos"
+
+TSLIB_DEPENDS_mx6 = "tslib"
+QT_TSLIB_mx6 = "-tslib"
+
+TSLIB_DEPENDS_mx5 = "tslib"
+QT_TSLIB_mx5 = "-tslib"
+
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
+
+FILESEXTRAPATHS_prepend_mx5 := "${THISDIR}/${PN}:"
+SRC_URI_append_mx5 += " \
+    file://qeglfshooks_imx5.cpp \
+    "
+
+do_configure_prepend_mx6() {
+# adapt qmake.conf to our needs
+sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
+IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
+QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
+QMAKE_CFLAGS_EGL += \$\$IMX6_CFLAGS
+load(qt_config)
+
+EOF
+
+# copy the hook in the mkspecs directory OE is using
+cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
+}
+
+do_configure_prepend_mx5() {
+# adapt qmake.conf to our needs
+sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx5.cpp
+IMX5_CFLAGS             = -D_LINUX
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+QMAKE_CFLAGS_RELEASE   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
+QMAKE_CFLAGS_EGL += \$\$IMX5_CFLAGS
+load(qt_config)
+
+EOF
+
+cp ${WORKDIR}/qeglfshooks_imx5.cpp ${S}/mkspecs/linux-oe-g++/
+}
-- 
1.8.1

Re: [meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Otavio Salvador]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

Hello,


On Fri, Jun 7, 2013 at 12:27 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> ...

meta-fsl-arm
> ------------
>
> The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be applied
> on Monday; the other patches still need work and won't be applied now
>

These three patches has been merged.


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

[-- Attachment #2: Type: text/html, Size: 1142 bytes --]

Re: [meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Eric Bénard]

Le Mon, 10 Jun 2013 09:14:31 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> Hello,
> 
> 
> On Fri, Jun 7, 2013 at 12:27 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:
> 
> > ...
> 
> meta-fsl-arm
> > ------------
> >
> > The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be applied
> > on Monday; the other patches still need work and won't be applied now
> >
> 
> These three patches has been merged.
> 
> 
what rework is still needed for 11-12-13-14-15 ?

Eric

Re: [meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Otavio Salvador]

[-- Attachment #1: Type: text/plain, Size: 1028 bytes --]

On Mon, Jun 10, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com> wrote:

> Le Mon, 10 Jun 2013 09:14:31 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
> > Hello,
> >
> >
> > On Fri, Jun 7, 2013 at 12:27 PM, Otavio Salvador <
> otavio@ossystems.com.br>wrote:
> >
> > > ...
> >
> > meta-fsl-arm
> > > ------------
> > >
> > > The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be applied
> > > on Monday; the other patches still need work and won't be applied now
> > >
> >
> > These three patches has been merged.
> >
> >
> what rework is still needed for 11-12-13-14-15 ?
>

I have a build failure in my autobuilder yet and needs to fix it before
merging those. I hadn't time to test the AMD related changes yet and Qt
needs also testing as people seem to had problem with X11.

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

[-- Attachment #2: Type: text/html, Size: 1734 bytes --]

Re: [meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Eric Bénard]

Le Mon, 10 Jun 2013 09:56:03 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Mon, Jun 10, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com> wrote:
> 
> > Le Mon, 10 Jun 2013 09:14:31 -0300,
> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> >
> > > Hello,
> > >
> > >
> > > On Fri, Jun 7, 2013 at 12:27 PM, Otavio Salvador <
> > otavio@ossystems.com.br>wrote:
> > >
> > > > ...
> > >
> > > meta-fsl-arm
> > > > ------------
> > > >
> > > > The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be applied
> > > > on Monday; the other patches still need work and won't be applied now
> > > >
> > >
> > > These three patches has been merged.
> > >
> > >
> > what rework is still needed for 11-12-13-14-15 ?
> >
> 
> I have a build failure in my autobuilder yet and needs to fix it before

please send it to the mailing list so that I can see if that's related
to those patches.

> merging those. I hadn't time to test the AMD related changes yet and Qt
> needs also testing as people seem to had problem with X11.
> 
OK as said since the begining accelerated X11 is NOT supported by these
patches so if X11 support is mandatory, please drop these patches.

Eric

Re: [meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Otavio Salvador]

[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]

On Mon, Jun 10, 2013 at 10:06 AM, Eric Bénard <eric@eukrea.com> wrote:

> Le Mon, 10 Jun 2013 09:56:03 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
> > On Mon, Jun 10, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com> wrote:
> >
> > > Le Mon, 10 Jun 2013 09:14:31 -0300,
> > > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> > >
> > > > Hello,
> > > >
> > > >
> > > > On Fri, Jun 7, 2013 at 12:27 PM, Otavio Salvador <
> > > otavio@ossystems.com.br>wrote:
> > > >
> > > > > ...
> > > >
> > > > meta-fsl-arm
> > > > > ------------
> > > > >
> > > > > The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be
> applied
> > > > > on Monday; the other patches still need work and won't be applied
> now
> > > > >
> > > >
> > > > These three patches has been merged.
> > > >
> > > >
> > > what rework is still needed for 11-12-13-14-15 ?
> > >
> >
> > I have a build failure in my autobuilder yet and needs to fix it before
>
> please send it to the mailing list so that I can see if that's related
> to those patches.


It is not in your patches but GPU vivante support.


> > merging those. I hadn't time to test the AMD related changes yet and Qt
> > needs also testing as people seem to had problem with X11.
> >
> OK as said since the begining accelerated X11 is NOT supported by these
> patches so if X11 support is mandatory, please drop these patches.
>

Not mandatory but it cannot break X11 build of Qt5; so I'd like to look at
it before.

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

[-- Attachment #2: Type: text/html, Size: 2889 bytes --]

Re: [meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Eric Bénard]

Le Mon, 10 Jun 2013 10:09:56 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Mon, Jun 10, 2013 at 10:06 AM, Eric Bénard <eric@eukrea.com> wrote:
> 
> > Le Mon, 10 Jun 2013 09:56:03 -0300,
> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> >
> > > On Mon, Jun 10, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com> wrote:
> > >
> > > > Le Mon, 10 Jun 2013 09:14:31 -0300,
> > > > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> > > >
> > > > > Hello,
> > > > >
> > > > >
> > > > > On Fri, Jun 7, 2013 at 12:27 PM, Otavio Salvador <
> > > > otavio@ossystems.com.br>wrote:
> > > > >
> > > > > > ...
> > > > >
> > > > > meta-fsl-arm
> > > > > > ------------
> > > > > >
> > > > > > The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be
> > applied
> > > > > > on Monday; the other patches still need work and won't be applied
> > now
> > > > > >
> > > > >
> > > > > These three patches has been merged.
> > > > >
> > > > >
> > > > what rework is still needed for 11-12-13-14-15 ?
> > > >
> > >
> > > I have a build failure in my autobuilder yet and needs to fix it before
> >
> > please send it to the mailing list so that I can see if that's related
> > to those patches.
> 
> 
> It is not in your patches but GPU vivante support.
> 
so 11-12-13-14 could go in as is.
> 
> > > merging those. I hadn't time to test the AMD related changes yet and Qt
> > > needs also testing as people seem to had problem with X11.
> > >
> > OK as said since the begining accelerated X11 is NOT supported by these
> > patches so if X11 support is mandatory, please drop these patches.
> >
> 
> Not mandatory but it cannot break X11 build of Qt5; so I'd like to look at
> it before.
> 
OK I'll send an updated "qt5: add mx5 and mx6 support" patch which
clearly exludes the changes when x11 is in DISTRO_FEATURES so that X11
qt5 builds gets untouched.

Eric

Re: [meta-fsl-arm PATCH v2 0/15] master-next pending updates

[Otavio Salvador]

[-- Attachment #1: Type: text/plain, Size: 2394 bytes --]

On Mon, Jun 10, 2013 at 10:18 AM, Eric Bénard <eric@eukrea.com> wrote:

> Le Mon, 10 Jun 2013 10:09:56 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
> > On Mon, Jun 10, 2013 at 10:06 AM, Eric Bénard <eric@eukrea.com> wrote:
> >
> > > Le Mon, 10 Jun 2013 09:56:03 -0300,
> > > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> > >
> > > > On Mon, Jun 10, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com>
> wrote:
> > > >
> > > > > Le Mon, 10 Jun 2013 09:14:31 -0300,
> > > > > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> > > > >
> > > > > > Hello,
> > > > > >
> > > > > >
> > > > > > On Fri, Jun 7, 2013 at 12:27 PM, Otavio Salvador <
> > > > > otavio@ossystems.com.br>wrote:
> > > > > >
> > > > > > > ...
> > > > > >
> > > > > > meta-fsl-arm
> > > > > > > ------------
> > > > > > >
> > > > > > > The patches 1, 2 and 3 (from meta-fsl-arm) are intended to be
> > > applied
> > > > > > > on Monday; the other patches still need work and won't be
> applied
> > > now
> > > > > > >
> > > > > >
> > > > > > These three patches has been merged.
> > > > > >
> > > > > >
> > > > > what rework is still needed for 11-12-13-14-15 ?
> > > > >
> > > >
> > > > I have a build failure in my autobuilder yet and needs to fix it
> before
> > >
> > > please send it to the mailing list so that I can see if that's related
> > > to those patches.
> >
> >
> > It is not in your patches but GPU vivante support.
> >
> so 11-12-13-14 could go in as is.


As soon as I test them, or someone else does, yes.


> > > > merging those. I hadn't time to test the AMD related changes yet and
> Qt
> > > > needs also testing as people seem to had problem with X11.
> > > >
> > > OK as said since the begining accelerated X11 is NOT supported by these
> > > patches so if X11 support is mandatory, please drop these patches.
> > >
> >
> > Not mandatory but it cannot break X11 build of Qt5; so I'd like to look
> at
> > it before.
> >
> OK I'll send an updated "qt5: add mx5 and mx6 support" patch which
> clearly exludes the changes when x11 is in DISTRO_FEATURES so that X11
> qt5 builds gets untouched.


Good. Thanks.

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

[-- Attachment #2: Type: text/html, Size: 3973 bytes --]

[meta-fsl-arm][PATCH v7] qt5: add mx5 and mx6 support

[Eric Bénard]

- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6Q
- X11 support is not yet tested so we don't change the core settings
when x11 is in DISTRO_FEATURES

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
v7: don't change the core configuration when x11 is in DISTRO_FEATURES

 .../recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp | 105 +++++++++++++++++++++
 qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend     |  74 +++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend

diff --git a/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp b/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
new file mode 100644
index 0000000..43e6d8d
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** hacked by Eric Bénard - Eukréa Electromatique
+** inspired from https://community.freescale.com/docs/DOC-94123
+** and from fbset.c http://users.telenet.be/geertu/Linux/fbdev/
+**
+** based on qeglfshooks_imx6.cpp which is :
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <fcntl.h>    /* For O_RDWR */
+#include <unistd.h>   /* For open(), creat() */
+#include "qeglfshooks.h"
+#include <EGL/egl.h>
+#include <linux/fb.h>
+#include <sys/ioctl.h>
+
+QT_BEGIN_NAMESPACE
+
+class QEglFSImx5Hooks : public QEglFSHooks
+{
+public:
+    QEglFSImx5Hooks();
+    virtual QSize screenSize() const;
+    virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format);
+    virtual void destroyNativeWindow(EGLNativeWindowType window);
+
+private:
+    QSize mScreenSize;
+    EGLNativeDisplayType mNativeDisplay;
+};
+
+
+QEglFSImx5Hooks::QEglFSImx5Hooks()
+{
+    int width, height;
+    /* code taken from fbset.c */
+    int fh;
+    struct fb_var_screeninfo var;
+    fh = open("/dev/fb0", O_RDONLY);
+    ioctl(fh, FBIOGET_VSCREENINFO, &var);
+    mScreenSize.setHeight(var.yres);
+    mScreenSize.setWidth(var.xres);
+    close(fh);
+    mNativeDisplay = EGL_DEFAULT_DISPLAY;
+}
+
+QSize QEglFSImx5Hooks::screenSize() const
+{
+    return mScreenSize;
+}
+
+EGLNativeWindowType QEglFSImx5Hooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
+{
+    Q_UNUSED(format);
+
+    EGLNativeWindowType eglWindow =  open("/dev/fb0", O_RDWR);
+    return eglWindow;
+}
+
+
+void QEglFSImx5Hooks::destroyNativeWindow(EGLNativeWindowType window)
+{
+    close(window);
+}
+
+QEglFSImx5Hooks eglFSImx5Hooks;
+QEglFSHooks *platformHooks = &eglFSImx5Hooks;
+
+QT_END_NAMESPACE
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend
new file mode 100644
index 0000000..33f0e8b
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend
@@ -0,0 +1,74 @@
+# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
+
+HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
+
+GL_DEPENDS_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/libgles2 virtual/egl', d)}"
+QT_GLFLAGS_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '', '-opengl es2 -eglfs', d)}"
+QT_EXAMPLES_mx6 = "-make examples"
+QT_DEMOS_mx6 = "-make demos"
+
+GL_DEPENDS_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/libgles2 virtual/egl', d)}"
+QT_GLFLAGS_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', '', '-opengl es2 -eglfs', d)}"
+QT_EXAMPLES_mx5 = "-make examples"
+QT_DEMOS_mx5 = "-make demos"
+
+TSLIB_DEPENDS_mx6 = "tslib"
+QT_TSLIB_mx6 = "-tslib"
+
+TSLIB_DEPENDS_mx5 = "tslib"
+QT_TSLIB_mx5 = "-tslib"
+
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
+
+FILESEXTRAPATHS_prepend_mx5 := "${THISDIR}/${PN}:"
+SRC_URI_append_mx5 += " \
+    file://qeglfshooks_imx5.cpp \
+    "
+
+do_configure_prepend_mx6() {
+    if test ${HAS_X11} -eq 0; then
+# adapt qmake.conf to our needs
+sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
+IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
+QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
+QMAKE_CFLAGS_EGL += \$\$IMX6_CFLAGS
+load(qt_config)
+
+EOF
+
+# copy the hook in the mkspecs directory OE is using
+cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
+    fi
+}
+
+do_configure_prepend_mx5() {
+    if test ${HAS_X11} -eq 0; then
+# adapt qmake.conf to our needs
+sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx5.cpp
+IMX5_CFLAGS             = -D_LINUX
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+QMAKE_CFLAGS_RELEASE   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
+QMAKE_CFLAGS_EGL += \$\$IMX5_CFLAGS
+load(qt_config)
+
+EOF
+
+cp ${WORKDIR}/qeglfshooks_imx5.cpp ${S}/mkspecs/linux-oe-g++/
+    fi
+}
-- 
1.7.11.2.249.g31c7954

Re: [meta-fsl-arm][PATCH v7] qt5: add mx5 and mx6 support

[Eric Bénard]

Hi Otavio,

Le Mon, 10 Jun 2013 15:35:07 +0200,
Eric Bénard <eric@eukrea.com> a écrit :

> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
> - tested on i.MX51, i.MX53 and i.MX6Q
> - X11 support is not yet tested so we don't change the core settings
> when x11 is in DISTRO_FEATURES
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> v7: don't change the core configuration when x11 is in DISTRO_FEATURES
> 
May you please give me more details on what prevent this patch from
being applied to master ?
I have some work on QT5/X11 (now compiles fine and needs some testing)
so if some rework is still needed I can do it at the same time.

Thanks,
Eric

Re: [meta-fsl-arm][PATCH v7] qt5: add mx5 and mx6 support

[Otavio Salvador]

On Mon, Jul 29, 2013 at 9:25 AM, Eric Bénard <eric@eukrea.com> wrote:
> Hi Otavio,
>
> Le Mon, 10 Jun 2013 15:35:07 +0200,
> Eric Bénard <eric@eukrea.com> a écrit :
>
>> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
>> - tested on i.MX51, i.MX53 and i.MX6Q
>> - X11 support is not yet tested so we don't change the core settings
>> when x11 is in DISTRO_FEATURES
>>
>> Signed-off-by: Eric Bénard <eric@eukrea.com>
>> ---
>> v7: don't change the core configuration when x11 is in DISTRO_FEATURES
>>
> May you please give me more details on what prevent this patch from
> being applied to master ?
> I have some work on QT5/X11 (now compiles fine and needs some testing)
> so if some rework is still needed I can do it at the same time.

It is the missing part. I'd like to have X11 working to not break it.

If you can update it and test, I can merge it.

I am still working on 3.5.7 integration and the other issues so I
won't be able to test.

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

Re: [meta-fsl-arm][PATCH v7] qt5: add mx5 and mx6 support

[Eric Bénard]

Le Mon, 29 Jul 2013 09:45:54 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Mon, Jul 29, 2013 at 9:25 AM, Eric Bénard <eric@eukrea.com> wrote:
> > Hi Otavio,
> >
> > Le Mon, 10 Jun 2013 15:35:07 +0200,
> > Eric Bénard <eric@eukrea.com> a écrit :
> >
> >> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
> >> - tested on i.MX51, i.MX53 and i.MX6Q
> >> - X11 support is not yet tested so we don't change the core settings
> >> when x11 is in DISTRO_FEATURES
> >>
> >> Signed-off-by: Eric Bénard <eric@eukrea.com>
> >> ---
> >> v7: don't change the core configuration when x11 is in DISTRO_FEATURES
> >>
> > May you please give me more details on what prevent this patch from
> > being applied to master ?
> > I have some work on QT5/X11 (now compiles fine and needs some testing)
> > so if some rework is still needed I can do it at the same time.
> 
> It is the missing part. I'd like to have X11 working to not break it.
> 
actually it's not breaking X11 : the current patch is irgnoring the X11
case and doesn't touch anything when building for X.
So may you please merge it as X11 tests will take some time.

Eric

Re: [meta-fsl-arm][PATCH v7] qt5: add mx5 and mx6 support

[Otavio Salvador]

On Mon, Jul 29, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com> wrote:
> Le Mon, 29 Jul 2013 09:45:54 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
>> On Mon, Jul 29, 2013 at 9:25 AM, Eric Bénard <eric@eukrea.com> wrote:
>> > Hi Otavio,
>> >
>> > Le Mon, 10 Jun 2013 15:35:07 +0200,
>> > Eric Bénard <eric@eukrea.com> a écrit :
>> >
>> >> - this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
>> >> - tested on i.MX51, i.MX53 and i.MX6Q
>> >> - X11 support is not yet tested so we don't change the core settings
>> >> when x11 is in DISTRO_FEATURES
>> >>
>> >> Signed-off-by: Eric Bénard <eric@eukrea.com>
>> >> ---
>> >> v7: don't change the core configuration when x11 is in DISTRO_FEATURES
>> >>
>> > May you please give me more details on what prevent this patch from
>> > being applied to master ?
>> > I have some work on QT5/X11 (now compiles fine and needs some testing)
>> > so if some rework is still needed I can do it at the same time.
>>
>> It is the missing part. I'd like to have X11 working to not break it.
>>
> actually it's not breaking X11 : the current patch is irgnoring the X11
> case and doesn't touch anything when building for X.
> So may you please merge it as X11 tests will take some time.

Ok; I merge it this afternoon together with other ready changes.

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