diff options
author | Max Krummenacher <max.oss.09@gmail.com> | 2021-06-26 11:54:15 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-27 22:51:05 +0100 |
commit | 9c591cfa06ce9161bdbf070f0ce445fe34304d0e (patch) | |
tree | 4c078ab2533ec424875151a2a702d401de4ff450 /meta/recipes-graphics/xwayland | |
parent | e1da684aef773608d3dcb541f2e21bfb9edbcd68 (diff) | |
download | poky-9c591cfa06ce9161bdbf070f0ce445fe34304d0e.tar.gz |
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
(From OE-Core rev: fce9c89c33ba6c6540fc92b729e0b7b34a6d7a3b)
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xwayland')
-rw-r--r-- | meta/recipes-graphics/xwayland/xwayland_21.1.1.bb | 16 |
1 files changed, 16 insertions, 0 deletions
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" | |||
17 | 17 | ||
18 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" | 18 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" |
19 | 19 | ||
20 | OPENGL_PKGCONFIGS = "glx glamor dri3" | ||
21 | PACKAGECONFIG ??= "${XORG_CRYPTO} \ | ||
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | ||
23 | " | ||
24 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" | ||
25 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" | ||
26 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" | ||
27 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" | ||
28 | PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" | ||
29 | |||
30 | # Xorg requires a SHA1 implementation, pick one | ||
31 | XORG_CRYPTO ??= "openssl" | ||
32 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" | ||
33 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" | ||
34 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" | ||
35 | |||
20 | do_install_append() { | 36 | do_install_append() { |
21 | # remove files not needed and clashing with xserver-xorg | 37 | # remove files not needed and clashing with xserver-xorg |
22 | rm -rf ${D}/${libdir}/xorg/ | 38 | rm -rf ${D}/${libdir}/xorg/ |