diff options
author | Ross Burton <ross.burton@intel.com> | 2012-07-30 17:17:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 10:45:57 +0100 |
commit | 7477153dd81bcf6c9afed47e73b388c755df30b4 (patch) | |
tree | 335e85fb5806d3340a3057c524801f0a0e94eee4 /meta/recipes-graphics/mesa/mesa-common.inc | |
parent | 25db6dd7fc3175aa1f2e5acc148674c9f506777e (diff) | |
download | poky-7477153dd81bcf6c9afed47e73b388c755df30b4.tar.gz |
mesa: respect x11 DISTRO_FEATURE
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
(From OE-Core rev: d3e60b835c5abcf2345e761027aa520409c19efc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-common.inc')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-common.inc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index 24cc3d08ea..feb152b13d 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc | |||
@@ -12,14 +12,10 @@ SECTION = "x11" | |||
12 | LICENSE = "MIT" | 12 | LICENSE = "MIT" |
13 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" | 13 | LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" |
14 | 14 | ||
15 | INC_PR = "r1" | 15 | INC_PR = "r2" |
16 | PE = "2" | 16 | PE = "2" |
17 | 17 | ||
18 | 18 | DEPENDS = "libxml2-native makedepend-native flex-native bison-native" | |
19 | PROTO_DEPS = "xf86driproto glproto" | ||
20 | LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native" | ||
21 | |||
22 | DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}" | ||
23 | 19 | ||
24 | PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2" | 20 | PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2" |
25 | 21 | ||
@@ -31,10 +27,13 @@ inherit autotools pkgconfig pythonnative | |||
31 | EXTRA_OECONF = "--enable-glu \ | 27 | EXTRA_OECONF = "--enable-glu \ |
32 | --disable-glw \ | 28 | --disable-glw \ |
33 | --disable-glut \ | 29 | --disable-glut \ |
34 | --enable-glx-tls \ | ||
35 | --enable-shared-glapi" | 30 | --enable-shared-glapi" |
36 | 31 | ||
37 | PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}" | 32 | PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \ |
33 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | ||
34 | |||
35 | X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" | ||
36 | PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" | ||
38 | 37 | ||
39 | # Multiple virtual/gl providers being built breaks staging | 38 | # Multiple virtual/gl providers being built breaks staging |
40 | EXCLUDE_FROM_WORLD = "1" | 39 | EXCLUDE_FROM_WORLD = "1" |