summaryrefslogtreecommitdiffstats
path: root/meta
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:28:40 +0000
commitfee4a22c6919814bd541ab2cca9489e5ce3596b4 (patch)
tree16ce29050182712ed5f661d92370231284dbe7db /meta
parent19040fb7898ffa30697577d43dd32cf279073d90 (diff)
downloadopenembedded-core-fee4a22c6919814bd541ab2cca9489e5ce3596b4.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. Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-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"
DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
-PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
+PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS} --enable-gbm, --disable-dri, dri2proto libdrm"
PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
-EXTRA_OECONF += "--enable-gbm"
-
PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
EGL_PLATFORMS = "drm"