mesa.inc: make PROVIDES conditional on PACKAGECONFIG

PATCH New Trevor Woerner 1 participant 2 messages Mar 23, 2018

Share & tools

Trevor Woerner

author

2018-03-23 00:07 UTC #0 lore raw

PATCH 1/2 mesa.inc: make PROVIDES conditional on PACKAGECONFIG

Mesa only PROVIDES these features if they are enabled via PACKAGECONFIG. Therefore make the PROVIDES conditional depending on whether or not these features have been enabled.

Signed-off-by Trevor Woerner <[email protected]>

---
 meta/recipes-graphics/mesa/mesa.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

meta/recipes-graphics/mesa/mesa.inc +6 -1

index 23ae651f7d..1a45601fdc 100644
@@ -16,7 +16,12 @@ PE = "2"
 
 DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native"
 EXTRANATIVEPATH += "chrpath-native"
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
+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)} \
+    virtual/mesa \
+    "
 
 inherit autotools pkgconfig python3native gettext distro_features_check

Signature · 1 line

2.14.1.459.g238e487ea

Trevor Woerner

author

2018-03-23 00:07 UTC #1 lore raw

PATCH 2/2 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 <[email protected]>

---
 meta/recipes-graphics/mesa/mesa.inc                 | 1 +
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

meta/recipes-graphics/mesa/mesa.inc +1 -0

index 1a45601fdc..9e4da81f7f 100644
@@ -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 \
     "

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1

index e8025de55f..cf2286c653 100644
@@ -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"

Signature · 1 line

2.14.1.459.g238e487ea