From 5f8050722169a931b8e9078b8757216ba7a84506 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Thu, 22 Mar 2018 20:07:07 -0400 Subject: virtual/libgbm: create The 'glamor' PACKAGECONFIG in xserver-xorg creates a dependency on libgbm which can be satisfied in some cases by mesa, in others by blobs such as mali. Signed-off-by: Trevor Woerner Signed-off-by: Ross Burton --- meta/recipes-graphics/mesa/mesa.inc | 1 + meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1a45601fdc..9e4da81f7f 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -20,6 +20,7 @@ PROVIDES = " \ ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ virtual/mesa \ " diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index e8025de55f..cf2286c653 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -132,7 +132,7 @@ PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" # DRI3 requires xshmfence to also be enabled PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" -PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy,libegl" +PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl" PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -- cgit 1.2.3-korg