mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
xwayland: update 23.2.5 -> 23.2.6
- add a PACKAGECONFIG for libdecor - add PACKAGECONFIGS for xwayland_ei to avoid auto select (From OE-Core rev: cb12eca789ca7c434ed9e4a796c43844df0e5ada) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e9939fe2c6
commit
74361a6e6d
+7
-2
@@ -10,7 +10,7 @@ LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
|
||||
|
||||
SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90"
|
||||
SRC_URI[sha256sum] = "1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
|
||||
|
||||
@@ -20,10 +20,11 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
|
||||
DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt"
|
||||
|
||||
OPENGL_PKGCONFIGS = "glx glamor dri3"
|
||||
PACKAGECONFIG ??= "${XORG_CRYPTO} \
|
||||
PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence"
|
||||
PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor"
|
||||
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"
|
||||
@@ -34,6 +35,10 @@ XORG_CRYPTO ??= "openssl"
|
||||
PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl"
|
||||
PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle"
|
||||
PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt"
|
||||
XWAYLAND_EI ??= "xwayland_ei_false"
|
||||
PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false"
|
||||
PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei"
|
||||
PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei"
|
||||
|
||||
do_install:append() {
|
||||
# remove files not needed and clashing with xserver-xorg
|
||||
Reference in New Issue
Block a user