[PATCH 01/14] fsl-dynamic-packagearch.bbclass: Fix spelling error in print message

[PATCH 01/14] fsl-dynamic-packagearch.bbclass: Fix spelling error in print message

[Tom Hochstein]

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 classes/fsl-dynamic-packagearch.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
index ddb1673..a7cc53f 100644
--- a/classes/fsl-dynamic-packagearch.bbclass
+++ b/classes/fsl-dynamic-packagearch.bbclass
@@ -46,7 +46,7 @@ python __anonymous () {
                 raise bb.parse.SkipPackage("You must set MACHINE_SOCARCH_SUFFIX as MACHINE_SOCARCH_FILTER is set for this SoC.")
 
         if package_arch:
-            bb.debug(1, "Use '%s' as package archictecture for '%s'" % (package_arch, PN))
+            bb.debug(1, "Use '%s' as package architecture for '%s'" % (package_arch, PN))
             d.setVar("PACKAGE_ARCH", package_arch)
 
     cur_package_archs = (d.getVar("PACKAGE_ARCHS", True) or "").split()
-- 
1.9.1

[PATCH 02/14] weston: Remove duplication in variable value

[Tom Hochstein]

Rework variable implementation (using SoC override) so that
the value does not contain a duplication.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/wayland/weston_%.bbappend | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index d5602c9..366398f 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -27,14 +27,16 @@ PACKAGECONFIG_append = " ${PACKAGECONFIG_IMX_TO_APPEND}"
 PACKAGECONFIG_remove = " ${PACKAGECONFIG_IMX_TO_REMOVE}"
 
 
-EXTRA_OECONF_IMX = " \
+EXTRA_OECONF_IMX_COMMON = " \
     --disable-libunwind \
     --disable-xwayland-test \
     WESTON_NATIVE_BACKEND=fbdev-backend.so \
 "
+EXTRA_OECONF_IMX          = ""
+EXTRA_OECONF_IMX_imxpxp   = "${EXTRA_OECONF_IMX_COMMON}"
+EXTRA_OECONF_IMX_imxgpu2d = "${EXTRA_OECONF_IMX_COMMON}"
 
-EXTRA_OECONF_append_imxpxp   = " ${EXTRA_OECONF_IMX}"
-EXTRA_OECONF_append_imxgpu2d = " ${EXTRA_OECONF_IMX}"
+EXTRA_OECONF_append = " ${EXTRA_OECONF_IMX}"
 
 # Use a intermediate step to configure the linking flags
 IMXGPU_LIBS = ""
-- 
1.9.1

[PATCH 03/14] clutter-1.0: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/clutter/clutter-1.0_%.bbappend | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/recipes-graphics/clutter/clutter-1.0_%.bbappend b/recipes-graphics/clutter/clutter-1.0_%.bbappend
index 85cbd50..053f68c 100644
--- a/recipes-graphics/clutter/clutter-1.0_%.bbappend
+++ b/recipes-graphics/clutter/clutter-1.0_%.bbappend
@@ -1,9 +1,3 @@
-# Provide the need flags and backend settings to work with Vivante GPU
-CFLAGS_append_mx6 = " -DLINUX \
-                      ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                                       bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                                     '-DEGL_API_WL -DEGL_API_FB', '', d), d)}"
-
 PACKAGECONFIG_mx6 ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', \
                                         bb.utils.contains('DISTRO_FEATURES', 'wayland', \
                                                       'wayland egl', '', d), d)}"
-- 
1.9.1

[PATCH 04/14] cairo: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/cairo/cairo_%.bbappend | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend
index c062dba..94ae65f 100644
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,10 +1 @@
-CFLAGS_append_imxgpu2d = " \
-    -DLINUX \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \
-                          '', \
-                          bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                            '-DEGL_API_FB -DEGL_API_WL', \
-                                            '-DEGL_API_FB', d), d)} \
-"
-
 PACKAGECONFIG_append_imxgpu3d = " egl glesv2"
-- 
1.9.1

[PATCH 05/14] cogl-1.0: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/cogl/cogl-1.0_%.bbappend | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend
index 102461d..87fd15a 100644
--- a/recipes-graphics/cogl/cogl-1.0_%.bbappend
+++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend
@@ -1,9 +1,3 @@
-# Provide the need flags and backend settings to work with Vivante GPU
-CFLAGS_append_mx6 = " -DLINUX \
-                      ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                                        bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                                      '-DEGL_API_WL -DEGL_API_FB', '', d), d)}"
-
 PACKAGECONFIG_mx6 ??= "cogl-pango gles2 \
                        ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'egl-x11', \
                                          bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-- 
1.9.1

[PATCH 06/14] gtk+3: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/gtk+/gtk+3_%.bbappend | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend
index 0076d29..654e14b 100644
--- a/recipes-graphics/gtk+/gtk+3_%.bbappend
+++ b/recipes-graphics/gtk+/gtk+3_%.bbappend
@@ -1,6 +1,2 @@
 PACKAGECONFIG_remove_mx6 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "wayland", "", d)}"
 
-CFLAGS_append_mx6 = " -DLINUX \
-                      ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                                        bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                                      '-DEGL_API_FB -DEGL_API_WL',  '', d), d)}"
-- 
1.9.1

[PATCH 07/14] piglit: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/piglit/piglit_git.bbappend | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/recipes-graphics/piglit/piglit_git.bbappend b/recipes-graphics/piglit/piglit_git.bbappend
index d682c8c..6330fd7 100644
--- a/recipes-graphics/piglit/piglit_git.bbappend
+++ b/recipes-graphics/piglit/piglit_git.bbappend
@@ -1,7 +1 @@
 DEPENDS_append_mx6 = " virtual/egl"
-
-# Provide the need flags and backend settings to work with Vivante GPU
-CFLAGS_append_mx6 = " -DLINUX \
-                      ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-DEGL_API_FB', \
-                                        bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                                      '-DEGL_API_WL', '', d), d)}"
-- 
1.9.1

[PATCH 08/14] gstreamer1.0-plugins-bad: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 7f321cc..4743c4f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -2,9 +2,6 @@
 # defines to be set for each platform
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-CFLAGS_append_imxgpu2d = " -DLINUX ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                            bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DEGL_API_FB -DWL_EGL_PLATFORM', '-DEGL_API_FB', d), d)}"
-
 PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl', '', d)}"
 
 PACKAGECONFIG_GL_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
-- 
1.9.1

[PATCH 09/14] weston: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly. The package had to be patched to
link the compositor to egl.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 .../weston/0016-Link-compositor-to-egl.patch       | 12 +++++++++++
 recipes-graphics/wayland/weston_%.bbappend         | 23 +---------------------
 2 files changed, 13 insertions(+), 22 deletions(-)
 create mode 100644 recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch

diff --git a/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch b/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch
new file mode 100644
index 0000000..3cad74f
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch
@@ -0,0 +1,12 @@
+Index: weston-1.11.1/configure.ac
+===================================================================
+--- weston-1.11.1.orig/configure.ac	2016-11-08 17:26:14.266564760 -0600
++++ weston-1.11.1/configure.ac	2016-11-09 19:38:58.000000000 -0600
+@@ -93,6 +93,7 @@
+ 	PKG_CHECK_MODULES(EGL, [egl glesv2])
+         PKG_CHECK_MODULES([EGL_TESTS], [egl glesv2 wayland-client wayland-egl])
+ 	PKG_CHECK_MODULES([GL_RENDERER], [libdrm])
++	COMPOSITOR_MODULES="$COMPOSITOR_MODULES egl"
+ fi
+ 
+ AC_ARG_ENABLE(xkbcommon,
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index 366398f..dbe87f1 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -14,6 +14,7 @@ SRC_URI_append_imxgpu2d = " \
     file://0013-MGS-1945-Use-common-API-to-support-G2d-compositor.patch    \
     file://0014-MGS-1987-Get-stride-from-the-FB-buffe.patch                \
     file://0015-MGS-2221-imx-171-Fix-weston-build-failed.patch             \
+    file://0016-Link-compositor-to-egl.patch                               \
 "
 
 PACKAGECONFIG_IMX_TO_APPEND = ""
@@ -37,25 +38,3 @@ EXTRA_OECONF_IMX_imxpxp   = "${EXTRA_OECONF_IMX_COMMON}"
 EXTRA_OECONF_IMX_imxgpu2d = "${EXTRA_OECONF_IMX_COMMON}"
 
 EXTRA_OECONF_append = " ${EXTRA_OECONF_IMX}"
-
-# Use a intermediate step to configure the linking flags
-IMXGPU_LIBS = ""
-IMXGPU_LIBS_imxgpu2d = " \
-    COMPOSITOR_LIBS="-lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
-    FB_COMPOSITOR_LIBS="-lEGL -lwayland-server -lxkbcommon" \
-"
-IMXGPU_LIBS_imxgpu3d = " \
-    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
-    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
-"
-
-# Use the linking flags according to the GPU support
-EXTRA_OEMAKE_append_imxgpu2d = " \
-    COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
-    FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
-    SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
-    EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
-    CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \
-    \
-    ${IMXGPU_LIBS} \
-"
-- 
1.9.1

[PATCH 10/14] clutter-1.0: Use Wayland backend if wayland and x11 are in distro

[Tom Hochstein]

By i.MX convention, if wayland and x11 are in the distro features,
the Wayland backend is used.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/clutter/clutter-1.0_%.bbappend | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-graphics/clutter/clutter-1.0_%.bbappend b/recipes-graphics/clutter/clutter-1.0_%.bbappend
index 053f68c..0099a47 100644
--- a/recipes-graphics/clutter/clutter-1.0_%.bbappend
+++ b/recipes-graphics/clutter/clutter-1.0_%.bbappend
@@ -1,3 +1,5 @@
-PACKAGECONFIG_mx6 ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', \
-                                        bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                                      'wayland egl', '', d), d)}"
+PACKAGECONFIG_mx6 ??= " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'glx x11', \
+       '', d), d)} \
+"
-- 
1.9.1

[PATCH 11/14] cogl-1.0: Configure for Wayland backend if wayland and x11 are in distro

[Tom Hochstein]

By i.MX convention, if wayland and x11 are in the distro features,
the Wayland backend is used.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/cogl/cogl-1.0_%.bbappend | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend
index 87fd15a..c150f3e 100644
--- a/recipes-graphics/cogl/cogl-1.0_%.bbappend
+++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend
@@ -1,4 +1,5 @@
-PACKAGECONFIG_mx6 ??= "cogl-pango gles2 \
-                       ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'egl-x11', \
-                                         bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                                       'egl-wayland', '', d), d)}"
+PACKAGECONFIG_mx6 ??= " \
+    cogl-pango gles2 \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'egl-x11', \
+       '', d), d)}"
-- 
1.9.1

[PATCH 12/14] gtk+3: Configure for Wayland backend if wayland and x11 are in distro

[Tom Hochstein]

By i.MX convention, if wayland and x11 are in the distro features,
the Wayland backend is used.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/gtk+/gtk+3_%.bbappend | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend
index 654e14b..bc4a404 100644
--- a/recipes-graphics/gtk+/gtk+3_%.bbappend
+++ b/recipes-graphics/gtk+/gtk+3_%.bbappend
@@ -1,2 +1,3 @@
-PACKAGECONFIG_remove_mx6 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "wayland", "", d)}"
-
+PACKAGECONFIG_remove_mx6 = " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "x11", "", d)} \
+"
-- 
1.9.1

[PATCH 13/14] imx-gpu-viv: Configure for Wayland backend if wayland and x11 are in distro

[Tom Hochstein]

By i.MX convention, if wayland and x11 are in the distro features,
the Wayland backend is used.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 525f0a2..25bd285 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -7,10 +7,12 @@ SECTION = "libs"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;md5=12c028cbbbedb4b8770267131500592c"
 
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
-                             bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
-                                           '', d), d)} \
-            libpng"
+DEPENDS += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
+                                                       '', d), d)} \
+    libpng \
+"
 
 EXTRA_PROVIDES = ""
 EXTRA_PROVIDES_imxgpu3d = " virtual/libgl virtual/libgles1 virtual/libgles2"
-- 
1.9.1

[PATCH 14/14] gstreamer1.0-plugins-imx: Configure for Wayland backend if wayland and x11 are in distro

[Tom Hochstein]

By i.MX convention, if wayland and x11 are in the distro features,
the Wayland backend is used.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb
index 07273d6..2fc065b 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.12.2.bb
@@ -36,9 +36,10 @@ EXTRA_OECONF = "--kernel-headers=${STAGING_KERNEL_DIR}/include ${PACKAGECONFIG_C
 
 EGLVIVSINK_DEPENDS = " \
     virtual/egl virtual/libgles2 \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', \
-       bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
-       '', d),d)}"
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
+       bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', \
+       '', d), d)} \
+"
 
 PACKAGECONFIG ?= "uniaudiodec mp3encoder v4l2src"
 PACKAGECONFIG_append_imxgpu3d = " eglvivsink"
-- 
1.9.1

Re: [PATCH 09/14] weston: Use compiler settings provided by IMX-GPU driver pkg-config

[Fabio Berton]

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

Hi Tom!

With this commit, weston fails to compile when using fslc-wayland distro.

| In file included from ../weston-1.11.1/src/g2d-renderer.c:41:0:
|
/home/berton/src/fslc/fsl-community-bsp-master/build/tmp/sysroots/imx6slevk/usr/include/HAL/gc_hal_eglplatform.h:208:2:
error: #error "Platform not recognized"
|  #error "Platform not recognized"
|   ^~~~~



On Fri, Nov 18, 2016 at 11:11 PM, Tom Hochstein <tom.hochstein@nxp.com>
wrote:

> The IMX-GPU driver now provides compiler settings through pkg-config,
> so don't set them explicitly. The package had to be patched to
> link the compositor to egl.
>
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> ---
>  .../weston/0016-Link-compositor-to-egl.patch       | 12 +++++++++++
>  recipes-graphics/wayland/weston_%.bbappend         | 23
> +---------------------
>  2 files changed, 13 insertions(+), 22 deletions(-)
>  create mode 100644 recipes-graphics/wayland/weston/0016-Link-compositor-
> to-egl.patch
>
> diff --git a/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch
> b/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch
> new file mode 100644
> index 0000000..3cad74f
> --- /dev/null
> +++ b/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch
> @@ -0,0 +1,12 @@
> +Index: weston-1.11.1/configure.ac
> +===================================================================
> +--- weston-1.11.1.orig/configure.ac    2016-11-08 17:26:14.266564760
> -0600
> ++++ weston-1.11.1/configure.ac 2016-11-09 19:38:58.000000000 -0600
> +@@ -93,6 +93,7 @@
> +       PKG_CHECK_MODULES(EGL, [egl glesv2])
> +         PKG_CHECK_MODULES([EGL_TESTS], [egl glesv2 wayland-client
> wayland-egl])
> +       PKG_CHECK_MODULES([GL_RENDERER], [libdrm])
> ++      COMPOSITOR_MODULES="$COMPOSITOR_MODULES egl"
> + fi
> +
> + AC_ARG_ENABLE(xkbcommon,
> diff --git a/recipes-graphics/wayland/weston_%.bbappend
> b/recipes-graphics/wayland/weston_%.bbappend
> index 366398f..dbe87f1 100644
> --- a/recipes-graphics/wayland/weston_%.bbappend
> +++ b/recipes-graphics/wayland/weston_%.bbappend
> @@ -14,6 +14,7 @@ SRC_URI_append_imxgpu2d = " \
>      file://0013-MGS-1945-Use-common-API-to-support-G2d-compositor.patch
>   \
>      file://0014-MGS-1987-Get-stride-from-the-FB-buffe.patch
>   \
>      file://0015-MGS-2221-imx-171-Fix-weston-build-failed.patch
>    \
> +    file://0016-Link-compositor-to-egl.patch
>    \
>  "
>
>  PACKAGECONFIG_IMX_TO_APPEND = ""
> @@ -37,25 +38,3 @@ EXTRA_OECONF_IMX_imxpxp   = "${EXTRA_OECONF_IMX_COMMON}"
>  EXTRA_OECONF_IMX_imxgpu2d = "${EXTRA_OECONF_IMX_COMMON}"
>
>  EXTRA_OECONF_append = " ${EXTRA_OECONF_IMX}"
> -
> -# Use a intermediate step to configure the linking flags
> -IMXGPU_LIBS = ""
> -IMXGPU_LIBS_imxgpu2d = " \
> -    COMPOSITOR_LIBS="-lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1"
> \
> -    FB_COMPOSITOR_LIBS="-lEGL -lwayland-server -lxkbcommon" \
> -"
> -IMXGPU_LIBS_imxgpu3d = " \
> -    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon
> -lpixman-1" \
> -    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
> -"
> -
> -# Use the linking flags according to the GPU support
> -EXTRA_OEMAKE_append_imxgpu2d = " \
> -    COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1
> -DEGL_API_FB -DEGL_API_WL" \
> -    FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
> -    SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
> -    EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
> -    CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I
> ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \
> -    \
> -    ${IMXGPU_LIBS} \
> -"
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
>

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

Re: [PATCH 09/14] weston: Use compiler settings provided by IMX-GPU driver pkg-config

[Tom Hochstein]

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

Hi Fabio,

Thanks for the info. I’m working on a fix.

Tom

From: Fabio Berton [mailto:fabio.berton@ossystems.com.br]
Sent: Wednesday, December 07, 2016 7:31 AM
To: Tom Hochstein <tom.hochstein@nxp.com>
Cc: meta-freescale@yoctoproject.org
Subject: Re: [meta-freescale] [PATCH 09/14] weston: Use compiler settings provided by IMX-GPU driver pkg-config

Hi Tom!
With this commit, weston fails to compile when using fslc-wayland distro.

| In file included from ../weston-1.11.1/src/g2d-renderer.c:41:0:
| /home/berton/src/fslc/fsl-community-bsp-master/build/tmp/sysroots/imx6slevk/usr/include/HAL/gc_hal_eglplatform.h:208:2: error: #error "Platform not recognized"
|  #error "Platform not recognized"
|   ^~~~~


On Fri, Nov 18, 2016 at 11:11 PM, Tom Hochstein <tom.hochstein@nxp.com<mailto:tom.hochstein@nxp.com>> wrote:
The IMX-GPU driver now provides compiler settings through pkg-config,
so don't set them explicitly. The package had to be patched to
link the compositor to egl.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com<mailto:tom.hochstein@nxp.com>>
---
 .../weston/0016-Link-compositor-to-egl.patch       | 12 +++++++++++
 recipes-graphics/wayland/weston_%.bbappend         | 23 +---------------------
 2 files changed, 13 insertions(+), 22 deletions(-)
 create mode 100644 recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch

diff --git a/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch b/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch
new file mode 100644
index 0000000..3cad74f
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0016-Link-compositor-to-egl.patch
@@ -0,0 +1,12 @@
+Index: weston-1.11.1/configure.ac<https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fconfigure.ac&data=01%7C01%7Ctom.hochstein%40nxp.com%7C2c49f2ceb3614844b4a108d41ea55dac%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=HKZbBp9v4NkhnqNCT%2Fs6ctp4o33NUIIhujkXkyqUL60%3D&reserved=0>
+===================================================================
+--- weston-1.11.1.orig/configure.ac<https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fconfigure.ac&data=01%7C01%7Ctom.hochstein%40nxp.com%7C2c49f2ceb3614844b4a108d41ea55dac%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=HKZbBp9v4NkhnqNCT%2Fs6ctp4o33NUIIhujkXkyqUL60%3D&reserved=0>    2016-11-08 17:26:14.266564760 -0600
++++ weston-1.11.1/configure.ac<https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fconfigure.ac&data=01%7C01%7Ctom.hochstein%40nxp.com%7C2c49f2ceb3614844b4a108d41ea55dac%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=HKZbBp9v4NkhnqNCT%2Fs6ctp4o33NUIIhujkXkyqUL60%3D&reserved=0> 2016-11-09 19:38:58.000000000 -0600
+@@ -93,6 +93,7 @@
+       PKG_CHECK_MODULES(EGL, [egl glesv2])
+         PKG_CHECK_MODULES([EGL_TESTS], [egl glesv2 wayland-client wayland-egl])
+       PKG_CHECK_MODULES([GL_RENDERER], [libdrm])
++      COMPOSITOR_MODULES="$COMPOSITOR_MODULES egl"
+ fi
+
+ AC_ARG_ENABLE(xkbcommon,
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index 366398f..dbe87f1 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -14,6 +14,7 @@ SRC_URI_append_imxgpu2d = " \
     file://0013-MGS-1945-Use-common-API-to-support-G2d-compositor.patch<file:///\\0013-MGS-1945-Use-common-API-to-support-G2d-compositor.patch>    \
     file://0014-MGS-1987-Get-stride-from-the-FB-buffe.patch<file:///\\0014-MGS-1987-Get-stride-from-the-FB-buffe.patch>                \
     file://0015-MGS-2221-imx-171-Fix-weston-build-failed.patch<file:///\\0015-MGS-2221-imx-171-Fix-weston-build-failed.patch>             \
+    file://0016-Link-compositor-to-egl.patch<file:///\\0016-Link-compositor-to-egl.patch>                               \
 "

 PACKAGECONFIG_IMX_TO_APPEND = ""
@@ -37,25 +38,3 @@ EXTRA_OECONF_IMX_imxpxp   = "${EXTRA_OECONF_IMX_COMMON}"
 EXTRA_OECONF_IMX_imxgpu2d = "${EXTRA_OECONF_IMX_COMMON}"

 EXTRA_OECONF_append = " ${EXTRA_OECONF_IMX}"
-
-# Use a intermediate step to configure the linking flags
-IMXGPU_LIBS = ""
-IMXGPU_LIBS_imxgpu2d = " \
-    COMPOSITOR_LIBS="-lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
-    FB_COMPOSITOR_LIBS="-lEGL -lwayland-server -lxkbcommon" \
-"
-IMXGPU_LIBS_imxgpu3d = " \
-    COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \
-    FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \
-"
-
-# Use the linking flags according to the GPU support
-EXTRA_OEMAKE_append_imxgpu2d = " \
-    COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
-    FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \
-    SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
-    EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \
-    CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \
-    \
-    ${IMXGPU_LIBS} \
-"
--
1.9.1

--
_______________________________________________
meta-freescale mailing list
meta-freescale@yoctoproject.org<mailto:meta-freescale@yoctoproject.org>
https://lists.yoctoproject.org/listinfo/meta-freescale<https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.yoctoproject.org%2Flistinfo%2Fmeta-freescale&data=01%7C01%7Ctom.hochstein%40nxp.com%7C2c49f2ceb3614844b4a108d41ea55dac%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=TkJXhWt6JD276LhVl%2FQ2gqYU73mH9hIfzLBqcH89V54%3D&reserved=0>


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