diff options
| author | Tom Hochstein <tom.hochstein@nxp.com> | 2018-10-23 10:55:46 -0500 |
|---|---|---|
| committer | Tom Hochstein <tom.hochstein@nxp.com> | 2018-11-05 17:22:56 -0600 |
| commit | 25b4962aa9caab47743eb95337191b7b7bf559aa (patch) | |
| tree | 2985c00861c80df15bd2c8468e341a63f2a17d01 /recipes-graphics/xorg-xserver | |
| parent | e9c6702e8c84eb5c0f76a83bf749735070d6c914 (diff) | |
| download | meta-freescale-25b4962aa9caab47743eb95337191b7b7bf559aa.tar.gz | |
xserver-xorg: Disable glamor for i.MX 8
Like i.MX 6 and 7, need to disable glamor for i.MX 8 to avoid a build break:
In file included from /home/r60874/upstream/fsl-xwayland/tmp/work/aarch64-mx8mm-fsl-linux/xserver-xorg/2_1.20.1-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:179,
from /home/r60874/upstream/fsl-xwayland/tmp/work/aarch64-mx8mm-fsl-linux/xserver-xorg/2_1.20.1-r0/recipe-sysroot/usr/include/epoxy/egl_generated.h:11,
from /home/r60874/upstream/fsl-xwayland/tmp/work/aarch64-mx8mm-fsl-linux/xserver-xorg/2_1.20.1-r0/recipe-sysroot/usr/include/epoxy/egl.h:46,
from ../../xorg-server-1.20.1/glamor/glamor_priv.h:43,
from ../../xorg-server-1.20.1/glamor/glamor_composite_glyphs.c:25:
/home/r60874/upstream/fsl-xwayland/tmp/work/aarch64-mx8mm-fsl-linux/xserver-xorg/2_1.20.1-r0/recipe-sysroot/usr/include/EGL/eglvivante.h:267:1: error: conflicting types for 'fbCreateWindow'
fbCreateWindow(
^~~~~~~~~~~~~~
In file included from ../../xorg-server-1.20.1/glamor/glamor.h:36,
from ../../xorg-server-1.20.1/glamor/glamor_priv.h:32,
from ../../xorg-server-1.20.1/glamor/glamor_composite_glyphs.c:25:
../../xorg-server-1.20.1/fb/fb.h:1115:2: note: previous declaration of 'fbCreateWindow' was here
fbCreateWindow(WindowPtr pWin);
^~~~~~~~~~~~~~
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-graphics/xorg-xserver')
| -rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index c26bb20d..e3c59040 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | |||
| @@ -2,3 +2,4 @@ IMX_OPENGL_PKGCONFIGS_REMOVE = "" | |||
| 2 | IMX_OPENGL_PKGCONFIGS_REMOVE_imxgpu = "glamor" | 2 | IMX_OPENGL_PKGCONFIGS_REMOVE_imxgpu = "glamor" |
| 3 | OPENGL_PKGCONFIGS_remove_mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | 3 | OPENGL_PKGCONFIGS_remove_mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" |
| 4 | OPENGL_PKGCONFIGS_remove_mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | 4 | OPENGL_PKGCONFIGS_remove_mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" |
| 5 | OPENGL_PKGCONFIGS_remove_mx8 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | ||