From cf972f9abf78111c2a7414356dac4d2a657b751f Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Thu, 8 Oct 2015 17:25:13 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/recipes-graphics/mesa') 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" -- cgit v1.2.3-54-g00ecf