summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2015-10-08 17:25:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:32 +0000
commitcf972f9abf78111c2a7414356dac4d2a657b751f (patch)
treef9948f88bdf90fb7e04f77e6bf65626c6aeb41a4 /meta/recipes-graphics/mesa
parent17733cc6073df875c08bbc02565a7216324890f7 (diff)
downloadpoky-cf972f9abf78111c2a7414356dac4d2a657b751f.tar.gz
gbm: Fix "configure: error: gbm requires --enable-dri"
When building mesa without X11 enabled, and disabling dri package config, the enforced "--enable-gbm" fails building mesa, because this feature requires "--enable-dri", too - which has been disabled by package config. Consequently, when gbm requires dri, --disable-dri causes in --disable-gbm, which makes explicit --disable-gbm in case of --disable-dri redundant. (From OE-Core rev: fee4a22c6919814bd541ab2cca9489e5ce3596b4) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index af7a2c47fc..13a8b9d79f 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -37,11 +37,9 @@ PACKAGECONFIG[wayland] = ",,wayland"
37DRIDRIVERS = "swrast" 37DRIDRIVERS = "swrast"
38DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" 38DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
39DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" 39DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
40PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" 40PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS} --enable-gbm, --disable-dri, dri2proto libdrm"
41PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" 41PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
42 42
43EXTRA_OECONF += "--enable-gbm"
44
45PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" 43PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
46 44
47EGL_PLATFORMS = "drm" 45EGL_PLATFORMS = "drm"