Skip to contentSkip to conversation

python3-pygobject: enable cairo only when a display is available

PATCH In review André Draszik 2 participants 2 messages Jan 17, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python3-pygobject: enable cairo only when a display is available

From: André Draszik <[email protected]>

It doesn't seem to make sense to unconditionally enable cairo support, as this pulls in lots of other dependencies, where none of these can actually be used without some sort of graphical interface.

Not having a generic distro feature to detect this, we just use any of DirectFB / Wayland / X11

---
 meta/recipes-devtools/python/python3-pygobject_3.22.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3-pygobject_3.22.0.bb +1 -1
index 5a895441fc..143048d9ef 100644
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 
-PACKAGECONFIG ??= "cairo"
+PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}"
 
 # python3-pycairo is checked on configuration -> DEPENDS
 # we don't link against python3-pycairo -> RDEPENDS
Signature · 1 line
2.11.0
#1 lore raw
Quoted 29 lines · André Draszik

From: André Draszik <[email protected]>

It doesn't seem to make sense to unconditionally enable cairo support, as this pulls in lots of other dependencies, where none of these can actually be used without some sort of graphical interface.

Not having a generic distro feature to detect this, we just use any of DirectFB / Wayland / X11

---
 meta/recipes-devtools/python/python3-pygobject_3.22.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3-pygobject_3.22.0.bb +1 -2
index 5a895441fc..143048d9ef 100644
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 
-PACKAGECONFIG ??= "cairo"
+PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', [ 'directfb', 'wayland', 'x11' ], 'cairo', '', d)}"
 
 # python3-pycairo is checked on configuration -> DEPENDS
 # we don't link against python3-pycairo -> RDEPENDS
--
Quoted 2 lines

2.11.0

Looks good

Andreas