Skip to contentSkip to conversation

libepoxy: Disable x11 when not building for x11

PATCH In review Andrew F. Davis 3 participants 6 messages Sep 17, 2019 – Oct 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/4 libepoxy: Disable x11 when not building for x11

Although glx support is turned off, the build still tries to pull in some x11 components, disable x11 explicitly.

---
 meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb +1 -1
index c8d1650c63..825453ab28 100644
@@ -18,7 +18,7 @@ REQUIRED_DISTRO_FEATURES_class-native = ""
 REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
 
 PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"
-PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"
+PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no -Dx11=false, virtual/libx11 virtual/libgl"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl"
 
 EXTRA_OEMESON += "-Dtests=false"
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/4 cogl: Set depends to the virtual needed not explicitly on Mesa

The dependency is for EGL and GLES2 libraries. On some systems these are not provided by Mesa, list what is actually needed so the system can choose the correct provider.

---
 meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/cogl/cogl-1.0.inc +1 -1
index 4038afbc11..4436163168 100644
@@ -18,7 +18,7 @@ EDEPENDS_GLES2 = "virtual/libgles2"
 EDEPENDS_KMS = "libdrm virtual/egl"
 EDEPENDS_EGL = "virtual/egl"
 EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr"
-EDEPENDS_WAYLAND = "virtual/mesa wayland"
+EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland"
 
 # Extra RDEPENDS for PACKAGECONFIG
 # This has to be explictly listed, because cogl dlopens the backends
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 3/4 gtk+3: Set depends to the virtual needed not explicitly on Mesa

In reply to Andrew F. Davis

The dependency is for EGL and GLES2 libraries. On some systems these are not provided by Mesa, list what is actually needed so the system can choose the correct provider.

---

Changes from v1:
- s/gles2/libgles2

 meta/recipes-gnome/gtk+/gtk+3.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/gtk+/gtk+3.inc +1 -1
index 77b6c31536..dc6768c4e8 100644
@@ -52,7 +52,7 @@ PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fon
 # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
 PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy"
 PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl"
-PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native"
+PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
 PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
 
 prepare_gtk_scripts() {
Signature · 1 line
2.17.1
#3 lore raw

PATCH v2 4/4 weston: Set depends to the virtual needed not explicitly on Mesa

In reply to Andrew F. Davis

The dependency is for EGL and GLES2 libraries. On some systems these are not provided by Mesa, list what is actually needed so the system can choose the correct provider.

---

Changes from v1:
- s/gles2/libgles2

 meta/recipes-graphics/wayland/weston_7.0.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/wayland/weston_7.0.0.bb +2 -2
index 5d2a9336f3..f9efdbd20a 100644
@@ -36,9 +36,9 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev
 # Compositor choices
 #
 # Weston on KMS
-PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/mesa virtual/libgbm mtdev"
+PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
 # Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/mesa"
+PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
 # Weston on X11
 PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo"
 # Headless Weston
Signature · 1 line
2.17.1
#4 lore raw

Re: [PATCH v2 4/4] weston: Set depends to the virtual needed not explicitly on Mesa

Quoted 3 lines · Andrew F. Davis via Openembedded-core

The dependency is for EGL and GLES2 libraries. On some systems these are not provided by Mesa, list what is actually needed so the system can choose the correct provider.

Unfortunately I saw that a bit late, but this is breaking our use case.

Weston works perfectly fine on non-GPU systems without EGL/OpenGL ES using pixman renderer. Currently libgbm is still a compile time dependency, but I have a merge request pending which should drop this dependency, then the DRM backend can be compiled fine with only KMS support.

--
Stefan

Quoted 38 lines

---

Changes from v1:
- s/gles2/libgles2

 meta/recipes-graphics/wayland/weston_7.0.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/wayland/weston_7.0.0.bb +0 -0
index 5d2a9336f3..f9efdbd20a 100644
@@ -36,9 +36,9 @@ PACKAGECONFIG ??=

"${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev
# Compositor choices
#
# Weston on KMS
-PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/mesa virtual/libgbm mtdev"
+PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
# Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/mesa" +PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
# Weston on X11
PACKAGECONFIG[x11] =
"-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo"
# Headless Weston

Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH v2 4/4] weston: Set depends to the virtual needed not explicitly on Mesa

Quoted 5 lines · Stefan Agner
Quoted 3 lines · Andrew F. Davis via Openembedded-core

The dependency is for EGL and GLES2 libraries. On some systems these are not provided by Mesa, list what is actually needed so the system can choose the correct provider.

Quoted 7 lines

Unfortunately I saw that a bit late, but this is breaking our use case.

Weston works perfectly fine on non-GPU systems without EGL/OpenGL ES using pixman renderer. Currently libgbm is still a compile time dependency, but I have a merge request pending which should drop this dependency, then the DRM backend can be compiled fine with only KMS support.

Hi, Stefan,

Can you please provide Weston configuration logs when it gets built with pixman and w/o EGL/GLES? Thanks.

Signature · 1 line
Denys
Quoted 42 lines
Quoted 37 lines

---

Changes from v1:
- s/gles2/libgles2

 meta/recipes-graphics/wayland/weston_7.0.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/wayland/weston_7.0.0.bb +0 -0
index 5d2a9336f3..f9efdbd20a 100644
@@ -36,9 +36,9 @@ PACKAGECONFIG ??=

"${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev
# Compositor choices
#
# Weston on KMS
-PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/mesa virtual/libgbm mtdev"
+PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
# Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/mesa" +PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
# Weston on X11
PACKAGECONFIG[x11] =
"-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo"
# Headless Weston

Signature · 1 line
2.17.1
Signature · 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core