diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2016-07-01 15:39:44 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-09-08 11:24:25 -0300 |
commit | a0ca911a016ca968e7c4f9956be5aff44c35b78b (patch) | |
tree | b0df1ed770a32e5825a3489fea8b2b5a9d35bd65 /recipes-graphics/wayland | |
parent | 83e960e96ce0f13b88da53f28782eb6e52cd122b (diff) | |
download | meta-freescale-a0ca911a016ca968e7c4f9956be5aff44c35b78b.tar.gz |
weston: Refactor code to use the new overrides
The recipe has been reworked to use the 'imxpxp', 'imxgpu2d' and
'imxgpu3d' feature overrides. While on that, the i.MX6UL specific code
has been reworked to used when only PXP-only support is available,
fixing the i.MX7D support as well.
Change-Id: Ieaae9f95bd7ace58df7bccdab19b42ad35f44f5e
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-graphics/wayland')
-rw-r--r-- | recipes-graphics/wayland/weston_%.bbappend | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend index f7bfd357..1b813abc 100644 --- a/recipes-graphics/wayland/weston_%.bbappend +++ b/recipes-graphics/wayland/weston_%.bbappend | |||
@@ -1,50 +1,51 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | SRC_URI_append_mx6 = " \ | 3 | SRC_URI_append_imxgpu2d = " \ |
4 | file://0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch \ | 4 | file://0002-MGS-1111-Add-GPU-VIV-suport-for-wayland-and-weston-1.patch \ |
5 | file://0003-MGS-1192-xwld-g2d-compositor-dose-not-work.patch \ | 5 | file://0003-MGS-1192-xwld-g2d-compositor-dose-not-work.patch \ |
6 | file://0004-MGS-1235-Fix-setenv-and-clear-environments.patch \ | 6 | file://0004-MGS-1235-Fix-setenv-and-clear-environments.patch \ |
7 | file://0005-MGS-1252-Fix-for-Qt5_CinematicExperience-will-meet-s.patch \ | 7 | file://0005-MGS-1252-Fix-for-Qt5_CinematicExperience-will-meet-s.patch \ |
8 | file://0006-MGS-1236-imx6qp-imx6dl-First-frame-distored-when-som.patch \ | 8 | file://0006-MGS-1236-imx6qp-imx6dl-First-frame-distored-when-som.patch \ |
9 | file://0007-MGS-1236-1-imx6qp-imx6dl-First-frame-distored-when-s.patch \ | 9 | file://0007-MGS-1236-1-imx6qp-imx6dl-First-frame-distored-when-s.patch \ |
10 | " | ||
11 | PACKAGECONFIG_append_mx6q = " cairo-glesv2" | ||
12 | PACKAGECONFIG_append_mx6dl = " cairo-glesv2" | ||
13 | PACKAGECONFIG_append_mx6sx = " cairo-glesv2" | ||
14 | PACKAGECONFIG_remove_mx6sl = "egl" | ||
15 | PACKAGECONFIG_remove_mx6ul = "egl" | ||
16 | |||
17 | EXTRA_OECONF_append_mx6 = " \ | ||
18 | --disable-libunwind \ | ||
19 | --disable-xwayland-test \ | ||
20 | WESTON_NATIVE_BACKEND=fbdev-backend.so \ | ||
21 | " | 10 | " |
22 | EXTRA_OECONF_append_mx6ul = " \ | 11 | |
12 | PACKAGECONFIG_IMX_TO_APPEND = "" | ||
13 | PACKAGECONFIG_IMX_TO_APPEND_imxgpu3d = "cairo-glesv2" | ||
14 | PACKAGECONFIG_IMX_TO_REMOVE = "" | ||
15 | PACKAGECONFIG_IMX_TO_REMOVE_imxpxp = "egl" | ||
16 | PACKAGECONFIG_IMX_TO_REMOVE_imxgpu2d = "" | ||
17 | |||
18 | PACKAGECONFIG_append = " ${PACKAGECONFIG_IMX_TO_APPEND}" | ||
19 | PACKAGECONFIG_remove = " ${PACKAGECONFIG_IMX_TO_REMOVE}" | ||
20 | |||
21 | |||
22 | EXTRA_OECONF_IMX = " \ | ||
23 | --disable-libunwind \ | 23 | --disable-libunwind \ |
24 | --disable-xwayland-test \ | 24 | --disable-xwayland-test \ |
25 | WESTON_NATIVE_BACKEND=fbdev-backend.so \ | 25 | WESTON_NATIVE_BACKEND=fbdev-backend.so \ |
26 | " | 26 | " |
27 | 27 | ||
28 | EXTRA_OEMAKE_append_mx6 = " \ | 28 | EXTRA_OECONF_append_imxpxp = " ${EXTRA_OECONF_IMX}" |
29 | EXTRA_OECONF_append_imxgpu2d = " ${EXTRA_OECONF_IMX}" | ||
30 | |||
31 | # Use a intermediate step to configure the linking flags | ||
32 | IMXGPU_LIBS = "" | ||
33 | IMXGPU_LIBS_imxgpu2d = " \ | ||
34 | COMPOSITOR_LIBS="-lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \ | ||
35 | FB_COMPOSITOR_LIBS="-lEGL -lwayland-server -lxkbcommon" \ | ||
36 | " | ||
37 | IMXGPU_LIBS_imxgpu3d = " \ | ||
38 | COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \ | ||
39 | FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \ | ||
40 | " | ||
41 | |||
42 | # Use the linking flags according to the GPU support | ||
43 | EXTRA_OEMAKE_append_imxgpu2d = " \ | ||
29 | COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \ | 44 | COMPOSITOR_CFLAGS="-I ${STAGING_INCDIR}/pixman-1 -DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \ |
30 | FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \ | 45 | FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \ |
31 | SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ | 46 | SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ |
32 | EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ | 47 | EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ |
33 | CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \ | 48 | CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \ |
34 | " | 49 | \ |
35 | EXTRA_OEMAKE_append_mx6q = " \ | 50 | ${IMXGPU_LIBS} \ |
36 | COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \ | ||
37 | FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \ | ||
38 | " | ||
39 | EXTRA_OEMAKE_append_mx6dl = " \ | ||
40 | COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \ | ||
41 | FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \ | ||
42 | " | ||
43 | EXTRA_OEMAKE_append_mx6sx = " \ | ||
44 | COMPOSITOR_LIBS="-lGLESv2 -lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \ | ||
45 | FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \ | ||
46 | " | ||
47 | EXTRA_OEMAKE_append_mx6sl = " \ | ||
48 | COMPOSITOR_LIBS="-lEGL -lGAL -lwayland-server -lxkbcommon -lpixman-1" \ | ||
49 | FB_COMPOSITOR_LIBS="-lEGL -lwayland-server -lxkbcommon" \ | ||
50 | " | 51 | " |