diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2017-01-04 15:57:50 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-05 13:54:06 +0000 |
| commit | 99ae8c091999bc6841a21374f9ec09cc55289e98 (patch) | |
| tree | 5c27c77e86ea5fdec798614a2f101d428ba56227 | |
| parent | e30f5002c4f216757ace27ad8d06164716ca46b5 (diff) | |
| download | poky-99ae8c091999bc6841a21374f9ec09cc55289e98.tar.gz | |
waffle: add opengl to REQUIRED_DISTRO_FEATURES
Multiple packageconfigs depend upon virtual/libgl, whose providers require the
opengl distro feature.
(From OE-Core rev: 930c5a17b543bef9d5c2efe71680f82993d77269)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/waffle/waffle_1.5.2.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb index f7db1bc955..9d6b0e0e0d 100644 --- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb +++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb | |||
| @@ -20,6 +20,9 @@ PACKAGECONFIG ??= "glx" | |||
| 20 | # libx11 requires x11 in DISTRO_FEATURES. | 20 | # libx11 requires x11 in DISTRO_FEATURES. |
| 21 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" | 21 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" |
| 22 | 22 | ||
| 23 | # virtual/libgl requires opengl in DISTRO_FEATURES. | ||
| 24 | REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/libgl', 'opengl', '', d)}" | ||
| 25 | |||
| 23 | # I say virtual/libgl, actually wants gl.pc | 26 | # I say virtual/libgl, actually wants gl.pc |
| 24 | PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/libgl libx11" | 27 | PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/libgl libx11" |
| 25 | 28 | ||