diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2024-04-24 14:41:11 -0700 |
---|---|---|
committer | Tom Hochstein <tom.hochstein@nxp.com> | 2024-04-24 16:17:06 -0700 |
commit | a97b02bb29070ef9f3711ce1b3a081ba1a99c002 (patch) | |
tree | 5e0793705b4683b0eaf429439b4dccc5cdaf202e /recipes-graphics/wayland | |
parent | 84bb2909ec03f4e8212e23836b8e8e0ec6933991 (diff) | |
download | meta-freescale-a97b02bb29070ef9f3711ce1b3a081ba1a99c002.tar.gz |
weston: Upgrade 11.0.3.imx -> 12.0.3.imx
Align with NXP BSP 6.6.3-1.0.0.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-graphics/wayland')
-rw-r--r-- | recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch | 15 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston/xwayland.weston-start | 4 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston_12.0.3.imx.bb (renamed from recipes-graphics/wayland/weston_11.0.3.imx.bb) | 40 |
3 files changed, 31 insertions, 28 deletions
diff --git a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch index 25a4770f..4d2a333a 100644 --- a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch +++ b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch | |||
@@ -26,16 +26,13 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | |||
26 | protocol/meson.build | 2 +- | 26 | protocol/meson.build | 2 +- |
27 | 1 file changed, 1 insertion(+), 1 deletion(-) | 27 | 1 file changed, 1 insertion(+), 1 deletion(-) |
28 | 28 | ||
29 | diff --git a/protocol/meson.build b/protocol/meson.build | 29 | Index: git/protocol/meson.build |
30 | index e8698530..ba52089b 100644 | 30 | =================================================================== |
31 | --- a/protocol/meson.build | 31 | --- git.orig/protocol/meson.build |
32 | +++ b/protocol/meson.build | 32 | +++ git/protocol/meson.build |
33 | @@ -1,4 +1,4 @@ | 33 | @@ -1,4 +1,4 @@ |
34 | -dep_scanner = dependency('wayland-scanner', native: false) | 34 | -dep_scanner = dependency('wayland-scanner', native: false) |
35 | +dep_scanner = dependency('wayland-scanner', native: true) | 35 | +dep_scanner = dependency('wayland-scanner', native: true) |
36 | prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) | 36 | prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner')) |
37 | 37 | ||
38 | dep_wp = dependency('wayland-protocols', version: '>= 1.26', | 38 | dep_wp = dependency('wayland-protocols', version: '>= 1.31', |
39 | -- | ||
40 | 2.25.1 | ||
41 | |||
diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start index 49204f21..342ac8d1 100644 --- a/recipes-graphics/wayland/weston/xwayland.weston-start +++ b/recipes-graphics/wayland/weston/xwayland.weston-start | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | if type Xwayland >/dev/null 2>/dev/null; then | 3 | if type Xwayland >/dev/null 2>/dev/null; then |
4 | mkdir -m 775 -p /tmp/.X11-unix | 4 | mkdir -m 775 -p /tmp/.X11-unix |
5 | chown root:video /tmp/.X11-unix | 5 | chown root:video /tmp/.X11-unix |
6 | fi | 6 | fi |
diff --git a/recipes-graphics/wayland/weston_11.0.3.imx.bb b/recipes-graphics/wayland/weston_12.0.3.imx.bb index 67eae268..8114ddbb 100644 --- a/recipes-graphics/wayland/weston_11.0.3.imx.bb +++ b/recipes-graphics/wayland/weston_12.0.3.imx.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | # recipe. The second section customizes the recipe for i.MX. | 3 | # recipe. The second section customizes the recipe for i.MX. |
4 | 4 | ||
5 | ########### OE-core copy ################## | 5 | ########### OE-core copy ################## |
6 | # Upstream hash: 7f1932cb5a408320a5b542e20ba2807718349e8f | 6 | # Upstream hash: 92a460b55e7290ec0006365219189761f7226f7c |
7 | 7 | ||
8 | SUMMARY = "Weston, a Wayland compositor" | 8 | SUMMARY = "Weston, a Wayland compositor" |
9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" | 9 | DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" |
@@ -13,14 +13,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ | |||
13 | file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ | 13 | file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ |
17 | file://weston.png \ | 17 | file://weston.png \ |
18 | file://weston.desktop \ | 18 | file://weston.desktop \ |
19 | file://xwayland.weston-start \ | 19 | file://xwayland.weston-start \ |
20 | file://systemd-notify.weston-start \ | 20 | file://systemd-notify.weston-start \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57" | 23 | SRC_URI[sha256sum] = "eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a" |
24 | 24 | ||
25 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | 25 | UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" |
26 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 26 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
@@ -44,7 +44,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayla | |||
44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ |
45 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ | 45 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
46 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ | 46 | ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ |
47 | ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ | 47 | launcher-libseat \ |
48 | image-jpeg \ | 48 | image-jpeg \ |
49 | screenshare \ | 49 | screenshare \ |
50 | shell-desktop \ | 50 | shell-desktop \ |
@@ -64,7 +64,7 @@ PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/eg | |||
64 | # Weston on Wayland (nested Weston) | 64 | # Weston on Wayland (nested Weston) |
65 | PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" | 65 | PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" |
66 | # Weston on X11 | 66 | # Weston on X11 |
67 | PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" | 67 | PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor" |
68 | # Headless Weston | 68 | # Headless Weston |
69 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" | 69 | PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" |
70 | # Weston on RDP | 70 | # Weston on RDP |
@@ -77,10 +77,10 @@ PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" | |||
77 | PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" | 77 | PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" |
78 | # Weston with webp support | 78 | # Weston with webp support |
79 | PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" | 79 | PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" |
80 | # Weston with systemd-login support | 80 | # Weston with systemd support |
81 | PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" | 81 | PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" |
82 | # Weston with Xwayland support (requires X11 and Wayland) | 82 | # Weston with Xwayland support (requires X11 and Wayland) |
83 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" | 83 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" |
84 | # colord CMS support | 84 | # colord CMS support |
85 | PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" | 85 | PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" |
86 | # Clients support | 86 | # Clients support |
@@ -101,6 +101,13 @@ PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" | |||
101 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" | 101 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" |
102 | # support libseat based launch | 102 | # support libseat based launch |
103 | PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" | 103 | PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" |
104 | # deprecated and superseded by libseat launcher | ||
105 | PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false," | ||
106 | # screencasting via PipeWire | ||
107 | PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" | ||
108 | # VNC remote screensharing | ||
109 | PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc" | ||
110 | |||
104 | 111 | ||
105 | do_install:append() { | 112 | do_install:append() { |
106 | # Weston doesn't need the .la files to load modules, so wipe them | 113 | # Weston doesn't need the .la files to load modules, so wipe them |
@@ -132,7 +139,7 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', | |||
132 | libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" | 139 | libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" |
133 | 140 | ||
134 | FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" | 141 | FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" |
135 | FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" | 142 | FILES:${PN} = "${sysconfdir} ${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" |
136 | 143 | ||
137 | FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" | 144 | FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" |
138 | SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." | 145 | SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." |
@@ -159,21 +166,20 @@ LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70" | |||
159 | 166 | ||
160 | DEFAULT_PREFERENCE = "-1" | 167 | DEFAULT_PREFERENCE = "-1" |
161 | 168 | ||
162 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz" | 169 | SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" |
163 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " | 170 | SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} " |
164 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" | 171 | SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch" |
165 | SRCBRANCH = "weston-imx-11.0.3" | 172 | SRCBRANCH = "weston-imx-12.0.3" |
166 | SRCREV = "a509c319b7bfc72638c9b9d8f5e4b6259aba0ab7" | 173 | SRCREV = "b0d890915ee191ceb10e79ea9a830281f5c6258f" |
167 | S = "${WORKDIR}/git" | 174 | S = "${WORKDIR}/git" |
168 | 175 | ||
169 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" | 176 | PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" |
170 | PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" | 177 | PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}" |
171 | 178 | ||
172 | PACKAGECONFIG:append:imxgpu2d = " imxg2d" | 179 | PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}" |
173 | PACKAGECONFIG:append:mx93-nxp-bsp = " imxg2d" | 180 | PACKAGECONFIG_G2D ??= "" |
174 | 181 | PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d" | |
175 | # Override | 182 | PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d" |
176 | PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor xwayland" | ||
177 | 183 | ||
178 | # Weston with i.MX G2D renderer | 184 | # Weston with i.MX G2D renderer |
179 | PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" | 185 | PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d" |