diff options
| author | Changqing Li <changqing.li@windriver.com> | 2019-04-29 15:37:56 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-30 12:05:23 +0100 |
| commit | c40482a68e964d6c1c24271c12e4d052df2efaf3 (patch) | |
| tree | 29eb85c83baf382bac027d7afced11bd599352c1 /meta/recipes-graphics/waffle | |
| parent | 7603f21aadfa90cef29a60de31f82b80d902c9fb (diff) | |
| download | poky-c40482a68e964d6c1c24271c12e4d052df2efaf3.tar.gz | |
waffle: supprt build waffle without x11
respect DISTRO_FEATURES to make waffle support different platform,
gbm platform is supported by default.
[YOCTO #6077]
(From OE-Core rev: 37dc4ad4a87fb9042dc3e9bb389cedc8b5acadf7)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/waffle')
| -rw-r--r-- | meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb index 43c3edc05a..31572f25f7 100644 --- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb +++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb | |||
| @@ -15,10 +15,9 @@ inherit cmake distro_features_check lib_package | |||
| 15 | 15 | ||
| 16 | # This should be overridden per-machine to reflect the capabilities of the GL | 16 | # This should be overridden per-machine to reflect the capabilities of the GL |
| 17 | # stack. | 17 | # stack. |
| 18 | PACKAGECONFIG ??= "glx" | 18 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ |
| 19 | 19 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ | |
| 20 | # libx11 requires x11 in DISTRO_FEATURES. | 20 | gbm" |
| 21 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" | ||
| 22 | 21 | ||
| 23 | # virtual/libgl requires opengl in DISTRO_FEATURES. | 22 | # virtual/libgl requires opengl in DISTRO_FEATURES. |
| 24 | REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" | 23 | REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" |