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/weston | |
| 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/weston')
| -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 |
2 files changed, 8 insertions, 11 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 25a4770f8..4d2a333a3 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 49204f216..342ac8d12 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 |
