diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-05-10 19:30:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:43:58 +0100 |
commit | b741051080652eabcbcab0f2fa73e82cf31b742a (patch) | |
tree | 21f5cf99d8bace687ed89cba8f111ee2da8f0bd9 /meta/recipes-graphics/waffle | |
parent | f609f7aba72f4297386fd6f88544db4dc86a63ef (diff) | |
download | poky-b741051080652eabcbcab0f2fa73e82cf31b742a.tar.gz |
recipes-graphics: add x11 to REQUIRED_DISTRO_FEATURES
They can't be built withou x11 in DISTRO_FEATURES.
(From OE-Core rev: 908f6f2ded18d5301f428e685bface60335bd791)
Signed-off-by: Robert Yang <liezhi.yang@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.3.0.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-graphics/waffle/waffle_1.3.0.bb b/meta/recipes-graphics/waffle/waffle_1.3.0.bb index fe9609c5b0..a21fcbb302 100644 --- a/meta/recipes-graphics/waffle/waffle_1.3.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.3.0.bb | |||
@@ -7,12 +7,15 @@ SRC_URI = "http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN | |||
7 | SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41" | 7 | SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41" |
8 | SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e" | 8 | SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e" |
9 | 9 | ||
10 | inherit cmake | 10 | inherit cmake distro_features_check |
11 | 11 | ||
12 | # This should be overridden per-machine to reflect the capabilities of the GL | 12 | # This should be overridden per-machine to reflect the capabilities of the GL |
13 | # stack. | 13 | # stack. |
14 | PACKAGECONFIG ??= "glx" | 14 | PACKAGECONFIG ??= "glx" |
15 | 15 | ||
16 | # libx11 requires x11 in DISTRO_FEATURES. | ||
17 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" | ||
18 | |||
16 | # I say virtual/libgl, actually wants gl.pc | 19 | # I say virtual/libgl, actually wants gl.pc |
17 | PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11" | 20 | PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11" |
18 | 21 | ||