From fce9c89c33ba6c6540fc92b729e0b7b34a6d7a3b Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 26 Jun 2021 11:54:15 +0200 Subject: xwayland: port packageconfig from xserver-xorg recipe Copy the packageconfig options from the xserver-xorg recipe to allow configuring for non mesa opengl backends. Keep the defaults as set in the xserver-xorg recipe. The following options no longer exists and are dropped: udev dga dri dri2 xshmfence xmlto systemd-logind systemd xwayland Signed-off-by: Max Krummenacher Signed-off-by: Richard Purdie --- meta/recipes-graphics/xwayland/xwayland_21.1.1.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb b/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb index 8b1c96fc4a..faf166f788 100644 --- a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +++ b/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb @@ -17,6 +17,22 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" +OPENGL_PKGCONFIGS = "glx glamor dri3" +PACKAGECONFIG ??= "${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ +" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" +PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" +PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" +PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" +PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" + +# Xorg requires a SHA1 implementation, pick one +XORG_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" + do_install_append() { # remove files not needed and clashing with xserver-xorg rm -rf ${D}/${libdir}/xorg/ -- cgit 1.2.3-korg