diff options
author | Markus Volk <f_l_k@t-online.de> | 2024-04-15 14:26:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-22 22:05:57 +0100 |
commit | ed3d2e881f5bcfed314dbf877822bc4134c93cd9 (patch) | |
tree | 10bfdd36c718666ae3b935c22297be6268ff6b03 | |
parent | a45e29917ea845b3e037d5bde253fb9dff0688a9 (diff) | |
download | poky-ed3d2e881f5bcfed314dbf877822bc4134c93cd9.tar.gz |
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: 0acf1482bca905b3276c177de32788546839132a)
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>
-rw-r--r-- | meta/recipes-graphics/xwayland/xwayland_23.2.6.bb (renamed from meta/recipes-graphics/xwayland/xwayland_23.2.5.bb) | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xwayland/xwayland_23.2.5.bb b/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb index b934a873d1..f51429bc8c 100644 --- a/meta/recipes-graphics/xwayland/xwayland_23.2.5.bb +++ b/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "MIT" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" |
11 | 11 | ||
12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" | 12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90" | 13 | SRC_URI[sha256sum] = "1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d" |
14 | 14 | ||
15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" |
16 | 16 | ||
@@ -20,10 +20,11 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" | |||
20 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" | 20 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" |
21 | 21 | ||
22 | OPENGL_PKGCONFIGS = "glx glamor dri3" | 22 | OPENGL_PKGCONFIGS = "glx glamor dri3" |
23 | PACKAGECONFIG ??= "${XORG_CRYPTO} \ | 23 | PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
25 | " | 25 | " |
26 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" | 26 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" |
27 | PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor" | ||
27 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" | 28 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" |
28 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" | 29 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" |
29 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" | 30 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" |
@@ -34,6 +35,10 @@ XORG_CRYPTO ??= "openssl" | |||
34 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" | 35 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" |
35 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" | 36 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" |
36 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" | 37 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" |
38 | XWAYLAND_EI ??= "xwayland_ei_false" | ||
39 | PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false" | ||
40 | PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei" | ||
41 | PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei" | ||
37 | 42 | ||
38 | do_install:append() { | 43 | do_install:append() { |
39 | # remove files not needed and clashing with xserver-xorg | 44 | # remove files not needed and clashing with xserver-xorg |