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 <[email protected]> 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 <[email protected]> > --- > .../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 > [email protected] > https://lists.yoctoproject.org/listinfo/meta-freescale >
-- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
