From e576607c2dd2fce76933b779adb24a253a7c07d0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 26 Apr 2016 14:57:23 +0100 Subject: mesa: add PACKAGECONFIG for gbm gbm is an optional library and some environments (for example, mesa-gl where there are separate drivers that provide libgbm) may not want to build it. (From OE-Core rev: bb5265a31587e4a4d4df4d42f343054d6c224e24) (From OE-Core rev: 40e03c0d5051f0208778792f9b113c35c5a1ef64) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 442479ae62..a4e53516f3 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -24,11 +24,13 @@ REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OECONF = "--enable-shared-glapi" -PACKAGECONFIG ??= "egl gles dri ${MESA_CRYPTO} \ +PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ " +PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" + X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" @@ -37,7 +39,7 @@ PACKAGECONFIG[wayland] = ",,wayland-native 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} --enable-gbm, --disable-dri, dri2proto libdrm" +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" -- cgit v1.2.3-54-g00ecf